A fully functional Android app built entirely with Kotlin and Jetpack Compose
[Refactor]: Directly call SearchContentsRepository interface in SearchViewModel
sanao1006825a5e2f5f7e
diff --git a/core/domain/src/main/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetSearchContentsCountUseCase.kt b/core/domain/src/main/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetSearchContentsCountUseCase.ktdeleted file mode 100644index 3e3e1952e..000000000--- a/core/domain/src/main/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetSearchContentsCountUseCase.kt+++ /dev/null@@ -1,31 +0,0 @@-/*- * Copyright 2023 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.domain--import com.google.samples.apps.nowinandroid.core.data.repository.SearchContentsRepository-import kotlinx.coroutines.flow.Flow-import javax.inject.Inject--/**- * A use case which returns total count of *Fts tables- */-class GetSearchContentsCountUseCase @Inject constructor(- private val searchContentsRepository: SearchContentsRepository,-) {- operator fun invoke(): Flow<Int> =- searchContentsRepository.getSearchContentsCount()-}diff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.ktindex 7c05f81c5..f7320e66a 100644--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt+++ b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt@@ -23,8 +23,8 @@ import com.google.samples.apps.nowinandroid.core.analytics.AnalyticsEventimport com.google.samples.apps.nowinandroid.core.analytics.AnalyticsEvent.Paramimport com.google.samples.apps.nowinandroid.core.analytics.AnalyticsHelperimport com.google.samples.apps.nowinandroid.core.data.repository.RecentSearchRepository+import com.google.samples.apps.nowinandroid.core.data.repository.SearchContentsRepositoryimport com.google.samples.apps.nowinandroid.core.domain.GetRecentSearchQueriesUseCase-import com.google.samples.apps.nowinandroid.core.domain.GetSearchContentsCountUseCaseimport com.google.samples.apps.nowinandroid.core.domain.GetSearchContentsUseCaseimport com.google.samples.apps.nowinandroid.core.model.data.UserSearchResultimport dagger.hilt.android.lifecycle.HiltViewModel@@ -41,8 +41,8 @@ import javax.inject.Inject@HiltViewModelclass SearchViewModel @Inject constructor(getSearchContentsUseCase: GetSearchContentsUseCase,- getSearchContentsCountUseCase: GetSearchContentsCountUseCase,recentSearchQueriesUseCase: GetRecentSearchQueriesUseCase,+ private val searchContentsRepository: SearchContentsRepository,private val recentSearchRepository: RecentSearchRepository,private val savedStateHandle: SavedStateHandle,private val analyticsHelper: AnalyticsHelper,@@ -51,7 +51,7 @@ class SearchViewModel @Inject constructor(val searchQuery = savedStateHandle.getStateFlow(key = SEARCH_QUERY, initialValue = "")val searchResultUiState: StateFlow<SearchResultUiState> =- getSearchContentsCountUseCase()+ searchContentsRepository.getSearchContentsCount().flatMapLatest { totalCount ->if (totalCount < SEARCH_MIN_FTS_ENTITY_COUNT) {flowOf(SearchResultUiState.SearchNotReady)diff --git a/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt b/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.ktindex da0d5654e..3834ecd23 100644--- a/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt+++ b/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt@@ -19,7 +19,6 @@ package com.google.samples.apps.nowinandroid.feature.searchimport androidx.lifecycle.SavedStateHandleimport com.google.samples.apps.nowinandroid.core.analytics.NoOpAnalyticsHelperimport com.google.samples.apps.nowinandroid.core.domain.GetRecentSearchQueriesUseCase-import com.google.samples.apps.nowinandroid.core.domain.GetSearchContentsCountUseCaseimport com.google.samples.apps.nowinandroid.core.domain.GetSearchContentsUseCaseimport com.google.samples.apps.nowinandroid.core.testing.data.newsResourcesTestDataimport com.google.samples.apps.nowinandroid.core.testing.data.topicsTestData@@ -59,15 +58,14 @@ class SearchViewModelTest {)private val recentSearchRepository = TestRecentSearchRepository()private val getRecentQueryUseCase = GetRecentSearchQueriesUseCase(recentSearchRepository)- private val getSearchContentsCountUseCase = GetSearchContentsCountUseCase(searchContentsRepository)private lateinit var viewModel: SearchViewModel@Beforefun setup() {viewModel = SearchViewModel(getSearchContentsUseCase = getSearchContentsUseCase,- getSearchContentsCountUseCase = getSearchContentsCountUseCase,recentSearchQueriesUseCase = getRecentQueryUseCase,+ searchContentsRepository = searchContentsRepository,savedStateHandle = SavedStateHandle(),recentSearchRepository = recentSearchRepository,analyticsHelper = NoOpAnalyticsHelper(),@@ -84,7 +82,8 @@ class SearchViewModelTest {fun stateIsEmptyQuery_withEmptySearchQuery() = runTest {searchContentsRepository.addNewsResources(newsResourcesTestData)searchContentsRepository.addTopics(topicsTestData)- val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }+ val collectJob =+ launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }viewModel.onSearchQueryChanged("")@@ -95,7 +94,8 @@ class SearchViewModelTest {@Testfun emptyResultIsReturned_withNotMatchingQuery() = runTest {- val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }+ val collectJob =+ launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }viewModel.onSearchQueryChanged("XXX")searchContentsRepository.addNewsResources(newsResourcesTestData)@@ -109,7 +109,8 @@ class SearchViewModelTest {@Testfun recentSearches_verifyUiStateIsSuccess() = runTest {- val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.recentSearchQueriesUiState.collect() }+ val collectJob =+ launch(UnconfinedTestDispatcher()) { viewModel.recentSearchQueriesUiState.collect() }viewModel.onSearchTriggered("kotlin")val result = viewModel.recentSearchQueriesUiState.value@@ -120,7 +121,8 @@ class SearchViewModelTest {@Testfun searchNotReady_withNoFtsTableEntity() = runTest {- val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }+ val collectJob =+ launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }viewModel.onSearchQueryChanged("")