Merge branch 'github/main'

core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/DefaultSearchContentsRepository.kt

@@ -20,6 +20,7 @@ import com.google.samples.apps.nowinandroid.core.database.dao.NewsResourceDao
 import com.google.samples.apps.nowinandroid.core.database.dao.NewsResourceFtsDao
 import com.google.samples.apps.nowinandroid.core.database.dao.TopicDao
 import com.google.samples.apps.nowinandroid.core.database.dao.TopicFtsDao
+import com.google.samples.apps.nowinandroid.core.database.model.PopulatedNewsResource
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.database.model.asFtsEntity
 import com.google.samples.apps.nowinandroid.core.model.data.SearchResult
@@ -29,6 +30,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.withContext
@@ -45,7 +47,12 @@ class DefaultSearchContentsRepository @Inject constructor(
     override suspend fun populateFtsData() {
         withContext(ioDispatcher) {
             newsResourceFtsDao.insertAll(
-                newsResourceDao.getOneOffNewsResources().map { it.asFtsEntity() },
+                newsResourceDao.getNewsResources(
+                    useFilterTopicIds = false,
+                    useFilterNewsIds = false,
+                )
+                    .first()
+                    .map(PopulatedNewsResource::asFtsEntity),
             )
             topicFtsDao.insertAll(topicDao.getOneOffTopicEntities().map { it.asFtsEntity() })
         }

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

@@ -67,8 +67,6 @@ class TestNewsResourceDao : NewsResourceDao {
                 result
             }
 
-    override suspend fun getOneOffNewsResources(): List<PopulatedNewsResource> = emptyList()
-
     override suspend fun insertOrIgnoreNewsResources(
         entities: List<NewsResourceEntity>,
     ): List<Long> {

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

@@ -65,10 +65,6 @@ interface NewsResourceDao {
         filterNewsIds: Set<String> = emptySet(),
     ): Flow<List<PopulatedNewsResource>>
 
-    @Transaction
-    @Query(value = "SELECT * FROM news_resources ORDER BY publish_date DESC")
-    suspend fun getOneOffNewsResources(): List<PopulatedNewsResource>
-
     /**
      * Inserts [entities] into the db if they don't exist, and ignores those that do
      */