fix(PokemonDetailViewModel): successUiState 의 타입을 nullable 로

- 테스트에서 advanceUntilIdle 제거
woowacourse-teams · Dec 14, 2024 · 2305509 · 2305509
1 parent b437efe
commit 2305509
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 32 deletions.
diff --git a/android/app/src/main/java/poke/rogue/helper/presentation/dex/detail/PokemonDetailUiState.kt b/android/app/src/main/java/poke/rogue/helper/presentation/dex/detail/PokemonDetailUiState.kt
@@ -1,6 +1,5 @@
 package poke.rogue.helper.presentation.dex.detail
 
-import poke.rogue.helper.data.model.Biome
 import poke.rogue.helper.data.model.PokemonDetail
 import poke.rogue.helper.data.model.PokemonDetailSkills
 import poke.rogue.helper.data.model.Stat
@@ -27,18 +26,6 @@ sealed interface PokemonDetailUiState {
     data object IsLoading : PokemonDetailUiState
 }
 
-fun PokemonDetail.toUi(allBiomes: List<Biome>): PokemonDetailUiState.Success =
-    PokemonDetailUiState.Success(
-        pokemon = pokemon.toUi(),
-        stats = stats.map(Stat::toUi),
-        abilities = abilities.toPokemonDetailUi(),
-        evolutions = evolutions.toUi(),
-        skills = skills,
-        height = height.toFloat(),
-        weight = weight.toFloat(),
-        biomes = biomes.toUi(),
-    )
-
 fun PokemonDetail.toUi(): PokemonDetailUiState.Success =
     PokemonDetailUiState.Success(
         pokemon = pokemon.toUi(),

diff --git a/...oid/app/src/main/java/poke/rogue/helper/presentation/dex/detail/PokemonDetailViewModel.kt b/...oid/app/src/main/java/poke/rogue/helper/presentation/dex/detail/PokemonDetailViewModel.kt
@@ -1,7 +1,6 @@
 package poke.rogue.helper.presentation.dex.detail
 
 import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -28,10 +27,7 @@ class PokemonDetailViewModel(
         MutableStateFlow(PokemonDetailUiState.IsLoading)
     val uiState = _uiState.asStateFlow()
 
-    private val successUiState: PokemonDetailUiState.Success
-        get() =
-            uiState.value as? PokemonDetailUiState.Success
-                ?: error("PokemonDetailUiState is note updated. You have to wait the updatePokemonDetail method is completed after called.")
+    private val successUiState: PokemonDetailUiState.Success? get() = uiState.value as? PokemonDetailUiState.Success
 
     val isLoading: StateFlow<Boolean> =
         uiState.map { it is PokemonDetailUiState.IsLoading }
@@ -67,18 +63,20 @@ class PokemonDetailViewModel(
 
     override fun navigateToPokemonDetail(pokemonId: String) {
         viewModelScope.launch {
-            if (successUiState.pokemon.id == pokemonId) {
-                _navigationEvent.emit(NavigationEvent.ToPokemonDetail.Failure(successUiState.pokemon.name))
-                return@launch
+            successUiState?.let { state ->
+                if (state.pokemon.id == pokemonId) {
+                    _navigationEvent.emit(NavigationEvent.ToPokemonDetail.Failure(state.pokemon.name))
+                    return@launch
+                }
+                _navigationEvent.emit(NavigationEvent.ToPokemonDetail.Success(pokemonId))
             }
-            _navigationEvent.emit(NavigationEvent.ToPokemonDetail.Success(pokemonId))
         }
     }
 
     override fun navigateToBattleWithMine() {
         viewModelScope.launch {
-            successUiState.pokemon.let { pokemon ->
-                val event = NavigationEvent.ToBattle.WithMyPokemon(pokemon)
+            successUiState?.let { state ->
+                val event = NavigationEvent.ToBattle.WithMyPokemon(state.pokemon)
                 _navigationEvent.emit(event)
                 logger.logPokemonDetailToBattle(event)
             }
@@ -87,8 +85,8 @@ class PokemonDetailViewModel(
 
     override fun navigateToBattleWithOpponent() {
         viewModelScope.launch {
-            successUiState.pokemon.let { pokemon ->
-                val event = NavigationEvent.ToBattle.WithOpponentPokemon(pokemon)
+            successUiState?.let { state ->
+                val event = NavigationEvent.ToBattle.WithOpponentPokemon(state.pokemon)
                 _navigationEvent.emit(event)
                 logger.logPokemonDetailToBattle(event)
             }

diff --git a/...app/src/test/java/poke/rogue/helper/presentation/dex/detail/PokemonDetailViewModelTest.kt b/...app/src/test/java/poke/rogue/helper/presentation/dex/detail/PokemonDetailViewModelTest.kt
@@ -3,7 +3,6 @@ package poke.rogue.helper.presentation.dex.detail
 import io.kotest.matchers.shouldBe
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
@@ -52,7 +51,6 @@ class PokemonDetailViewModelTest : KoinTest {
         runTest {
             // when
             viewModel.updatePokemonDetail(pokemonId = "1")
-            advanceUntilIdle()
 
             // then
             val pokemonDetailUiState =
@@ -153,7 +151,6 @@ class PokemonDetailViewModelTest : KoinTest {
         runTest {
             // given
             viewModel.updatePokemonDetail("1")
-            advanceUntilIdle()
 
             // when
             viewModel.navigateToPokemonDetail("1")
@@ -174,7 +171,6 @@ class PokemonDetailViewModelTest : KoinTest {
         runTest {
             // given
             viewModel.updatePokemonDetail("1")
-            advanceUntilIdle()
 
             // when
             viewModel.navigateToPokemonDetail("2")
@@ -195,7 +191,6 @@ class PokemonDetailViewModelTest : KoinTest {
         runTest {
             // given
             viewModel.updatePokemonDetail("1")
-            advanceUntilIdle()
 
             // when
             viewModel.navigateToBattleWithMine()
@@ -213,7 +208,6 @@ class PokemonDetailViewModelTest : KoinTest {
         runTest {
             // given
             viewModel.updatePokemonDetail("1")
-            advanceUntilIdle()
 
             // when
             viewModel.navigateToBattleWithOpponent()