From 705b8904a4dbf746edb8fc829057a85370a2ba7a Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 2 Jul 2026 14:42:52 +0200 Subject: [PATCH] Reconcile confirmed photo uploads with server state --- .../java/pl/firmatpp/kierowca/data/upload/PhotoUploadDao.kt | 3 +-- .../pl/firmatpp/kierowca/data/upload/PhotoUploadOutbox.kt | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/pl/firmatpp/kierowca/data/upload/PhotoUploadDao.kt b/app/src/main/java/pl/firmatpp/kierowca/data/upload/PhotoUploadDao.kt index 1435bf5..e2ab4cc 100644 --- a/app/src/main/java/pl/firmatpp/kierowca/data/upload/PhotoUploadDao.kt +++ b/app/src/main/java/pl/firmatpp/kierowca/data/upload/PhotoUploadDao.kt @@ -39,10 +39,9 @@ interface PhotoUploadDao { SELECT * FROM photo_uploads WHERE routeId = :routeId AND status = 'CONFIRMED' - AND clientRequestId IN (:clientRequestIds) """, ) - suspend fun confirmedForServerPhotos(routeId: String, clientRequestIds: List): List + suspend fun confirmedForRoute(routeId: String): List @Query( """ diff --git a/app/src/main/java/pl/firmatpp/kierowca/data/upload/PhotoUploadOutbox.kt b/app/src/main/java/pl/firmatpp/kierowca/data/upload/PhotoUploadOutbox.kt index 8d40510..a2419eb 100644 --- a/app/src/main/java/pl/firmatpp/kierowca/data/upload/PhotoUploadOutbox.kt +++ b/app/src/main/java/pl/firmatpp/kierowca/data/upload/PhotoUploadOutbox.kt @@ -80,10 +80,7 @@ class PhotoUploadOutbox( } suspend fun discardConfirmedServerPhotos(route: DriverRouteDto) { - val confirmedRequestIds = route.photos.mapNotNull { it.clientRequestId }.distinct() - if (confirmedRequestIds.isEmpty()) return - - dao.confirmedForServerPhotos(route.id, confirmedRequestIds).forEach { upload -> + dao.confirmedForRoute(route.id).forEach { upload -> File(upload.localPath).delete() dao.delete(upload.clientRequestId) }