Corrected fusion which didn't increment the ids

Author: foll0wer

app/build.gradle.kts

@@ -19,7 +19,7 @@ android {
         minSdk = 26
         targetSdk = 36
         versionCode = 1
-        versionName = "1.0"
+        versionName = "1.0.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/mouton/openwinemer/data/local/WineDao.kt

@@ -51,10 +51,13 @@ interface WineDao {
     @Query("DELETE FROM wines")
     suspend fun clearAll()
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
     suspend fun insertAll(wines: List<WineEntity>)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertOrUpdate(wines: List<WineEntity>)
 
+    @Query("SELECT MAX(id) FROM wines")
+    suspend fun getLastId(): Long?
+
 }

app/src/main/java/com/mouton/openwinemer/domain/usecase/BackupUseCase.kt

@@ -101,10 +101,19 @@ class BackupUseCase(
 
         // 4) Remplacer ou fusionner
         if (replace) {
+            // 🔥 MODE REMPLACER : on efface tout et on laisse Room recréer les IDs
             wineDao.clearAll()
-            wineDao.insertAll(wines)
+            val winesWithoutId = wines.map { it.copy(id = 0) }
+            wineDao.insertAll(winesWithoutId)
         } else {
-            wineDao.insertOrUpdate(wines)
+            // 🔥 MODE FUSIONNER : on récupère le dernier ID existant
+            val lastId = wineDao.getLastId() ?: 0L
+            // On renumérote les vins importés pour éviter les collisions
+            var nextId = lastId + 1
+            val winesWithNewIds = wines.map { wine ->
+                wine.copy(id = nextId++)
+            }
+            wineDao.insertOrUpdate(winesWithNewIds)
         }
     }