Merge pull request #311 from yveskalume/main

Use @Upsert from Room instead of a custom helper

core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestAuthorDao.kt

@@ -57,6 +57,10 @@ class TestAuthorDao : AuthorDao {
         throw NotImplementedError("Unused in tests")
     }
 
+    override suspend fun upsertAuthors(entities: List<AuthorEntity>) {
+        entitiesStateFlow.value = entities
+    }
+
     override suspend fun deleteAuthors(ids: List<String>) {
         val idSet = ids.toSet()
         entitiesStateFlow.update { entities ->

core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt

@@ -85,6 +85,10 @@ class TestNewsResourceDao : NewsResourceDao {
         throw NotImplementedError("Unused in tests")
     }
 
+    override suspend fun upsertNewsResources(newsResourceEntities: List<NewsResourceEntity>) {
+        entitiesStateFlow.value = newsResourceEntities
+    }
+
     override suspend fun insertOrIgnoreTopicCrossRefEntities(
         newsResourceTopicCrossReferences: List<NewsResourceTopicCrossRef>
     ) {

core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestTopicDao.kt

@@ -62,6 +62,10 @@ class TestTopicDao : TopicDao {
         throw NotImplementedError("Unused in tests")
     }
 
+    override suspend fun upsertTopics(entities: List<TopicEntity>) {
+        entitiesStateFlow.value = entities
+    }
+
     override suspend fun deleteTopics(ids: List<String>) {
         val idSet = ids.toSet()
         entitiesStateFlow.update { entities ->

core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/AuthorDao.kt

@@ -20,8 +20,8 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Transaction
 import androidx.room.Update
+import androidx.room.Upsert
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity
 import kotlinx.coroutines.flow.Flow
 
@@ -56,12 +56,8 @@ interface AuthorDao {
     /**
      * Inserts or updates [entities] in the db under the specified primary keys
      */
-    @Transaction
-    suspend fun upsertAuthors(entities: List<AuthorEntity>) = upsert(
-        items = entities,
-        insertMany = ::insertOrIgnoreAuthors,
-        updateMany = ::updateAuthors
-    )
+    @Upsert
+    suspend fun upsertAuthors(entities: List<AuthorEntity>)
 
     /**
      * Deletes rows in the db matching the specified [ids]

core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt

@@ -22,6 +22,7 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
 import androidx.room.Update
+import androidx.room.Upsert
 import com.google.samples.apps.nowinandroid.core.database.model.NewsResourceAuthorCrossRef
 import com.google.samples.apps.nowinandroid.core.database.model.NewsResourceEntity
 import com.google.samples.apps.nowinandroid.core.database.model.NewsResourceTopicCrossRef
@@ -80,12 +81,8 @@ interface NewsResourceDao {
     /**
      * Inserts or updates [newsResourceEntities] in the db under the specified primary keys
      */
-    @Transaction
-    suspend fun upsertNewsResources(newsResourceEntities: List<NewsResourceEntity>) = upsert(
-        items = newsResourceEntities,
-        insertMany = ::insertOrIgnoreNewsResources,
-        updateMany = ::updateNewsResources
-    )
+    @Upsert
+    suspend fun upsertNewsResources(newsResourceEntities: List<NewsResourceEntity>)
 
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     suspend fun insertOrIgnoreTopicCrossRefEntities(

core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.kt

@@ -20,8 +20,8 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import androidx.room.Transaction
 import androidx.room.Update
+import androidx.room.Upsert
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
 import kotlinx.coroutines.flow.Flow
 
@@ -64,12 +64,8 @@ interface TopicDao {
     /**
      * Inserts or updates [entities] in the db under the specified primary keys
      */
-    @Transaction
-    suspend fun upsertTopics(entities: List<TopicEntity>) = upsert(
-        items = entities,
-        insertMany = ::insertOrIgnoreTopics,
-        updateMany = ::updateTopics
-    )
+    @Upsert
+    suspend fun upsertTopics(entities: List<TopicEntity>)
 
     /**
      * Deletes rows in the db matching the specified [ids]

core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/UpsertHelper.kt

@@ -1,37 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.samples.apps.nowinandroid.core.database.dao
-
-/**
- * Performs an upsert by first attempting to insert [items] using [insertMany] with the the result
- * of the inserts returned.
- *
- * Items that were not inserted due to conflicts are then updated using [updateMany]
- */
-suspend fun <T> upsert(
-    items: List<T>,
-    insertMany: suspend (List<T>) -> List<Long>,
-    updateMany: suspend (List<T>) -> Unit,
-) {
-    val insertResults = insertMany(items)
-
-    val updateList = items.zip(insertResults)
-        .mapNotNull { (item, insertResult) ->
-            if (insertResult == -1L) item else null
-        }
-    if (updateList.isNotEmpty()) updateMany(updateList)
-}

gradle/libs.versions.toml

@@ -46,7 +46,7 @@ protobuf = "3.21.5"
 protobufPlugin = "0.8.19"
 retrofit = "2.9.0"
 retrofitKotlinxSerializationJson = "0.8.0"
-room = "2.4.3"
+room = "2.5.0-alpha03"
 secrets = "2.0.1"
 turbine = "0.8.0"