Fix TileSourceEntity id generation. (#2045)

* Fix TileSourceEntity id generation. Room treats non-null values assigned to boxed types (e.g. Int?, Integer) as explicit values and will not auto-generate IDs when these values are provided. This was causing UNIQUNESS constraint failures when inserting/updating tilesource entites, as we were using `0` as a default. Converting to a non-boxed primitive type `Int` results in the correct behavior (Room treats `0` as an indicator that a value should be generated).
google · Nov 6, 2023 · be39c55 · be39c55
1 parent 5bacd8a
commit be39c55
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/ground/src/main/java/com/google/android/ground/Config.kt b/ground/src/main/java/com/google/android/ground/Config.kt
@@ -26,7 +26,7 @@ object Config {
 
   // Local db settings.
   // TODO(#128): Reset version to 1 before releasing.
-  const val DB_VERSION = 108
+  const val DB_VERSION = 109
   const val DB_NAME = "ground.db"
 
   // Firebase Cloud Firestore settings.

diff --git a/...src/main/java/com/google/android/ground/persistence/local/room/entity/TileSourceEntity.kt b/...src/main/java/com/google/android/ground/persistence/local/room/entity/TileSourceEntity.kt
@@ -35,7 +35,7 @@ import androidx.room.PrimaryKey
   indices = [Index("survey_id")]
 )
 data class TileSourceEntity(
-  @ColumnInfo(name = "id") @PrimaryKey(autoGenerate = true) val id: Int? = 0,
+  @ColumnInfo(name = "id") @PrimaryKey(autoGenerate = true) val id: Int = 0,
   @ColumnInfo(name = "survey_id") val surveyId: String,
   @ColumnInfo(name = "url") val url: String,
   @ColumnInfo(name = "type") val type: TileSourceEntityType

diff --git a/ground/src/test/java/com/google/android/ground/persistence/local/LocalDataStoreTests.kt b/ground/src/test/java/com/google/android/ground/persistence/local/LocalDataStoreTests.kt
@@ -24,6 +24,7 @@ import com.google.android.ground.model.geometry.LinearRing
 import com.google.android.ground.model.geometry.Point
 import com.google.android.ground.model.geometry.Polygon
 import com.google.android.ground.model.imagery.OfflineArea
+import com.google.android.ground.model.imagery.TileSource
 import com.google.android.ground.model.job.Job
 import com.google.android.ground.model.job.Style
 import com.google.android.ground.model.mutation.LocationOfInterestMutation
@@ -375,6 +376,12 @@ class LocalDataStoreTests : BaseHiltTest() {
     assertThat(localValueStore.isTermsOfServiceAccepted).isFalse()
   }
 
+  @Test
+  fun testInsertOrUpdateSurvey_usesUniqueKeyForTileSources() = runWithTestDispatcher {
+    // Should not throw.
+    localSurveyStore.insertOrUpdateSurvey(TEST_SURVEY_WITH_TILE_SOURCES)
+  }
+
   companion object {
     private val TEST_USER = User("user id", "[email protected]", "user 1")
     private val TEST_TASK = Task("task id", 1, Task.Type.TEXT, "task label", false)
@@ -383,6 +390,14 @@ class LocalDataStoreTests : BaseHiltTest() {
       Job("job id", TEST_STYLE, "heading title", mapOf(Pair(TEST_TASK.id, TEST_TASK)))
     private val TEST_SURVEY =
       Survey("survey id", "survey 1", "foo description", mapOf(Pair(TEST_JOB.id, TEST_JOB)))
+    private val TEST_SURVEY_WITH_TILE_SOURCES =
+      TEST_SURVEY.copy(
+        tileSources =
+          listOf(
+            TileSource(url = "dummy URL", type = TileSource.Type.TILED_WEB_MAP),
+            TileSource(url = "other dummy URL", type = TileSource.Type.TILED_WEB_MAP)
+          )
+      )
     private val TEST_POINT = Point(Coordinates(110.0, -23.1))
     private val TEST_POINT_2 = Point(Coordinates(51.0, 44.0))
     private val TEST_POLYGON_1 =