Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Remove Insert function - Insert is only used in test. - Upsert do same thing as Insert.

Jaehwa Noh52c0d7ae0a7b
diff --git a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt
index dc4b78e01..a3e373918 100644
--- a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt
+++ b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt
@@ -92,21 +92,6 @@ class TestNewsResourceDao : NewsResourceDao {
result.map { it.entity.id }
}
- override suspend fun insertOrIgnoreNewsResources(
- entities: List<NewsResourceEntity>,
- ): List<Long> {
- entitiesStateFlow.update { oldValues ->
- // Old values come first so new values don't overwrite them
- (oldValues + entities)
- .distinctBy(NewsResourceEntity::id)
- .sortedWith(
- compareBy(NewsResourceEntity::publishDate).reversed(),
- )
- }
- // Assume no conflicts on insert
- return entities.map { it.id.toLong() }
- }
-
override suspend fun upsertNewsResources(newsResourceEntities: List<NewsResourceEntity>) {
entitiesStateFlow.update { oldValues ->
// New values come first so they overwrite old values
diff --git a/core/database/src/main/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt b/core/database/src/main/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt
index 0ad1e4f7d..929b88ce6 100644
--- a/core/database/src/main/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt
+++ b/core/database/src/main/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt
@@ -96,12 +96,6 @@ interface NewsResourceDao {
filterNewsIds: Set<String> = emptySet(),
): Flow<List<String>>
- /**
- * Inserts [entities] into the db if they don't exist, and ignores those that do
- */
- @Insert(onConflict = OnConflictStrategy.IGNORE)
- suspend fun insertOrIgnoreNewsResources(entities: List<NewsResourceEntity>): List<Long>
-
/**
* Inserts or updates [newsResourceEntities] in the db under the specified primary keys
*/