Merge pull request #835 from blackbracken/avoid_retrieving_unnecessar…

…y_entity Call getNewsResourceIds instead of getNewsResources
android · Jul 24, 2023 · 48041fc · 48041fc
2 parents 0c542b4 + b570be2
commit 48041fc
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 4 deletions.
diff --git a/...a/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.kt b/...a/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.kt
@@ -80,17 +80,14 @@ class OfflineFirstNewsRepository @Inject constructor(
                 val hasOnboarded = userData.shouldHideOnboarding
                 val followedTopicIds = userData.followedTopics
 
-                // TODO: Make this more efficient, there is no need to retrieve populated
-                //  news resources when all that's needed are the ids
                 val existingNewsResourceIdsThatHaveChanged = when {
-                    hasOnboarded -> newsResourceDao.getNewsResources(
+                    hasOnboarded -> newsResourceDao.getNewsResourceIds(
                         useFilterTopicIds = true,
                         filterTopicIds = followedTopicIds,
                         useFilterNewsIds = true,
                         filterNewsIds = changedIds.toSet(),
                     )
                         .first()
-                        .map { it.entity.id }
                         .toSet()
                     // No need to retrieve anything if notifications won't be sent
                     else -> emptySet()

diff --git a/...st/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt b/...st/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt
@@ -67,6 +67,33 @@ class TestNewsResourceDao : NewsResourceDao {
                 result
             }
 
+    override fun getNewsResourceIds(
+        useFilterTopicIds: Boolean,
+        filterTopicIds: Set<String>,
+        useFilterNewsIds: Boolean,
+        filterNewsIds: Set<String>,
+    ): Flow<List<String>> =
+        entitiesStateFlow
+            .map { newsResourceEntities ->
+                newsResourceEntities.map { entity ->
+                    entity.asPopulatedNewsResource(topicCrossReferences)
+                }
+            }
+            .map { resources ->
+                var result = resources
+                if (useFilterTopicIds) {
+                    result = result.filter { resource ->
+                        resource.topics.any { it.id in filterTopicIds }
+                    }
+                }
+                if (useFilterNewsIds) {
+                    result = result.filter { resource ->
+                        resource.entity.id in filterNewsIds
+                    }
+                }
+                result.map { it.entity.id }
+            }
+
     override suspend fun insertOrIgnoreNewsResources(
         entities: List<NewsResourceEntity>,
     ): List<Long> {

diff --git a/...e/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt b/...e/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt
@@ -65,6 +65,37 @@ interface NewsResourceDao {
         filterNewsIds: Set<String> = emptySet(),
     ): Flow<List<PopulatedNewsResource>>
 
+    /**
+     * Fetches ids of news resources that match the query parameters
+     */
+    @Transaction
+    @Query(
+        value = """
+            SELECT id FROM news_resources
+            WHERE 
+                CASE WHEN :useFilterNewsIds
+                    THEN id IN (:filterNewsIds)
+                    ELSE 1
+                END
+             AND
+                CASE WHEN :useFilterTopicIds
+                    THEN id IN
+                        (
+                            SELECT news_resource_id FROM news_resources_topics
+                            WHERE topic_id IN (:filterTopicIds)
+                        )
+                    ELSE 1
+                END
+            ORDER BY publish_date DESC
+    """,
+    )
+    fun getNewsResourceIds(
+        useFilterTopicIds: Boolean = false,
+        filterTopicIds: Set<String> = emptySet(),
+        useFilterNewsIds: Boolean = false,
+        filterNewsIds: Set<String> = emptySet(),
+    ): Flow<List<String>>
+
     /**
      * Inserts [entities] into the db if they don't exist, and ignores those that do
      */