Extract SearchUseCase, improve search

mdrlzy · kirillt · commit f657fb7e0a10 · 2025-07-11T17:34:24.000+05:00
diff --git a/core/di/src/main/java/dev/arkbuilders/rate/core/di/CoreComponent.kt b/core/di/src/main/java/dev/arkbuilders/rate/core/di/CoreComponent.kt
@@ -19,8 +19,8 @@ import dev.arkbuilders.rate.core.domain.usecase.CalcFrequentCurrUseCase
 import dev.arkbuilders.rate.core.domain.usecase.ConvertWithRateUseCase
 import dev.arkbuilders.rate.core.domain.usecase.DefaultGroupNameProvider
 import dev.arkbuilders.rate.core.domain.usecase.GetGroupByIdOrCreateDefaultUseCase
-import dev.arkbuilders.rate.core.domain.usecase.GetTopResultUseCase
 import dev.arkbuilders.rate.core.domain.usecase.GroupReorderSwapUseCase
+import dev.arkbuilders.rate.core.domain.usecase.SearchUseCase
 import dev.arkbuilders.rate.core.domain.usecase.ValidateGroupNameUseCase
 import javax.inject.Singleton
 
@@ -57,7 +57,7 @@ interface CoreComponent {
 
     fun calcFrequentCurrUseCase(): CalcFrequentCurrUseCase
 
-    fun getTopResultUseCase(): GetTopResultUseCase
+    fun searchUseCase(): SearchUseCase
 
     fun validateGroupNameUseCase(): ValidateGroupNameUseCase
 
diff --git a/core/di/src/main/java/dev/arkbuilders/rate/core/di/modules/UseCaseModule.kt b/core/di/src/main/java/dev/arkbuilders/rate/core/di/modules/UseCaseModule.kt
@@ -2,15 +2,16 @@ package dev.arkbuilders.rate.core.di.modules
 
 import dagger.Module
 import dagger.Provides
+import dev.arkbuilders.rate.core.domain.BuildConfigFieldsProvider
 import dev.arkbuilders.rate.core.domain.repo.CodeUseStatRepo
 import dev.arkbuilders.rate.core.domain.repo.CurrencyRepo
 import dev.arkbuilders.rate.core.domain.repo.GroupRepo
 import dev.arkbuilders.rate.core.domain.usecase.CalcFrequentCurrUseCase
 import dev.arkbuilders.rate.core.domain.usecase.ConvertWithRateUseCase
 import dev.arkbuilders.rate.core.domain.usecase.DefaultGroupNameProvider
 import dev.arkbuilders.rate.core.domain.usecase.GetGroupByIdOrCreateDefaultUseCase
-import dev.arkbuilders.rate.core.domain.usecase.GetTopResultUseCase
 import dev.arkbuilders.rate.core.domain.usecase.GroupReorderSwapUseCase
+import dev.arkbuilders.rate.core.domain.usecase.SearchUseCase
 import dev.arkbuilders.rate.core.domain.usecase.ValidateGroupNameUseCase
 import javax.inject.Singleton
 
@@ -25,13 +26,6 @@ class UseCaseModule {
     @Provides
     fun convertWithRateUseCase(currencyRepo: CurrencyRepo) = ConvertWithRateUseCase(currencyRepo)
 
-    @Singleton
-    @Provides
-    fun getTopResultUseCase(
-        currencyRepo: CurrencyRepo,
-        calcFrequentCurrUseCase: CalcFrequentCurrUseCase,
-    ) = GetTopResultUseCase(currencyRepo, calcFrequentCurrUseCase)
-
     @Singleton
     @Provides
     fun prepopulateDefaultGroupUseCase(
@@ -46,4 +40,9 @@ class UseCaseModule {
     @Singleton
     @Provides
     fun validateGroupNameUseCase() = ValidateGroupNameUseCase()
+
+    @Singleton
+    @Provides
+    fun searchUseCase(buildConfigFieldsProvider: BuildConfigFieldsProvider) =
+        SearchUseCase(buildConfigFieldsProvider.provide())
 }
diff --git a/core/domain/src/main/java/dev/arkbuilders/rate/core/domain/usecase/SearchUseCase.kt b/core/domain/src/main/java/dev/arkbuilders/rate/core/domain/usecase/SearchUseCase.kt
@@ -0,0 +1,30 @@
+package dev.arkbuilders.rate.core.domain.usecase
+
+import dev.arkbuilders.rate.core.domain.BuildConfigFields
+import dev.arkbuilders.rate.core.domain.model.CurrencyCode
+import dev.arkbuilders.rate.core.domain.model.CurrencyName
+
+class SearchUseCase(
+    private val buildConfigFields: BuildConfigFields,
+) {
+    operator fun invoke(
+        all: List<CurrencyName>,
+        frequent: List<CurrencyCode>,
+        query: String,
+    ): List<CurrencyName> {
+        val filtered =
+            all
+                .filter {
+                    it.name.contains(query, ignoreCase = true) ||
+                        it.code.contains(query, ignoreCase = true)
+                }.sortedBy { it.code }
+
+        val prefix =
+            filtered.filter { it.code.startsWith(query, ignoreCase = true) }
+        val frequent = filtered.filter { it.code in frequent }
+        val icons = filtered.filter { it.code in buildConfigFields.availableIconCodes }
+
+        val result = prefix + frequent + icons + filtered
+        return result.distinct()
+    }
+}
diff --git a/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/QuickScreen.kt b/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/QuickScreen.kt
@@ -277,8 +277,7 @@ private fun Content(
         }
         if (state.filter.isNotEmpty()) {
             QuickSearchPage(
-                filter = state.filter,
-                topResults = state.topResults,
+                topResultsFiltered = state.topResultsFiltered,
                 onNewCode = onNewCode,
             )
         } else {
diff --git a/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/QuickSearchPage.kt b/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/QuickSearchPage.kt
@@ -15,21 +15,15 @@ import dev.arkbuilders.rate.core.presentation.ui.NoResult
 
 @Composable
 fun QuickSearchPage(
-    filter: String,
-    topResults: List<CurrencyName>,
+    topResultsFiltered: List<CurrencyName>,
     onNewCode: (CurrencyCode) -> Unit,
 ) {
-    val filtered =
-        topResults.filter {
-            it.name.contains(filter, ignoreCase = true) ||
-                it.code.contains(filter, ignoreCase = true)
-        }
-    if (filtered.isNotEmpty()) {
+    if (topResultsFiltered.isNotEmpty()) {
         LazyColumn(modifier = Modifier.fillMaxSize()) {
             item {
                 ListHeader(text = stringResource(CoreRString.top_results))
             }
-            items(filtered) { name ->
+            items(topResultsFiltered) { name ->
                 CurrencyInfoItem(name) { onNewCode(it.code) }
             }
         }
diff --git a/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/QuickViewModel.kt b/feature/quick/src/main/java/dev/arkbuilders/rate/feature/quick/presentation/main/QuickViewModel.kt
@@ -17,8 +17,8 @@ import dev.arkbuilders.rate.core.domain.repo.Prefs
 import dev.arkbuilders.rate.core.domain.repo.TimestampRepo
 import dev.arkbuilders.rate.core.domain.usecase.CalcFrequentCurrUseCase
 import dev.arkbuilders.rate.core.domain.usecase.ConvertWithRateUseCase
-import dev.arkbuilders.rate.core.domain.usecase.GetTopResultUseCase
 import dev.arkbuilders.rate.core.domain.usecase.GroupReorderSwapUseCase
+import dev.arkbuilders.rate.core.domain.usecase.SearchUseCase
 import dev.arkbuilders.rate.core.presentation.ui.group.EditGroupOptionsSheetState
 import dev.arkbuilders.rate.core.presentation.ui.group.EditGroupRenameSheetState
 import dev.arkbuilders.rate.core.presentation.ui.group.EditGroupReorderSheetState
@@ -45,7 +45,7 @@ data class QuickScreenState(
     val filter: String = "",
     val currencies: List<CurrencyName> = emptyList(),
     val frequent: List<CurrencyName> = emptyList(),
-    val topResults: List<CurrencyName> = emptyList(),
+    val topResultsFiltered: List<CurrencyName> = emptyList(),
     val pages: List<QuickScreenPage> = emptyList(),
     val pairOptionsData: PairOptionsData? = null,
     val editGroupReorderSheetState: EditGroupReorderSheetState? = null,
@@ -76,7 +76,7 @@ class QuickViewModel(
     private val convertUseCase: ConvertWithRateUseCase,
     private val calcFrequentCurrUseCase: CalcFrequentCurrUseCase,
     private val groupReorderSwapUseCase: GroupReorderSwapUseCase,
-    private val getTopResultUseCase: GetTopResultUseCase,
+    private val searchUseCase: SearchUseCase,
     private val analyticsManager: AnalyticsManager,
     private val prefs: Prefs,
 ) : ViewModel(), ContainerHost<QuickScreenState, QuickScreenEffect> {
@@ -118,25 +118,21 @@ class QuickViewModel(
                 val frequent =
                     calcFrequentCurrUseCase.invoke()
                         .map { currencyRepo.nameByCode(it) }
-                val topResults = getTopResultUseCase()
                 reduce {
                     state.copy(
                         frequent = frequent,
-                        topResults = topResults,
                     )
                 }
             }.launchIn(viewModelScope)
 
             val frequent =
                 calcFrequentCurrUseCase()
                     .map { currencyRepo.nameByCode(it) }
-            val topResults = getTopResultUseCase()
             val pages = mapPairsToPages(quickRepo.getAll())
             reduce {
                 state.copy(
                     currencies = allCurrencies,
                     frequent = frequent,
-                    topResults = topResults,
                     pages = pages,
                     initialized = true,
                 )
@@ -195,7 +191,17 @@ class QuickViewModel(
 
     fun onFilterChanged(filter: String) =
         blockingIntent {
-            reduce { state.copy(filter = filter) }
+            reduce {
+                state.copy(
+                    filter = filter,
+                    topResultsFiltered =
+                        searchUseCase(
+                            state.currencies,
+                            state.frequent.map { it.code },
+                            filter,
+                        ),
+                )
+            }
         }
 
     fun onDelete(pair: QuickPair) =
@@ -357,7 +363,7 @@ class QuickViewModelFactory @AssistedInject constructor(
     private val convertUseCase: ConvertWithRateUseCase,
     private val calcFrequentCurrUseCase: CalcFrequentCurrUseCase,
     private val groupReorderSwapUseCase: GroupReorderSwapUseCase,
-    private val getTopResultUseCase: GetTopResultUseCase,
+    private val searchUseCase: SearchUseCase,
     private val analyticsManager: AnalyticsManager,
     private val prefs: Prefs,
 ) : ViewModelProvider.Factory {
@@ -370,7 +376,7 @@ class QuickViewModelFactory @AssistedInject constructor(
             convertUseCase,
             calcFrequentCurrUseCase,
             groupReorderSwapUseCase,
-            getTopResultUseCase,
+            searchUseCase,
             analyticsManager,
             prefs,
         ) as T
diff --git a/feature/search/src/main/java/dev/arkbuilders/rate/feature/search/di/SearchComponent.kt b/feature/search/src/main/java/dev/arkbuilders/rate/feature/search/di/SearchComponent.kt
@@ -3,13 +3,13 @@ package dev.arkbuilders.rate.feature.search.di
 import dagger.Component
 import dev.arkbuilders.rate.core.di.CoreComponent
 import dev.arkbuilders.rate.core.domain.repo.AnalyticsManager
-import dev.arkbuilders.rate.core.domain.usecase.GetTopResultUseCase
+import dev.arkbuilders.rate.core.domain.usecase.SearchUseCase
 import dev.arkbuilders.rate.feature.search.presentation.SearchViewModelFactory
 
 @SearchScope
 @Component(dependencies = [CoreComponent::class])
 interface SearchComponent {
-    fun getTopResultUseCase(): GetTopResultUseCase
+    fun searchUseCase(): SearchUseCase
 
     fun analyticsManager(): AnalyticsManager
 
diff --git a/feature/search/src/main/java/dev/arkbuilders/rate/feature/search/presentation/SearchCurrencyInfoItem.kt b/feature/search/src/main/java/dev/arkbuilders/rate/feature/search/presentation/SearchCurrencyInfoItem.kt
@@ -15,15 +15,17 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import dev.arkbuilders.rate.core.domain.model.CurrencyName
 import dev.arkbuilders.rate.core.presentation.theme.ArkColor
 import dev.arkbuilders.rate.core.presentation.ui.CurrIcon
 
 @Composable
 fun SearchCurrencyInfoItem(
-    model: CurrencySearchModel,
-    onClick: (CurrencySearchModel) -> Unit,
+    model: CurrencyName,
+    isProhibited: Boolean,
+    onClick: (CurrencyName) -> Unit,
 ) {
-    val contentAlpha = if (model.isProhibited) 0.4f else 1f
+    val contentAlpha = if (isProhibited) 0.4f else 1f
     Column {
         Row(
             modifier =
diff --git a/feature/search/src/main/java/dev/arkbuilders/rate/feature/search/presentation/SearchCurrencyScreen.kt b/feature/search/src/main/java/dev/arkbuilders/rate/feature/search/presentation/SearchCurrencyScreen.kt
@@ -21,6 +21,7 @@ import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.ExternalModuleGraph
 import com.ramcosta.composedestinations.result.ResultBackNavigator
 import dev.arkbuilders.rate.core.domain.model.CurrencyCode
+import dev.arkbuilders.rate.core.domain.model.CurrencyName
 import dev.arkbuilders.rate.core.presentation.CoreRString
 import dev.arkbuilders.rate.core.presentation.ui.AppHorDiv
 import dev.arkbuilders.rate.core.presentation.ui.AppTopBarBack
@@ -83,6 +84,7 @@ fun SearchCurrencyScreen(
                 Input(state.filter, viewModel::onInputChange)
                 Results(
                     filter = state.filter,
+                    prohibitedCodes = state.prohibitedCodes,
                     frequent = state.frequent,
                     all = state.all,
                     topResultsFiltered = state.topResultsFiltered,
@@ -114,18 +116,22 @@ private fun Input(
 @Composable
 private fun Results(
     filter: String,
-    frequent: List<CurrencySearchModel>,
-    all: List<CurrencySearchModel>,
-    topResultsFiltered: List<CurrencySearchModel>,
-    onClick: (CurrencySearchModel) -> Unit,
+    prohibitedCodes: List<CurrencyCode>,
+    frequent: List<CurrencyName>,
+    all: List<CurrencyName>,
+    topResultsFiltered: List<CurrencyName>,
+    onClick: (CurrencyName) -> Unit,
 ) {
     when {
         filter.isNotEmpty() -> {
             if (topResultsFiltered.isNotEmpty()) {
                 LazyColumn {
                     item { ListHeader(stringResource(CoreRString.top_results)) }
                     items(topResultsFiltered) { model ->
-                        SearchCurrencyInfoItem(model) { onClick(it) }
+                        SearchCurrencyInfoItem(
+                            model,
+                            model.code in prohibitedCodes,
+                        ) { onClick(it) }
                     }
                 }
             } else {
@@ -138,12 +144,18 @@ private fun Results(
                 if (frequent.isNotEmpty()) {
                     item { ListHeader(stringResource(CoreRString.frequent_currencies)) }
                     items(frequent) { model ->
-                        SearchCurrencyInfoItem(model) { onClick(it) }
+                        SearchCurrencyInfoItem(
+                            model,
+                            model.code in prohibitedCodes,
+                        ) { onClick(it) }
                     }
                 }
                 item { ListHeader(stringResource(CoreRString.all_currencies)) }
                 items(all) { model ->
-                    SearchCurrencyInfoItem(model) { onClick(it) }
+                    SearchCurrencyInfoItem(
+                        model,
+                        model.code in prohibitedCodes,
+                    ) { onClick(it) }
                 }
             }
         }
diff --git a/feature/search/src/main/java/dev/arkbuilders/rate/feature/search/presentation/SearchViewModel.kt b/feature/search/src/main/java/dev/arkbuilders/rate/feature/search/presentation/SearchViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -277,8 +277,7 @@ private fun Content(`
`277`	`277`	`}`
`278`	`278`	`if (state.filter.isNotEmpty()) {`
`279`	`279`	`QuickSearchPage(`
`280`		`- filter = state.filter,`
`281`		`- topResults = state.topResults,`
	`280`	`+ topResultsFiltered = state.topResultsFiltered,`
`282`	`281`	`onNewCode = onNewCode,`
`283`	`282`	`)`
`284`	`283`	`} else {`