Specify behaviour when updating entities with same ID in different lists

getodk · May 20, 2024 · be3fb7e · be3fb7e
1 parent 3f19a8b
commit be3fb7e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/entities/JsonFileEntitiesRepository.kt b/collect_app/src/main/java/org/odk/collect/android/entities/JsonFileEntitiesRepository.kt
@@ -23,7 +23,7 @@ class JsonFileEntitiesRepository(directory: File) : EntitiesRepository {
         val storedEntities = readEntities()
 
         entities.forEach { entity ->
-            val existing = storedEntities.find { it.id == entity.id && it.list == entity.list }
+            val existing = storedEntities.find { it.id == entity.id }
 
             if (existing != null) {
                 val offline = if (existing.offline) {

diff --git a/collect_app/src/test/java/org/odk/collect/android/entities/EntitiesRepositoryTest.kt b/collect_app/src/test/java/org/odk/collect/android/entities/EntitiesRepositoryTest.kt
@@ -56,6 +56,22 @@ abstract class EntitiesRepositoryTest {
         assertThat(wines, contains(updatedWine))
     }
 
+    @Test
+    fun `#save updates existing entity with matching id in different list`() {
+        val repository = buildSubject()
+
+        val wine = Entity("wines", "1", "Léoville Barton 2008", version = 1)
+        repository.save(wine)
+
+        val updatedWine = Entity("whisky", wine.id, "Edradour 10", version = 2)
+        repository.save(updatedWine)
+
+        val wines = repository.getEntities("wines")
+        assertThat(wines.size, equalTo(0))
+        val whiskys = repository.getEntities("whisky")
+        assertThat(whiskys, contains(updatedWine))
+    }
+
     @Test
     fun `#save updates existing entity with matching id and version`() {
         val repository = buildSubject()

diff --git a/entities/src/main/java/org/odk/collect/entities/InMemEntitiesRepository.kt b/entities/src/main/java/org/odk/collect/entities/InMemEntitiesRepository.kt
@@ -29,7 +29,7 @@ class InMemEntitiesRepository : EntitiesRepository {
     override fun save(vararg entities: Entity) {
         entities.forEach { entity ->
             lists.add(entity.list)
-            val existing = this.entities.find { it.id == entity.id && it.list == entity.list }
+            val existing = this.entities.find { it.id == entity.id }
 
             if (existing != null) {
                 val offline = if (existing.offline) {