Merge pull request #5 from Jaehwa-Noh/sort-passenger

Sort by passenger
Jaehwa-Noh · May 17, 2024 · 8ae19b8 · 8ae19b8
2 parents d1e3d5d + e2cac8a
commit 8ae19b8
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 6 deletions.
diff --git a/...ght-Search-App/app/src/main/kotlin/com/example/flightsearchapp/data/AirportsRepository.kt b/...ght-Search-App/app/src/main/kotlin/com/example/flightsearchapp/data/AirportsRepository.kt
@@ -33,6 +33,7 @@ class InDiskAirportsRepository @Inject constructor(
                         id = airport.id,
                         iataCode = airport.iataCode,
                         name = airport.name,
+                        passengers = airport.passengers,
                     )
                 }
             }

diff --git a/...Search-App/app/src/main/kotlin/com/example/flightsearchapp/data/database/AirportEntity.kt b/...Search-App/app/src/main/kotlin/com/example/flightsearchapp/data/database/AirportEntity.kt
@@ -29,4 +29,5 @@ fun AirportEntity.asSuggestionAirport() = SuggestionAirport(
     id = id,
     iataCode = iataCode,
     name = name,
+    passengers = passengers,
 )
diff --git a/...ht-Search-App/app/src/main/kotlin/com/example/flightsearchapp/ui/SearchScreenViewModel.kt b/...ht-Search-App/app/src/main/kotlin/com/example/flightsearchapp/ui/SearchScreenViewModel.kt
@@ -13,7 +13,6 @@ import com.example.flightsearchapp.domain.SetSavedSearchTextUseCase
 import com.example.flightsearchapp.ui.model.Flight
 import com.example.flightsearchapp.ui.model.SuggestionAirport
 import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -26,6 +25,7 @@ import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
 @HiltViewModel
 class SearchScreenViewModel @Inject constructor(
@@ -74,8 +74,10 @@ class SearchScreenViewModel @Inject constructor(
                 } else {
                     getSuggestionsStreamUseCase(query = savedSearchText)
                         .mapLatest { searchedApi ->
+                            val sortedSearchedApi = searchedApi
+                                .sortedByDescending { it.passengers }
                             SearchScreenUiState.ShowSuggests(
-                                results = searchedApi,
+                                results = sortedSearchedApi,
                             )
                         }
                 }

diff --git a/...-Search-App/app/src/main/kotlin/com/example/flightsearchapp/ui/model/SuggestionAirport.kt b/...-Search-App/app/src/main/kotlin/com/example/flightsearchapp/ui/model/SuggestionAirport.kt
@@ -4,4 +4,5 @@ data class SuggestionAirport(
     val id: Long,
     val iataCode: String,
     val name: String,
+    val passengers: Long,
 )
diff --git a/...c/main/kotlin/com/example/flightsearchapp/ui/suggestion/SuggestionsListItemUiComponent.kt b/...c/main/kotlin/com/example/flightsearchapp/ui/suggestion/SuggestionsListItemUiComponent.kt
@@ -33,6 +33,7 @@ fun SuggestListItemUiComponentPreview() {
                 id = 1,
                 iataCode = "ABC",
                 name = "Airport",
+                passengers = 10,
             ),
             onItemClick = {},
         )

diff --git a/...pp/app/src/main/kotlin/com/example/flightsearchapp/ui/suggestion/SuggestionsListScreen.kt b/...pp/app/src/main/kotlin/com/example/flightsearchapp/ui/suggestion/SuggestionsListScreen.kt
@@ -40,11 +40,13 @@ fun SuggestListScreenPreview() {
                     id = 1,
                     iataCode = "ABC",
                     name = "Airport",
+                    passengers = 1,
                 ),
                 SuggestionAirport(
                     id = 2,
                     iataCode = "DEF",
                     name = "Airport2",
+                    passengers = 2,
                 ),
             ),
             onSuggestionClick = {},

diff --git a/...t-Search-App/app/src/test/kotlin/com/example/flightsearchapp/SearchScreenViewModelTest.kt b/...t-Search-App/app/src/test/kotlin/com/example/flightsearchapp/SearchScreenViewModelTest.kt
@@ -4,6 +4,7 @@ import com.example.flightsearchapp.data.AllFlightsRepository
 import com.example.flightsearchapp.data.InDiskAirportsFtsRepository
 import com.example.flightsearchapp.data.InDiskAirportsRepository
 import com.example.flightsearchapp.data.InDiskFavoritesRepository
+import com.example.flightsearchapp.data.database.asFtsEntity
 import com.example.flightsearchapp.domain.DeleteFavoriteUseCase
 import com.example.flightsearchapp.domain.GetAllFavoriteFlightsStreamUseCase
 import com.example.flightsearchapp.domain.GetAllFlightsStreamUseCase
@@ -147,6 +148,30 @@ class SearchScreenViewModelTest {
         assertEquals("Set", result)
     }
 
+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun searchQuery_find_matchOrder() = runTest {
+        initDb()
+        backgroundScope.launch(UnconfinedTestDispatcher()) {
+            searchScreenViewModel.showFlightUiState.collect()
+            searchScreenViewModel.searchScreenUiState.collect()
+        }
+
+        var searchScreenUiState = searchScreenViewModel.searchScreenUiState.first()
+        assertIs<SearchScreenUiState.ShowFavorite>(searchScreenUiState)
+        assertEquals(searchScreenUiState.results.count(), 0)
+
+        searchScreenViewModel.setSearchQuery("C")
+        searchScreenViewModel.setSavedSearchText("C")
+        searchScreenUiState = searchScreenViewModel.searchScreenUiState.first()
+
+        assertIs<SearchScreenUiState.ShowSuggests>(searchScreenUiState)
+        val expectOrder = listOf<Long>(9, 8)
+        searchScreenUiState.results.forEachIndexed { index, suggestionAirport ->
+            assertEquals(expectOrder[index], suggestionAirport.passengers)
+        }
+    }
+
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun departureId_notIn_matchUiState() = runTest {
@@ -198,7 +223,7 @@ class SearchScreenViewModelTest {
         )
 
         searchScreenViewModel.setSavedSearchText("")
-        searchScreenUiState = searchScreenViewModel.searchScreenUiState.value
+        searchScreenUiState = searchScreenViewModel.searchScreenUiState.first()
 
         assertIs<SearchScreenUiState.ShowFavorite>(searchScreenUiState)
         assertEquals(searchScreenUiState.results.count(), 1)
@@ -223,7 +248,7 @@ class SearchScreenViewModelTest {
         )
 
         searchScreenViewModel.setSavedSearchText("")
-        searchScreenUiState = searchScreenViewModel.searchScreenUiState.value
+        searchScreenUiState = searchScreenViewModel.searchScreenUiState.first()
 
         assertIs<SearchScreenUiState.ShowFavorite>(searchScreenUiState)
         assertEquals(searchScreenUiState.results.count(), 1)
@@ -234,9 +259,18 @@ class SearchScreenViewModelTest {
         )
 
         searchScreenViewModel.setSavedSearchText("")
-        searchScreenUiState = searchScreenViewModel.searchScreenUiState.value
+        searchScreenUiState = searchScreenViewModel.searchScreenUiState.first()
 
         assertIs<SearchScreenUiState.ShowFavorite>(searchScreenUiState)
         assertEquals(searchScreenUiState.results.count(), 0)
     }
+
+    private fun getAirportFtsEntities() = airportEntitiesTestData.map {
+        it.asFtsEntity()
+    }
+
+    private suspend fun initDb() {
+        val ftsEntities = getAirportFtsEntities()
+        airportsFtsRepository.deleteAndInsertAll(ftsEntities)
+    }
 }
diff --git a/...test/kotlin/com/example/flightsearchapp/testing/model/database/AirportEntitiesTestData.kt b/...test/kotlin/com/example/flightsearchapp/testing/model/database/AirportEntitiesTestData.kt
@@ -19,5 +19,5 @@ fun testAirportEntity(id: Long, code: String) = AirportEntity(
     id = id,
     name = "name$id",
     iataCode = code,
-    passengers = id,
+    passengers = 10 - id,
 )