implementing workspace sync

Leandro Ferreira · Leandro Ferreira · commit 58e42ca1d597 · 2025-08-10T03:41:32.000+02:00
diff --git a/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/api/DocumentsApi.kt b/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/api/DocumentsApi.kt
@@ -9,6 +9,8 @@ import io.ktor.http.contentType
 import io.ktor.http.isSuccess
 import io.writeopia.sdk.models.api.request.documents.FolderDiffRequest
 import io.writeopia.sdk.models.document.Document
+import io.writeopia.sdk.models.document.Folder
+import io.writeopia.sdk.models.document.MenuItem
 import io.writeopia.sdk.models.utils.ResultData
 import io.writeopia.sdk.serialization.data.DocumentApi
 import io.writeopia.sdk.serialization.extensions.toApi
@@ -34,7 +36,14 @@ class DocumentsApi(private val client: HttpClient, private val baseUrl: String)
         }
     }
 
-    suspend fun sendDocuments(documents: List<Document>): ResultData<Unit> {
+    suspend fun getWorkspaceNewData(
+        workspaceId: String,
+        lastSync: Instant
+    ): ResultData<Pair<List<Document>, List<Folder>>> {
+
+    }
+
+    suspend fun sendDocuments(documents: List<MenuItem>): ResultData<Unit> {
         val response = client.post("$baseUrl/api/document") {
             contentType(ContentType.Application.Json)
             setBody(SendDocumentsRequest(documents.map { it.toApi() }))
diff --git a/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/FolderRepository.kt b/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/FolderRepository.kt
@@ -10,9 +10,9 @@ interface FolderRepository {
 
     suspend fun getFolderByParentId(parentId: String): List<Folder>
 
-    suspend fun getFoldersForUserAfterTime(userId: String, instant: Instant): List<Folder>
+    suspend fun getFoldersForWorkspaceAfterTime(workspaceId: String, instant: Instant): List<Folder>
 
-    suspend fun getFoldersForUser(userId: String): List<Folder>
+    suspend fun getFoldersForWorkspace(workspaceId: String): List<Folder>
 
     suspend fun createFolder(folder: Folder)
 
@@ -35,4 +35,6 @@ interface FolderRepository {
     suspend fun listenForFoldersByParentId(parentId: String): Flow<Map<String, List<Folder>>>
 
     suspend fun stopListeningForFoldersByParentId(parentId: String)
+
+    suspend fun localOutDatedFolders(workspaceId: String): List<Folder>
 }
diff --git a/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/FolderRepositorySqlDelight.kt b/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/FolderRepositorySqlDelight.kt
@@ -15,7 +15,7 @@ class FolderRepositorySqlDelight(
     override suspend fun getFolderById(id: String): Folder? =
         folderDao.getFolderById(id)?.toModel(0)
 
-    override suspend fun getFoldersForUserAfterTime(
+    override suspend fun getFoldersForWorkspaceAfterTime(
         userId: String,
         instant: Instant
     ): List<Folder> {
@@ -25,8 +25,8 @@ class FolderRepositorySqlDelight(
         )
     }
 
-    override suspend fun getFoldersForUser(userId: String): List<Folder> =
-        folderDao.selectByUserId(userId)
+    override suspend fun getFoldersForWorkspace(workspaceId: String): List<Folder> =
+        folderDao.selectByUserId(workspaceId)
 
     override suspend fun createFolder(folder: Folder) {
         folderDao.createFolder(folder.toEntity())
diff --git a/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/InMemoryFolderRepository.kt b/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/InMemoryFolderRepository.kt
@@ -22,14 +22,14 @@ class InMemoryFolderRepository : FolderRepository {
         refreshState()
     }
 
-    override suspend fun getFoldersForUserAfterTime(
+    override suspend fun getFoldersForWorkspaceAfterTime(
         userId: String,
         instant: Instant
     ): List<Folder> {
         TODO("Not yet implemented")
     }
 
-    override suspend fun getFoldersForUser(userId: String): List<Folder> {
+    override suspend fun getFoldersForWorkspace(workspaceId: String): List<Folder> {
         TODO("Not yet implemented")
     }
 
diff --git a/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/NotesUseCase.kt b/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/NotesUseCase.kt
@@ -90,10 +90,10 @@ class NotesUseCase private constructor(
             }
 
     suspend fun loadFolderForUserAfterTime(userId: String, time: Instant): List<Folder> =
-        folderRepository.getFoldersForUserAfterTime(userId, time)
+        folderRepository.getFoldersForWorkspaceAfterTime(userId, time)
 
     suspend fun loadFoldersForUser(userId: String): List<Folder> =
-        folderRepository.getFoldersForUser(userId)
+        folderRepository.getFoldersForWorkspace(userId)
 
     private suspend fun loadDocumentsByIds(ids: Iterable<String>): List<MenuItem> {
         val folders = ids.mapNotNull { id -> folderRepository.getFolderById(id) }
diff --git a/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/RoomFolderRepository.kt b/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/RoomFolderRepository.kt
@@ -27,14 +27,14 @@ class RoomFolderRepository(
         }
     }
 
-    override suspend fun getFoldersForUserAfterTime(
+    override suspend fun getFoldersForWorkspaceAfterTime(
         userId: String,
         instant: Instant
     ): List<Folder> {
         TODO("Not yet implemented")
     }
 
-    override suspend fun getFoldersForUser(userId: String): List<Folder> {
+    override suspend fun getFoldersForWorkspace(workspaceId: String): List<Folder> {
         TODO("Not yet implemented")
     }
 
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
@@ -1,12 +1,14 @@
 package io.writeopia.core.folders.sync
 
 import io.writeopia.auth.core.manager.AuthRepository
+import io.writeopia.core.folders.repository.folder.FolderRepository
 import io.writeopia.sdk.models.document.Document
 import io.writeopia.sdk.repository.DocumentRepository
 import kotlinx.datetime.Clock
 
 class DocumentConflictHandler(
     private val documentRepository: DocumentRepository,
+    private val folderRepository: FolderRepository,
     private val authRepository: AuthRepository
 ) {
 
diff --git a/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/sync/FolderSync.kt b/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/sync/FolderSync.kt
@@ -75,8 +75,6 @@ class FolderSync(
 
             documentRepository.refreshDocuments()
             folderRepository.updateFolder(folder.copy(lastSyncedAt = now))
-        } else {
-            return
         }
     }
 }
diff --git a/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/sync/WorkspaceSync.kt b/application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/sync/WorkspaceSync.kt
@@ -0,0 +1,46 @@
+package io.writeopia.core.folders.sync
+
+import io.writeopia.auth.core.manager.AuthRepository
+import io.writeopia.core.folders.api.DocumentsApi
+import io.writeopia.core.folders.repository.folder.FolderRepository
+import io.writeopia.sdk.models.sorting.OrderBy
+import io.writeopia.sdk.models.utils.ResultData
+import io.writeopia.sdk.repository.DocumentRepository
+
+//Todo: Implement sync for workspace
+class WorkspaceSync(
+    private val folderRepository: FolderRepository,
+    private val documentRepository: DocumentRepository,
+    private val authRepository: AuthRepository,
+    private val documentsApi: DocumentsApi,
+    private val documentConflictHandler: DocumentConflictHandler,
+) {
+
+    suspend fun syncWorkspace(workspaceId: String) {
+        val workspace = authRepository.getWorkspace()
+
+        val folders = folderRepository.getFoldersForWorkspace(workspaceId)
+        val documents = documentRepository.loadDocumentsForWorkspace(
+            orderBy = OrderBy.NAME.type,
+            workspaceId = workspaceId,
+            instant = workspace.lastSync
+        )
+
+        val response = documentsApi.getWorkspaceNewData(workspaceId, workspace.lastSync)
+        val (newDocuments, newFolders) = if (response is ResultData.Complete) response.data else return
+
+        val localOutdatedDocs = documentRepository.loadOutdatedDocuments(workspaceId)
+        val localOutdatedFolders = folderRepository.localOutDatedFolders(workspaceId)
+
+        val documentsNotSent = documentConflictHandler.handleConflict(
+            localOutdatedDocs,
+            newDocuments,
+        )
+        
+        val documentsNotSent = documentConflictHandler.handleConflict(
+            localOutdatedDocs,
+            newDocuments,
+        )
+
+    }
+}
diff --git a/application/features/documents_graph/src/commonMain/kotlin/io/writeopia/documents/graph/repository/GraphRepository.kt b/application/features/documents_graph/src/commonMain/kotlin/io/writeopia/documents/graph/repository/GraphRepository.kt
@@ -11,7 +11,7 @@ class GraphRepository(
 ) {
 
     suspend fun loadAllDocumentsAsAdjacencyList(userId: String): Map<ItemData, List<ItemData>> {
-        val folders = folderRepository.getFoldersForUser(userId)
+        val folders = folderRepository.getFoldersForWorkspace(userId)
         val documents = documentRepository.loadDocumentsWorkspace(userId)
 
         val root = ItemData(id = "root", title = "", parentId = "", isFolder = true)

Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,14 @@ class InMemoryFolderRepository : FolderRepository {`
`22`	`22`	`refreshState()`
`23`	`23`	`}`
`24`	`24`
`25`		`- override suspend fun getFoldersForUserAfterTime(`
	`25`	`+ override suspend fun getFoldersForWorkspaceAfterTime(`
`26`	`26`	`userId: String,`
`27`	`27`	`instant: Instant`
`28`	`28`	`): List<Folder> {`
`29`	`29`	`TODO("Not yet implemented")`
`30`	`30`	`}`
`31`	`31`
`32`		`- override suspend fun getFoldersForUser(userId: String): List<Folder> {`
	`32`	`+ override suspend fun getFoldersForWorkspace(workspaceId: String): List<Folder> {`
`33`	`33`	`TODO("Not yet implemented")`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,14 @@ class RoomFolderRepository(`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`		`- override suspend fun getFoldersForUserAfterTime(`
	`30`	`+ override suspend fun getFoldersForWorkspaceAfterTime(`
`31`	`31`	`userId: String,`
`32`	`32`	`instant: Instant`
`33`	`33`	`): List<Folder> {`
`34`	`34`	`TODO("Not yet implemented")`
`35`	`35`	`}`
`36`	`36`
`37`		`- override suspend fun getFoldersForUser(userId: String): List<Folder> {`
	`37`	`+ override suspend fun getFoldersForWorkspace(workspaceId: String): List<Folder> {`
`38`	`38`	`TODO("Not yet implemented")`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,6 @@ class FolderSync(`
`75`	`75`
`76`	`76`	`documentRepository.refreshDocuments()`
`77`	`77`	`folderRepository.updateFolder(folder.copy(lastSyncedAt = now))`
`78`		`- } else {`
`79`		`- return`
`80`	`78`	`}`
`81`	`79`	`}`
`82`	`80`	`}`