Deleting when document is synced

leandroBorgesFerreira · leandroBorgesFerreira · commit 63239fd33006 · 2025-12-08T18:16:53.000+01:00
diff --git a/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/sync/DocumentConflictHandler.kt b/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/sync/DocumentConflictHandler.kt
@@ -26,13 +26,26 @@ class DocumentConflictHandler(
         externalDocuments: List<Document>
     ): List<Document> {
         val now = Clock.System.now()
-        // Todo: Implement!! Save external documents and remove localDocuments. A more complex
-        // handling of conflicts can be implemented in the future.
-        externalDocuments.forEach { document ->
-            documentRepository.saveDocument(document.copy(lastSyncedAt = now))
+
+        val allDocumentsById = (localDocuments + externalDocuments).groupBy { it.id }
+
+        // Resolve conflicts for each document ID.
+        val resolvedDocuments = allDocumentsById.map { (_, documents) ->
+            // Select the document with the newest lastUpdatedAt
+            val winner = documents.maxByOrNull { it.lastUpdatedAt }
+                ?: throw IllegalStateException("Document list for ID cannot be empty.")
+
+            // Mark the winner as synced (or keep existing lastSyncedAt if it's external and already set)
+            winner.copy(lastSyncedAt = now)
+        }
+
+        // Save the resolved (winning and synced) documents to the repository.
+        resolvedDocuments.forEach { document ->
+            documentRepository.saveDocument(document)
         }
 
-        return (localDocuments.toSet() - externalDocuments.toSet()).toList()
+        // Determine which documents to return.
+        return resolvedDocuments
     }
 
     suspend fun handleConflictForFolders(
diff --git a/backend/core/database/src/main/sqldelight/io/writeopia/sql/DocumentEntity.sq b/backend/core/database/src/main/sqldelight/io/writeopia/sql/DocumentEntity.sq
@@ -89,7 +89,7 @@ selectWithContentByWorkspaceIdAfterTime:
 SELECT *
 FROM document_entity
 LEFT JOIN story_step_entity ON document_entity.id=story_step_entity.document_id
-WHERE last_synced > ? AND workspace_id = ? AND deleted = FALSE
+WHERE last_synced > ? AND workspace_id = ?
 ORDER BY position;
 
 selectWithContentById:
