fix: refactor old implementation and move shared logic into one repository used in both home screen and route screen

RyanCheung555 · RyanCheung555 · commit 8f357d95ebfc · 2026-03-18T02:09:30.000-04:00
diff --git a/app/src/main/java/com/cornellappdev/transit/models/search/UnifiedSearchRepository.kt b/app/src/main/java/com/cornellappdev/transit/models/search/UnifiedSearchRepository.kt
@@ -0,0 +1,66 @@
+package com.cornellappdev.transit.models.search
+
+import com.cornellappdev.transit.models.Place
+import com.cornellappdev.transit.models.RouteRepository
+import com.cornellappdev.transit.models.ecosystem.EateryRepository
+import com.cornellappdev.transit.models.ecosystem.GymRepository
+import com.cornellappdev.transit.networking.ApiResponse
+import com.cornellappdev.transit.util.ecosystem.buildEcosystemSearchPlaces
+import com.cornellappdev.transit.util.ecosystem.mergeAndRankSearchResults
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.stateIn
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Centralized search data source that merges route search results with ecosystem places.
+ *
+ * UI and ViewModels can share this data pipeline to keep search behavior consistent.
+ */
+@Singleton
+class UnifiedSearchRepository @Inject constructor(
+    private val routeRepository: RouteRepository,
+    eateryRepository: EateryRepository,
+    gymRepository: GymRepository,
+    coroutineScope: CoroutineScope,
+) {
+
+    val ecosystemSearchPlacesFlow: StateFlow<List<Place>> =
+        combine(
+            routeRepository.printerFlow,
+            routeRepository.libraryFlow,
+            eateryRepository.eateryFlow,
+            gymRepository.gymFlow
+        ) { printers, libraries, eateries, gyms ->
+            buildEcosystemSearchPlaces(
+                printers = printers,
+                libraries = libraries,
+                eateries = eateries,
+                gyms = gyms
+            )
+        }.stateIn(
+            scope = coroutineScope,
+            started = SharingStarted.Eagerly,
+            initialValue = emptyList()
+        )
+
+    fun mergedSearchResults(queryFlow: Flow<String>): Flow<ApiResponse<List<Place>>> =
+        combine(
+            queryFlow,
+            routeRepository.placeFlow,
+            ecosystemSearchPlacesFlow
+        ) { query, routeSearchResults, ecosystemPlaces ->
+            mergeAndRankSearchResults(
+                query = query,
+                routeSearchResults = routeSearchResults,
+                ecosystemPlaces = ecosystemPlaces
+            )
+        }
+}
+
+
+
diff --git a/app/src/main/java/com/cornellappdev/transit/ui/screens/RouteScreen.kt b/app/src/main/java/com/cornellappdev/transit/ui/screens/RouteScreen.kt
@@ -109,6 +109,9 @@ fun RouteScreen(
             skipHalfExpanded = true,
             confirmValueChange = {
                 keyboardController?.hide()
+                if (it == ModalBottomSheetValue.Hidden) {
+                    routeViewModel.onQueryChange("")
+                }
                 true
             }
         )
@@ -119,6 +122,9 @@ fun RouteScreen(
             skipHalfExpanded = true,
             confirmValueChange = {
                 keyboardController?.hide()
+                if (it == ModalBottomSheetValue.Hidden) {
+                    routeViewModel.onQueryChange("")
+                }
                 true
             }
         )
diff --git a/app/src/main/java/com/cornellappdev/transit/ui/viewmodels/HomeViewModel.kt b/app/src/main/java/com/cornellappdev/transit/ui/viewmodels/HomeViewModel.kt
@@ -10,6 +10,7 @@ import com.cornellappdev.transit.models.RouteRepository
 import com.cornellappdev.transit.models.SelectedRouteRepository
 import com.cornellappdev.transit.models.ecosystem.StaticPlaces
 import com.cornellappdev.transit.models.UserPreferenceRepository
+import com.cornellappdev.transit.models.search.UnifiedSearchRepository
 import com.cornellappdev.transit.models.ecosystem.Eatery
 import com.cornellappdev.transit.models.ecosystem.EateryRepository
 import com.cornellappdev.transit.models.ecosystem.GymRepository
@@ -19,8 +20,6 @@ import com.cornellappdev.transit.models.ecosystem.UpliftGym
 import com.cornellappdev.transit.networking.ApiResponse
 import com.cornellappdev.transit.util.StringUtils.fromMetersToMiles
 import com.cornellappdev.transit.util.calculateDistance
-import com.cornellappdev.transit.util.ecosystem.buildEcosystemSearchPlaces
-import com.cornellappdev.transit.util.ecosystem.mergeAndRankSearchResults
 import com.google.android.gms.maps.model.LatLng
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -48,6 +47,7 @@ class HomeViewModel @Inject constructor(
     private val locationRepository: LocationRepository,
     private val eateryRepository: EateryRepository,
     private val gymRepository: GymRepository,
+    private val unifiedSearchRepository: UnifiedSearchRepository,
     private val userPreferenceRepository: UserPreferenceRepository,
     private val selectedRouteRepository: SelectedRouteRepository
 ) : ViewModel() {
@@ -118,40 +118,30 @@ class HomeViewModel @Inject constructor(
             )
         )
 
-    private val ecosystemSearchPlacesFlow: StateFlow<List<Place>> =
-        combine(
-            routeRepository.printerFlow,
-            routeRepository.libraryFlow,
-            eateryRepository.eateryFlow,
-            gymRepository.gymFlow
-        ) { printers, libraries, eateries, gyms ->
-            buildEcosystemSearchPlaces(
-                printers = printers,
-                libraries = libraries,
-                eateries = eateries,
-                gyms = gyms
-            )
-        }.stateIn(
+    private val homeQueryFlow: StateFlow<String> = searchBarUiState
+        .filterIsInstance<SearchBarUIState.Query>()
+        .map { it.queryText }
+        .distinctUntilChanged()
+        .stateIn(
             scope = viewModelScope,
             started = SharingStarted.WhileSubscribed(5_000),
-            initialValue = emptyList()
+            initialValue = ""
         )
 
+    private val mergedHomeSearchResultsFlow: StateFlow<ApiResponse<List<Place>>> =
+        unifiedSearchRepository.mergedSearchResults(homeQueryFlow)
+            .stateIn(
+                scope = viewModelScope,
+                started = SharingStarted.WhileSubscribed(5_000),
+                initialValue = ApiResponse.Success(emptyList())
+            )
+
     private val _showAddFavoritesSheet = MutableStateFlow(false)
     val showAddFavoritesSheet: StateFlow<Boolean> = _showAddFavoritesSheet.asStateFlow()
 
     val addSearchResultsFlow: StateFlow<ApiResponse<List<Place>>> =
-        combine(
-            _addSearchQuery,
-            placeQueryFlow,
-            ecosystemSearchPlacesFlow
-        ) { query, routeSearchResults, ecosystemPlaces ->
-            mergeAndRankSearchResults(
-                query = query,
-                routeSearchResults = routeSearchResults,
-                ecosystemPlaces = ecosystemPlaces
-            )
-        }.stateIn(
+        unifiedSearchRepository.mergedSearchResults(_addSearchQuery)
+            .stateIn(
             scope = viewModelScope,
             started = SharingStarted.WhileSubscribed(5_000),
             initialValue = ApiResponse.Success(emptyList())
@@ -263,19 +253,8 @@ class HomeViewModel @Inject constructor(
             }
         }.launchIn(viewModelScope)
 
-        combine(
-            searchBarUiState
-                .filterIsInstance<SearchBarUIState.Query>()
-                .map { it.queryText }
-                .distinctUntilChanged(),
-            placeQueryFlow,
-            ecosystemSearchPlacesFlow
-        ) { query, routeSearchResults, ecosystemPlaces ->
-            query to mergeAndRankSearchResults(
-                query = query,
-                routeSearchResults = routeSearchResults,
-                ecosystemPlaces = ecosystemPlaces
-            )
+        combine(homeQueryFlow, mergedHomeSearchResultsFlow) { query, mergedResults ->
+            query to mergedResults
         }.onEach { (query, mergedResults) ->
             val currentState = _searchBarUiState.value
             if (currentState is SearchBarUIState.Query && currentState.queryText == query) {
diff --git a/app/src/main/java/com/cornellappdev/transit/ui/viewmodels/RouteViewModel.kt b/app/src/main/java/com/cornellappdev/transit/ui/viewmodels/RouteViewModel.kt
@@ -14,12 +14,9 @@ import com.cornellappdev.transit.models.RouteOptions
 import com.cornellappdev.transit.models.RouteRepository
 import com.cornellappdev.transit.models.SelectedRouteRepository
 import com.cornellappdev.transit.models.UserPreferenceRepository
-import com.cornellappdev.transit.models.ecosystem.EateryRepository
-import com.cornellappdev.transit.models.ecosystem.GymRepository
+import com.cornellappdev.transit.models.search.UnifiedSearchRepository
 import com.cornellappdev.transit.networking.ApiResponse
 import com.cornellappdev.transit.util.TimeUtils
-import com.cornellappdev.transit.util.ecosystem.buildEcosystemSearchPlaces
-import com.cornellappdev.transit.util.ecosystem.mergeAndRankSearchResults
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.LatLngBounds
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -31,7 +28,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -46,8 +43,7 @@ import javax.inject.Inject
 class RouteViewModel @Inject constructor(
     private val routeRepository: RouteRepository,
     private val locationRepository: LocationRepository,
-    private val eateryRepository: EateryRepository,
-    private val gymRepository: GymRepository,
+    private val unifiedSearchRepository: UnifiedSearchRepository,
     private val userPreferenceRepository: UserPreferenceRepository,
     private val selectedRouteRepository: SelectedRouteRepository
 ) : ViewModel() {
@@ -131,25 +127,28 @@ class RouteViewModel @Inject constructor(
         MutableStateFlow(SearchBarUIState.RecentAndFavorites(emptySet(), emptyList()))
     val searchBarUiState: StateFlow<SearchBarUIState> = _searchBarUiState.asStateFlow()
 
-    private val ecosystemSearchPlacesFlow: StateFlow<List<Place>> =
-        combine(
-            routeRepository.printerFlow,
-            routeRepository.libraryFlow,
-            eateryRepository.eateryFlow,
-            gymRepository.gymFlow
-        ) { printers, libraries, eateries, gyms ->
-            buildEcosystemSearchPlaces(
-                printers = printers,
-                libraries = libraries,
-                eateries = eateries,
-                gyms = gyms
-            )
-        }.stateIn(
+    private val routeQueryFlow: StateFlow<String> = searchBarUiState
+        .map { state ->
+            when (state) {
+                is SearchBarUIState.Query -> state.queryText
+                is SearchBarUIState.RecentAndFavorites -> ""
+            }
+        }
+        .distinctUntilChanged()
+        .stateIn(
             scope = viewModelScope,
             started = SharingStarted.WhileSubscribed(5_000),
-            initialValue = emptyList()
+            initialValue = ""
         )
 
+    private val mergedRouteSearchResultsFlow: StateFlow<ApiResponse<List<Place>>> =
+        unifiedSearchRepository.mergedSearchResults(routeQueryFlow)
+            .stateIn(
+                scope = viewModelScope,
+                started = SharingStarted.WhileSubscribed(5_000),
+                initialValue = ApiResponse.Success(emptyList())
+            )
+
     init {
         userPreferenceRepository.favoritesFlow.onEach {
             if (_searchBarUiState.value is SearchBarUIState.RecentAndFavorites) {
@@ -169,19 +168,8 @@ class RouteViewModel @Inject constructor(
             }
         }.launchIn(viewModelScope)
 
-        combine(
-            searchBarUiState
-                .filterIsInstance<SearchBarUIState.Query>()
-                .map { it.queryText }
-                .distinctUntilChanged(),
-            routeRepository.placeFlow,
-            ecosystemSearchPlacesFlow
-        ) { query, routeSearchResults, ecosystemPlaces ->
-            query to mergeAndRankSearchResults(
-                query = query,
-                routeSearchResults = routeSearchResults,
-                ecosystemPlaces = ecosystemPlaces
-            )
+        combine(routeQueryFlow, mergedRouteSearchResultsFlow) { query, mergedResults ->
+            query to mergedResults
         }.onEach { (query, mergedResults) ->
             val currentState = _searchBarUiState.value
             if (currentState is SearchBarUIState.Query && currentState.queryText == query) {
@@ -241,11 +229,9 @@ class RouteViewModel @Inject constructor(
 
         }.launchIn(viewModelScope)
 
-        searchBarUiState
+        routeQueryFlow
             .debounce(300L)
-            .filterIsInstance<SearchBarUIState.Query>()
-            .map { it.queryText }
-            .distinctUntilChanged()
+            .filter { it.isNotBlank() }
             .onEach {
                 routeRepository.makeSearch(it)
             }.launchIn(viewModelScope)

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,9 @@ fun RouteScreen(`
`109`	`109`	`skipHalfExpanded = true,`
`110`	`110`	`confirmValueChange = {`
`111`	`111`	`keyboardController?.hide()`
	`112`	`+ if (it == ModalBottomSheetValue.Hidden) {`
	`113`	`+ routeViewModel.onQueryChange("")`
	`114`	`+ }`
`112`	`115`	`true`
`113`	`116`	`}`
`114`	`117`	`)`
`@@ -119,6 +122,9 @@ fun RouteScreen(`
`119`	`122`	`skipHalfExpanded = true,`
`120`	`123`	`confirmValueChange = {`
`121`	`124`	`keyboardController?.hide()`
	`125`	`+ if (it == ModalBottomSheetValue.Hidden) {`
	`126`	`+ routeViewModel.onQueryChange("")`
	`127`	`+ }`
`122`	`128`	`true`
`123`	`129`	`}`
`124`	`130`	`)`