From 0f5174e75147df0289b5fd6ffeff5a8875f3bf7c Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sat, 21 Nov 2026 00:54:08 +0000 Subject: [PATCH] Fix catalogue re-import cascading tastings and overwriting edits Use OnConflictStrategy.IGNORE for bulk catalogue inserts so existing wine rows are not deleted and re-created (which CASCADE-deleted tastings). Apply delta catalogue updates with Room @Update instead of REPLACE insert. Add instrumented DAO test for re-import preserving tastings and user edits. Co-authored-by: T0liver --- .../dao/CatalogImportPreservesDataTest.kt | 125 ++++++++++++++++++ .../hu/toliver/vinotes/data/dao/WineDao.kt | 5 +- .../data/repository/WineRepositoryImpl.kt | 4 + .../domain/repository/WineRepository.kt | 1 + .../catalog/PerformDeltaSyncUseCase.kt | 2 +- 5 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 app/src/androidTest/java/hu/toliver/vinotes/data/dao/CatalogImportPreservesDataTest.kt diff --git a/app/src/androidTest/java/hu/toliver/vinotes/data/dao/CatalogImportPreservesDataTest.kt b/app/src/androidTest/java/hu/toliver/vinotes/data/dao/CatalogImportPreservesDataTest.kt new file mode 100644 index 0000000..f56ec46 --- /dev/null +++ b/app/src/androidTest/java/hu/toliver/vinotes/data/dao/CatalogImportPreservesDataTest.kt @@ -0,0 +1,125 @@ +package hu.toliver.vinotes.data.dao + +import android.content.Context +import androidx.room.Room +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import hu.toliver.vinotes.data.WineDatabase +import hu.toliver.vinotes.data.local.entity.TasteEntity +import hu.toliver.vinotes.data.local.entity.WineEntity +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.runBlocking +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class CatalogImportPreservesDataTest { + + private lateinit var database: WineDatabase + private lateinit var wineDao: WineDao + private lateinit var tasteDao: TasteDao + + @Before + fun setUp() { + val context = ApplicationProvider.getApplicationContext() + database = Room.inMemoryDatabaseBuilder(context, WineDatabase::class.java) + .allowMainThreadQueries() + .build() + wineDao = database.wineDao() + tasteDao = database.tasteDao() + } + + @After + fun tearDown() { + database.close() + } + + @Test + fun catalogReimportPreservesTastingsAndUserEdits() = runBlocking { + val wineId = "catalog-wine-1" + val original = sampleCatalogWine(id = wineId, producer = "Original Producer", year = 2020) + wineDao.insertAll(listOf(original)) + + val tasting = sampleTasting(wineId = wineId, id = "taste-1") + tasteDao.insert(tasting) + + val userEdited = original.copy(producer = "User Producer", year = 2019) + wineDao.update(userEdited) + + val reimportFromCatalog = sampleCatalogWine( + id = wineId, + producer = "Catalog Producer", + year = 2022, + isFromCatalog = true + ) + wineDao.insertAll(listOf(reimportFromCatalog)) + + val storedWine = wineDao.getById(wineId) + assertNotNull(storedWine) + assertEquals("User Producer", storedWine!!.producer) + assertEquals(2019, storedWine.year) + + val tastings = tasteDao.getByWineId(wineId).first() + assertEquals(1, tastings.size) + assertEquals("taste-1", tastings.first().id) + } + + private fun sampleCatalogWine( + id: String, + producer: String, + year: Int, + isFromCatalog: Boolean = true + ) = WineEntity( + id = id, + name = "Test Wine", + producer = producer, + year = year, + grape = "Test Grape", + isCuvee = false, + cuveeComponents = "", + country = "HU", + region = "Test Region", + colour = "WHITE", + sweetness = "DRY", + sugar = 0f, + alcoholPercentage = 12.0, + volume = 750, + description = "", + imageUrl = "", + isFromCatalog = isFromCatalog + ) + + private fun sampleTasting(wineId: String, id: String) = TasteEntity( + id = id, + wineId = wineId, + clarity = "CLEAR", + colourIntensity = "MEDIUM", + colour = "WHITE", + otherVisual = "", + noseIntensity = "MEDIUM", + noseAroma = "", + noseDevelopment = "DEVELOPED", + otherNose = "", + sweetness = "DRY", + acidity = "MEDIUM", + tannin = "LOW", + body = "MEDIUM", + alcohol = "MEDIUM", + flavourIntensity = "MEDIUM", + flavourCharacteristics = "", + finish = "MEDIUM", + otherPalate = "", + rating = 4, + overallImpression = "", + bestWith = "", + wouldDrinkAgain = true, + date = 1_700_000_000_000L, + place = "Home", + latitude = null, + longitude = null + ) +} \ No newline at end of file diff --git a/app/src/main/java/hu/toliver/vinotes/data/dao/WineDao.kt b/app/src/main/java/hu/toliver/vinotes/data/dao/WineDao.kt index 922423d..bcb7f7c 100644 --- a/app/src/main/java/hu/toliver/vinotes/data/dao/WineDao.kt +++ b/app/src/main/java/hu/toliver/vinotes/data/dao/WineDao.kt @@ -37,12 +37,15 @@ interface WineDao { @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertOrReplace(wine: WineEntity) - @Insert(onConflict = OnConflictStrategy.REPLACE) + @Insert(onConflict = OnConflictStrategy.IGNORE) suspend fun insertAll(wines: List) @Update suspend fun update(wine: WineEntity) + @Update + suspend fun updateAll(wines: List) + @Query("DELETE FROM wines WHERE id = :id") suspend fun deleteById(id: String) diff --git a/app/src/main/java/hu/toliver/vinotes/data/repository/WineRepositoryImpl.kt b/app/src/main/java/hu/toliver/vinotes/data/repository/WineRepositoryImpl.kt index 96aa3d7..14e2ab6 100644 --- a/app/src/main/java/hu/toliver/vinotes/data/repository/WineRepositoryImpl.kt +++ b/app/src/main/java/hu/toliver/vinotes/data/repository/WineRepositoryImpl.kt @@ -49,6 +49,10 @@ class WineRepositoryImpl @Inject constructor( dao.insertAll(wines.map { it.toEntity(isFromCatalog = fromCatalog) }) } + override suspend fun updateAll(wines: List, fromCatalog: Boolean): Result = runCatching { + dao.updateAll(wines.map { it.toEntity(isFromCatalog = fromCatalog) }) + } + override suspend fun update(wine: Wine): Result = runCatching { dao.update(wine.toEntity()) } diff --git a/app/src/main/java/hu/toliver/vinotes/domain/repository/WineRepository.kt b/app/src/main/java/hu/toliver/vinotes/domain/repository/WineRepository.kt index 7bdb112..9ad8185 100644 --- a/app/src/main/java/hu/toliver/vinotes/domain/repository/WineRepository.kt +++ b/app/src/main/java/hu/toliver/vinotes/domain/repository/WineRepository.kt @@ -16,6 +16,7 @@ interface WineRepository { ): Flow> suspend fun insert(wine: Wine): Result suspend fun insertAll(wines: List, fromCatalog: Boolean): Result + suspend fun updateAll(wines: List, fromCatalog: Boolean): Result suspend fun insertIfNotExists(wine: Wine): Result suspend fun update(wine: Wine): Result suspend fun delete(id: String): Result diff --git a/app/src/main/java/hu/toliver/vinotes/domain/usecases/catalog/PerformDeltaSyncUseCase.kt b/app/src/main/java/hu/toliver/vinotes/domain/usecases/catalog/PerformDeltaSyncUseCase.kt index e61d9df..ea5fc96 100644 --- a/app/src/main/java/hu/toliver/vinotes/domain/usecases/catalog/PerformDeltaSyncUseCase.kt +++ b/app/src/main/java/hu/toliver/vinotes/domain/usecases/catalog/PerformDeltaSyncUseCase.kt @@ -35,7 +35,7 @@ class PerformDeltaSyncUseCase @Inject constructor( } if (delta.updated.isNotEmpty()) { - wineRepository.insertAll(delta.updated, fromCatalog = true).getOrThrow() + wineRepository.updateAll(delta.updated, fromCatalog = true).getOrThrow() } if (delta.removedIds.isNotEmpty()) {