Fix handleIdConflicts

We need to exclude new client IDs in the ID check
Wavesonics · Nov 2, 2024 · 140fe3c · 140fe3c
1 parent 02aedc2
commit 140fe3c
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/...dios/apps/hammer/common/data/sync/projectsync/operations/IdConflictResolutionOperation.kt b/...dios/apps/hammer/common/data/sync/projectsync/operations/IdConflictResolutionOperation.kt
@@ -60,13 +60,22 @@ class IdConflictResolutionOperation(
 		return CResult.success(newState)
 	}
 
+	private fun calculateLastClientIdWithoutNewIds(clientSyncData: ProjectSynchronizationData): Int {
+		return if (clientSyncData.newIds.isNotEmpty()) {
+			clientSyncData.newIds.min() - 1
+		} else {
+			clientSyncData.lastId
+		}
+	}
+
 	private suspend fun handleIdConflicts(
 		clientSyncData: ProjectSynchronizationData,
 		serverSyncData: ProjectSynchronizationBegan,
 		onLog: OnSyncLog
 	): ProjectSynchronizationData {
 
-		return if (serverSyncData.lastId >= clientSyncData.lastId) {
+		val lastClientIdWithoutNew = calculateLastClientIdWithoutNewIds(clientSyncData)
+		return if (serverSyncData.lastId > lastClientIdWithoutNew) {
 			if (clientSyncData.newIds.isNotEmpty()) {
 				var serverLastId = serverSyncData.lastId
 				val updatedNewIds = clientSyncData.newIds.toMutableList()