(REFACTOR)[#554] BaseViewModel 적용을 통한, 'Navigator'와 'errorFlow' 공통 처리

core/ui/build.gradle.kts

@@ -12,4 +12,5 @@ android {
 dependencies {
     implementation(projects.core.designsystem)
     implementation(projects.core.domain.domainSessionApi)
+    implementation(projects.core.router.routerApi)
 }

core/ui/src/main/java/com/droidknights/app/core/ui/BaseViewModel.kt

@@ -0,0 +1,42 @@
+package com.droidknights.app.core.ui
+
+import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.droidknights.app.core.router.api.Navigator
+import com.droidknights.app.core.router.api.model.Route
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+open class BaseViewModel @Inject constructor() : ViewModel() {
+    protected val internalErrorFlow = MutableSharedFlow<Throwable>()
+    val errorFlow = internalErrorFlow.asSharedFlow()
+
+    @Inject
+    lateinit var navigator: Navigator
+
+    @VisibleForTesting
+    fun injectNavigator(navigator: Navigator) {
+        this.navigator = navigator
+    }
+
+    fun navigateBack() = viewModelScope.launch {
+        navigator.navigateBack()
+    }
+
+    fun navigateWeb(url: String) = viewModelScope.launch {
+        navigator.navigateWeb(url)
+    }
+
+    fun navigateTo(
+        route: Route,
+        saveState: Boolean = false,
+        launchSingleTop: Boolean = false
+    ) = viewModelScope.launch {
+            navigator.navigate(route, saveState, launchSingleTop)
+    }
+}

feature/bookmark/src/main/java/com/droidknights/app/feature/bookmark/BookmarkViewModel.kt

@@ -1,21 +1,18 @@
 package com.droidknights.app.feature.bookmark
 
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.droidknights.app.core.domain.session.usecase.api.DeleteBookmarkedSessionUseCase
 import com.droidknights.app.core.domain.session.usecase.api.GetBookmarkedSessionsUseCase
 import com.droidknights.app.core.model.session.Session
-import com.droidknights.app.core.router.api.Navigator
+import com.droidknights.app.core.ui.BaseViewModel
 import com.droidknights.app.feature.bookmark.model.BookmarkItemUiState
 import com.droidknights.app.feature.bookmark.model.BookmarkUiState
 import com.droidknights.app.feature.session.api.RouteSession
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toPersistentList
 import kotlinx.collections.immutable.toPersistentSet
-import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
@@ -29,12 +26,8 @@ import javax.inject.Inject
 @HiltViewModel
 class BookmarkViewModel @Inject constructor(
     private val getBookmarkedSessionsUseCase: GetBookmarkedSessionsUseCase,
-    private val deleteBookmarkedSessionUseCase: DeleteBookmarkedSessionUseCase,
-    private val navigator: Navigator,
-) : ViewModel() {
-
-    private val _errorFlow = MutableSharedFlow<Throwable>()
-    val errorFlow = _errorFlow.asSharedFlow()
+    private val deleteBookmarkedSessionUseCase: DeleteBookmarkedSessionUseCase
+) : BaseViewModel() {
 
     private val _bookmarkUiState = MutableStateFlow<BookmarkUiState>(BookmarkUiState.Loading)
     val bookmarkUiState = _bookmarkUiState.asStateFlow()
@@ -74,7 +67,7 @@ class BookmarkViewModel @Inject constructor(
                     }
                 }
             }.catch { throwable ->
-                _errorFlow.emit(throwable)
+                internalErrorFlow.emit(throwable)
             }.collect { _bookmarkUiState.value = it }
         }
     }
@@ -123,7 +116,7 @@ class BookmarkViewModel @Inject constructor(
                 state.copy(selectedSessionIds = persistentSetOf())
             }
         }.catch { throwable ->
-            _errorFlow.emit(throwable)
+            internalErrorFlow.emit(throwable)
         }.launchIn(viewModelScope)
     }
 
@@ -132,10 +125,8 @@ class BookmarkViewModel @Inject constructor(
         if (state !is BookmarkUiState.Success || state.isEditMode) {
             return
         }
-        viewModelScope.launch {
-            navigator.navigate(
-                route = RouteSession(sessionId = session.id),
-            )
-        }
+        navigateTo(
+            route = RouteSession(sessionId = session.id)
+        )
     }
 }

feature/bookmark/src/test/java/com/droidknights/app/feature/bookmark/BookmarkViewModelTest.kt

@@ -48,9 +48,8 @@ class BookmarkViewModelTest {
         // given & when
         viewModel = BookmarkViewModel(
             getBookmarkedSessionsUseCase,
-            deleteBookmarkedSessionUseCase,
-            navigator
-        )
+            deleteBookmarkedSessionUseCase
+        ).also { it.injectNavigator(navigator) }
 
         // then
         viewModel.bookmarkUiState.test {
@@ -76,9 +75,8 @@ class BookmarkViewModelTest {
         // given
         viewModel = BookmarkViewModel(
             getBookmarkedSessionsUseCase,
-            deleteBookmarkedSessionUseCase,
-            navigator
-        )
+            deleteBookmarkedSessionUseCase
+        ).also { it.injectNavigator(navigator) }
 
         viewModel.bookmarkUiState.test {
             val initialIsEditMode = (awaitItem() as BookmarkUiState.Success).isEditMode
@@ -98,9 +96,8 @@ class BookmarkViewModelTest {
         // given
         viewModel = BookmarkViewModel(
             getBookmarkedSessionsUseCase,
-            deleteBookmarkedSessionUseCase,
-            navigator
-        )
+            deleteBookmarkedSessionUseCase
+        ).also { it.injectNavigator(navigator) }
 
         // when
         viewModel.selectSession(mockSession1)
@@ -120,9 +117,9 @@ class BookmarkViewModelTest {
         // given
         viewModel = BookmarkViewModel(
             getBookmarkedSessionsUseCase,
-            deleteBookmarkedSessionUseCase,
-            navigator
-        )
+            deleteBookmarkedSessionUseCase
+        ).also { it.injectNavigator(navigator) }
+
         viewModel.selectSession(mockSession1)
 
         // when
@@ -144,9 +141,9 @@ class BookmarkViewModelTest {
         coEvery { deleteBookmarkedSessionUseCase(persistentSetOf("1")) } just Runs
         viewModel = BookmarkViewModel(
             getBookmarkedSessionsUseCase,
-            deleteBookmarkedSessionUseCase,
-            navigator
-        )
+            deleteBookmarkedSessionUseCase
+        ).also { it.injectNavigator(navigator) }
+
         viewModel.selectSession(mockSession1)
 
         // when
@@ -167,9 +164,8 @@ class BookmarkViewModelTest {
         coEvery { navigator.navigate(RouteSession(sessionId = mockSession2.id)) } just Runs
         viewModel = BookmarkViewModel(
             getBookmarkedSessionsUseCase,
-            deleteBookmarkedSessionUseCase,
-            navigator
-        )
+            deleteBookmarkedSessionUseCase
+        ).also { it.injectNavigator(navigator) }
 
         // when
         viewModel.redirectToSessionScreen(mockSession2)

feature/contributor/src/main/java/com/droidknights/app/feature/contributor/ContributorViewModel.kt

@@ -1,47 +1,35 @@
 package com.droidknights.app.feature.contributor
 
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.droidknights.app.core.domain.contributor.usecase.api.GetContributorsUseCase
-import com.droidknights.app.core.router.api.Navigator
+import com.droidknights.app.core.ui.BaseViewModel
 import com.droidknights.app.feature.contributor.model.ContributorsUiState
 import com.droidknights.app.feature.contributor.model.convert.toContributorsUiState
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class ContributorViewModel @Inject constructor(
-    getContributorsUseCase: GetContributorsUseCase,
-    private val navigator: Navigator,
-) : ViewModel() {
-
-    private val _errorFlow = MutableSharedFlow<Throwable>()
-    val errorFlow = _errorFlow.asSharedFlow()
+    getContributorsUseCase: GetContributorsUseCase
+) : BaseViewModel() {
 
     val uiState: StateFlow<ContributorsUiState> by lazy {
         getContributorsUseCase()
             .map {
                 it.toContributorsUiState()
             }
             .catch { throwable ->
-                _errorFlow.emit(throwable)
+                internalErrorFlow.emit(throwable)
             }
             .stateIn(
                 scope = viewModelScope,
                 started = SharingStarted.WhileSubscribed(5_000),
                 initialValue = ContributorsUiState.Loading
             )
     }
-
-    fun navigateBack() = viewModelScope.launch {
-        navigator.navigateBack()
-    }
 }

feature/contributor/src/test/java/com/droidknights/app/feature/contributor/ContributorViewModelTest.kt

@@ -31,7 +31,9 @@ internal class ContributorViewModelTest {
     fun `컨트리뷰터 데이터를 확인할 수 있다`() = runTest {
         // given
         coEvery { getContributorsUseCase() } returns flowOf(fakeContributors)
-        viewModel = ContributorViewModel(getContributorsUseCase, navigator)
+        viewModel = ContributorViewModel(getContributorsUseCase).also {
+            it.injectNavigator(navigator)
+        }
 
         // when & then
         viewModel.uiState.test {
@@ -44,7 +46,9 @@ internal class ContributorViewModelTest {
     fun `navigateBack이 호출될 때 navigator에게 위임한다`() = runTest {
         // suspend 함수 호출에 대한 stub
         coEvery { navigator.navigateBack() } just Runs
-        viewModel = ContributorViewModel(getContributorsUseCase, navigator)
+        viewModel = ContributorViewModel(getContributorsUseCase).also {
+            it.injectNavigator(navigator)
+        }
 
         // when
         viewModel.navigateBack()

feature/home/src/main/java/com/droidknights/app/feature/home/HomeScreen.kt

@@ -15,10 +15,12 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.droidknights.app.feature.contributor.api.RouteContributor
 import com.droidknights.app.feature.home.component.ContributorCard
 import com.droidknights.app.feature.home.component.SessionCard
 import com.droidknights.app.feature.home.component.SponsorCard
 import com.droidknights.app.feature.home.model.SponsorsUiState
+import com.droidknights.app.feature.session.api.RouteSession
 import kotlinx.coroutines.flow.collectLatest
 
 @Composable
@@ -35,9 +37,9 @@ internal fun HomeRoute(
     HomeScreen(
         padding = padding,
         sponsorsUiState = sponsorsUiState,
-        onSessionClick = viewModel::navigateSession,
-        onContributorClick = viewModel::navigateContributor,
-        onOrganizationSponsorClick = viewModel::navigateOrganizationSponsor,
+        onSessionClick = { viewModel.navigateTo(RouteSession()) },
+        onContributorClick = { viewModel.navigateTo(RouteContributor) },
+        onOrganizationSponsorClick = viewModel::navigateWeb,
     )
 }
 

feature/home/src/main/java/com/droidknights/app/feature/home/HomeViewModel.kt

@@ -1,33 +1,23 @@
 package com.droidknights.app.feature.home
 
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.droidknights.app.core.domain.sponsor.usecase.api.GetSponsorsUseCase
-import com.droidknights.app.core.router.api.Navigator
-import com.droidknights.app.feature.contributor.api.RouteContributor
+import com.droidknights.app.core.ui.BaseViewModel
 import com.droidknights.app.feature.home.model.SponsorsUiState
-import com.droidknights.app.feature.session.api.RouteSession
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.toPersistentList
-import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class HomeViewModel @Inject constructor(
-    getSponsorsUseCase: GetSponsorsUseCase,
-    private val navigator: Navigator,
-) : ViewModel() {
-
-    private val _errorFlow = MutableSharedFlow<Throwable>()
-    val errorFlow get() = _errorFlow.asSharedFlow()
+    getSponsorsUseCase: GetSponsorsUseCase
+) : BaseViewModel() {
 
     val sponsorsUiState: StateFlow<SponsorsUiState> =
         flow { emit(getSponsorsUseCase()) }
@@ -39,23 +29,11 @@ class HomeViewModel @Inject constructor(
                 }
             }
             .catch { throwable ->
-                _errorFlow.emit(throwable)
+                internalErrorFlow.emit(throwable)
             }
             .stateIn(
                 scope = viewModelScope,
                 started = SharingStarted.WhileSubscribed(5_000),
                 initialValue = SponsorsUiState.Loading,
             )
-
-    fun navigateSession() = viewModelScope.launch {
-        navigator.navigate(RouteSession())
-    }
-
-    fun navigateContributor() = viewModelScope.launch {
-        navigator.navigate(RouteContributor)
-    }
-
-    fun navigateOrganizationSponsor(url: String) = viewModelScope.launch {
-        navigator.navigateWeb(url)
-    }
 }