refactor: xxStream postFix 붙이기, suspend 함수 제거

woowacourse-teams · Sep 26, 2024 · aaaa367 · aaaa367
1 parent 590b2c6
commit aaaa367
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/android/app/src/main/java/poke/rogue/helper/presentation/battle/BattleViewModel.kt b/android/app/src/main/java/poke/rogue/helper/presentation/battle/BattleViewModel.kt
@@ -40,7 +40,7 @@ class BattleViewModel(
     val selectedState = _selectedState.asStateFlow()
 
     val weatherPos: StateFlow<Int> = combine(
-        battleRepository.selectedWeatherStream(),
+        battleRepository.savedWeatherStream(),
         weathers,
     ) { weather, weathers ->
         if (weather == null || weathers.isEmpty()) return@combine null
@@ -103,12 +103,12 @@ class BattleViewModel(
     private fun initSavedSelection() {
         viewModelScope.launch {
             launch {
-                battleRepository.savedPokemon().first()?.let {
+                battleRepository.savedPokemonStream().first()?.let {
                     updateOpponentPokemon(it.toSelectionUi())
                 }
             }
             launch {
-                battleRepository.savedPokemonWithSkill().first()?.let { (pokemon, skill) ->
+                battleRepository.savedPokemonWithSkillStream().first()?.let { (pokemon, skill) ->
                     updateMyPokemon(pokemon.toSelectionUi(), skill.toUi())
                 }
             }

diff --git a/android/data/src/main/java/poke/rogue/helper/data/repository/BattleRepository.kt b/android/data/src/main/java/poke/rogue/helper/data/repository/BattleRepository.kt
@@ -28,9 +28,9 @@ interface BattleRepository {
 
     suspend fun saveWeather(weatherId: String)
 
-    fun selectedWeatherStream(): Flow<Weather?>
+    fun savedWeatherStream(): Flow<Weather?>
 
-    suspend fun savedPokemon(): Flow<Pokemon?>
+    fun savedPokemonStream(): Flow<Pokemon?>
 
-    suspend fun savedPokemonWithSkill(): Flow<PokemonWithSkill?>
+    fun savedPokemonWithSkillStream(): Flow<PokemonWithSkill?>
 }
diff --git a/android/data/src/main/java/poke/rogue/helper/data/repository/DefaultBattleRepository.kt b/android/data/src/main/java/poke/rogue/helper/data/repository/DefaultBattleRepository.kt
@@ -48,10 +48,10 @@ class DefaultBattleRepository(
         skillId: String,
     ) = localBattleDataSource.savePokemonWithSkill(pokemonId, skillId)
 
-    override suspend fun savedPokemon(): Flow<Pokemon?> =
+    override fun savedPokemonStream(): Flow<Pokemon?> =
         localBattleDataSource.pokemonId().map { it?.let { pokemonRepository.pokemon(it) } }
 
-    override suspend fun savedPokemonWithSkill(): Flow<PokemonWithSkill?> =
+    override fun savedPokemonWithSkillStream(): Flow<PokemonWithSkill?> =
         localBattleDataSource.pokemonWithSkill().map {
             it?.let { pokemonWithSkill ->
                 val pokemon = pokemonRepository.pokemon(pokemonWithSkill.pokemonId)
@@ -63,7 +63,7 @@ class DefaultBattleRepository(
     override suspend fun saveWeather(weatherId: String) =
         localBattleDataSource.saveWeather(weatherId)
 
-    override fun selectedWeatherStream(): Flow<Weather?> =
+    override fun savedWeatherStream(): Flow<Weather?> =
         localBattleDataSource.weatherId().map {
             if (it == null) {
                 return@map null