Refactor: RoutineList MviViewModel 제거

Author: wjdrjs00

presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListScreen.kt

@@ -18,32 +18,31 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.threegap.bitnagil.designsystem.BitnagilTheme
 import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar
-import com.threegap.bitnagil.presentation.common.flow.collectAsEffect
 import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast
 import com.threegap.bitnagil.presentation.routinelist.component.template.DeleteConfirmBottomSheet
 import com.threegap.bitnagil.presentation.routinelist.component.template.EditConfirmBottomSheet
 import com.threegap.bitnagil.presentation.routinelist.component.template.EmptyRoutineListView
 import com.threegap.bitnagil.presentation.routinelist.component.template.RoutineDetailsCard
 import com.threegap.bitnagil.presentation.routinelist.component.template.WeeklyDatePicker
-import com.threegap.bitnagil.presentation.routinelist.model.RoutineListIntent
 import com.threegap.bitnagil.presentation.routinelist.model.RoutineListSideEffect
 import com.threegap.bitnagil.presentation.routinelist.model.RoutineListState
 import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel
+import org.orbitmvi.orbit.compose.collectAsState
+import org.orbitmvi.orbit.compose.collectSideEffect
 import java.time.LocalDate
 
 @Composable
 fun RoutineListScreenContainer(
+    viewModel: RoutineListViewModel = hiltViewModel(),
     navigateToBack: () -> Unit,
     navigateToEditRoutine: (String, Boolean) -> Unit,
     navigateToAddRoutine: () -> Unit,
-    viewModel: RoutineListViewModel = hiltViewModel(),
 ) {
-    val uiState by viewModel.stateFlow.collectAsStateWithLifecycle()
+    val uiState by viewModel.collectAsState()
 
-    viewModel.sideEffectFlow.collectAsEffect { sideEffect ->
+    viewModel.collectSideEffect { sideEffect ->
         when (sideEffect) {
             is RoutineListSideEffect.ShowToast -> GlobalBitnagilToast.showCheck(sideEffect.message)
             is RoutineListSideEffect.NavigateToBack -> navigateToBack()
@@ -58,37 +57,31 @@ fun RoutineListScreenContainer(
         uiState.selectedRoutine?.let { routine ->
             DeleteConfirmBottomSheet(
                 isRepeatRoutine = routine.repeatDay.isNotEmpty(),
-                onDismissRequest = { viewModel.sendIntent(RoutineListIntent.HideDeleteConfirmBottomSheet) },
+                onDismissRequest = viewModel::hideDeleteConfirmBottomSheet,
                 onDeleteToday = viewModel::deleteRoutineForToday,
                 onDeleteAll = viewModel::deleteRoutineCompletely,
-                onCancel = { viewModel.sendIntent(RoutineListIntent.HideDeleteConfirmBottomSheet) },
+                onCancel = viewModel::hideDeleteConfirmBottomSheet,
             )
         }
     }
 
     if (uiState.editConfirmBottomSheetVisible) {
         uiState.selectedRoutine?.let {
             EditConfirmBottomSheet(
-                onDismissRequest = { viewModel.sendIntent(RoutineListIntent.HideEditConfirmBottomSheet) },
-                onApplyToday = { viewModel.sendIntent(RoutineListIntent.OnApplyTodayClick) },
-                onApplyTomorrow = { viewModel.sendIntent(RoutineListIntent.OnApplyTomorrowClick) },
+                onDismissRequest = viewModel::hideEditConfirmBottomSheet,
+                onApplyToday = { viewModel.navigateToEditRoutine(true) },
+                onApplyTomorrow = { viewModel.navigateToEditRoutine(false) },
             )
         }
     }
 
     RoutineListScreen(
         uiState = uiState,
-        onDateSelect = { selectedDate ->
-            viewModel.sendIntent(RoutineListIntent.OnDateSelect(selectedDate))
-        },
-        onShowDeleteConfirmBottomSheet = { routine ->
-            viewModel.sendIntent(RoutineListIntent.ShowDeleteConfirmBottomSheet(routine))
-        },
-        onShowEditConfirmBottomSheet = { routine ->
-            viewModel.sendIntent(RoutineListIntent.ShowEditConfirmBottomSheet(routine))
-        },
-        onRegisterRoutineClick = { viewModel.sendIntent(RoutineListIntent.OnRegisterRoutineClick) },
-        onBackClick = { viewModel.sendIntent(RoutineListIntent.NavigateToBack) },
+        onDateSelect = viewModel::updateDate,
+        onShowDeleteConfirmBottomSheet = viewModel::showDeleteConfirmBottomSheet,
+        onShowEditConfirmBottomSheet = viewModel::showEditConfirmBottomSheet,
+        onRegisterRoutineClick = viewModel::navigateToAddRoutine,
+        onBackClick = viewModel::navigateToBack,
     )
 }
 
@@ -100,10 +93,9 @@ private fun RoutineListScreen(
     onShowEditConfirmBottomSheet: (RoutineUiModel) -> Unit,
     onRegisterRoutineClick: () -> Unit,
     onBackClick: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
     Column(
-        modifier = modifier
+        modifier = Modifier
             .fillMaxSize()
             .background(BitnagilTheme.colors.coolGray99)
             .statusBarsPadding(),
@@ -158,7 +150,7 @@ private fun RoutineListScreen(
 @Composable
 private fun RoutineListScreenPreview() {
     RoutineListScreen(
-        uiState = RoutineListState(),
+        uiState = RoutineListState.INIT,
         onDateSelect = {},
         onShowDeleteConfirmBottomSheet = {},
         onShowEditConfirmBottomSheet = {},

presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListViewModel.kt

@@ -2,20 +2,22 @@ package com.threegap.bitnagil.presentation.routinelist
 
 import android.util.Log
 import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.threegap.bitnagil.domain.routine.usecase.DeleteRoutineForDayUseCase
 import com.threegap.bitnagil.domain.routine.usecase.DeleteRoutineUseCase
 import com.threegap.bitnagil.domain.routine.usecase.FetchWeeklyRoutinesUseCase
 import com.threegap.bitnagil.domain.writeroutine.usecase.GetWriteRoutineEventFlowUseCase
-import com.threegap.bitnagil.presentation.common.mviviewmodel.MviViewModel
 import com.threegap.bitnagil.presentation.home.util.getCurrentWeekDays
-import com.threegap.bitnagil.presentation.routinelist.model.RoutineListIntent
 import com.threegap.bitnagil.presentation.routinelist.model.RoutineListSideEffect
 import com.threegap.bitnagil.presentation.routinelist.model.RoutineListState
+import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel
 import com.threegap.bitnagil.presentation.routinelist.model.toUiModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
-import org.orbitmvi.orbit.syntax.Syntax
+import org.orbitmvi.orbit.Container
+import org.orbitmvi.orbit.ContainerHost
+import org.orbitmvi.orbit.viewmodel.container
 import java.time.LocalDate
 import javax.inject.Inject
 
@@ -26,95 +28,51 @@ class RoutineListViewModel @Inject constructor(
     private val deleteRoutineUseCase: DeleteRoutineUseCase,
     private val deleteRoutineForDayUseCase: DeleteRoutineForDayUseCase,
     private val getWriteRoutineEventFlowUseCase: GetWriteRoutineEventFlowUseCase,
-) : MviViewModel<RoutineListState, RoutineListSideEffect, RoutineListIntent>(
-    savedStateHandle = savedStateHandle,
-    initState = RoutineListState(
-        selectedDate = savedStateHandle.get<String>("selectedDate")
-            ?.takeIf { it.isNotBlank() }
-            ?.let { dateString ->
-                runCatching { LocalDate.parse(dateString) }.getOrNull()
-            }
-            ?: LocalDate.now(),
-    ),
-) {
+) : ContainerHost<RoutineListState, RoutineListSideEffect>, ViewModel() {
+
+    override val container: Container<RoutineListState, RoutineListSideEffect> = container(initialState = RoutineListState.INIT)
+
+    private val selectedDate = savedStateHandle.get<String>("selectedDate")
+        ?.takeIf { it.isNotBlank() }
+        ?.let { dateString ->
+            runCatching { LocalDate.parse(dateString) }.getOrNull()
+        }
+        ?: LocalDate.now()
 
     init {
+        updateDate(selectedDate)
         fetchRoutines()
         observeRoutineChanges()
     }
 
-    override suspend fun Syntax<RoutineListState, RoutineListSideEffect>.reduceState(
-        intent: RoutineListIntent,
-        state: RoutineListState,
-    ): RoutineListState? {
-        val newState = when (intent) {
-            is RoutineListIntent.UpdateLoading -> state.copy(isLoading = intent.isLoading)
-            is RoutineListIntent.LoadRoutines -> state.copy(routines = intent.routines)
-            is RoutineListIntent.OnDateSelect -> state.copy(selectedDate = intent.date)
-
-            is RoutineListIntent.ShowDeleteConfirmBottomSheet -> {
-                state.copy(
-                    selectedRoutine = intent.routine,
-                    deleteConfirmBottomSheetVisible = true,
-                )
-            }
-
-            is RoutineListIntent.ShowEditConfirmBottomSheet -> {
-                state.copy(
-                    selectedRoutine = intent.routine,
-                    editConfirmBottomSheetVisible = true,
-                )
-            }
-
-            is RoutineListIntent.HideDeleteConfirmBottomSheet -> state.copy(deleteConfirmBottomSheetVisible = false)
-            is RoutineListIntent.HideEditConfirmBottomSheet -> state.copy(editConfirmBottomSheetVisible = false)
-
-            is RoutineListIntent.NavigateToBack -> {
-                sendSideEffect(RoutineListSideEffect.NavigateToBack)
-                null
-            }
-
-            is RoutineListIntent.OnRegisterRoutineClick -> {
-                sendSideEffect(RoutineListSideEffect.NavigateToAddRoutine)
-                null
-            }
+    fun updateDate(selectedDate: LocalDate) {
+        intent {
+            reduce { state.copy(selectedDate = selectedDate) }
+        }
+    }
 
-            is RoutineListIntent.OnApplyTodayClick -> {
-                val selectedRoutine = state.selectedRoutine
-                if (selectedRoutine != null) {
-                    sendSideEffect(
-                        RoutineListSideEffect.NavigateToEditRoutine(
-                            routineId = selectedRoutine.routineId,
-                            updateRoutineFromNowDate = true,
-                        ),
-                    )
-                }
-                null
-            }
+    fun showDeleteConfirmBottomSheet(routine: RoutineUiModel) {
+        intent {
+            reduce { state.copy(selectedRoutine = routine, deleteConfirmBottomSheetVisible = true) }
+        }
+    }
 
-            is RoutineListIntent.OnApplyTomorrowClick -> {
-                val selectedRoutine = state.selectedRoutine
-                if (selectedRoutine != null) {
-                    sendSideEffect(
-                        RoutineListSideEffect.NavigateToEditRoutine(
-                            routineId = selectedRoutine.routineId,
-                            updateRoutineFromNowDate = false,
-                        ),
-                    )
-                }
-                null
-            }
+    fun hideDeleteConfirmBottomSheet() {
+        intent {
+            reduce { state.copy(deleteConfirmBottomSheetVisible = false) }
+        }
+    }
 
-            is RoutineListIntent.OnSuccessDeletedRoutine -> {
-                sendSideEffect(RoutineListSideEffect.ShowToast("삭제가 완료되었습니다."))
-                state.copy(
-                    isLoading = false,
-                    deleteConfirmBottomSheetVisible = false,
-                )
-            }
+    fun showEditConfirmBottomSheet(routine: RoutineUiModel) {
+        intent {
+            reduce { state.copy(selectedRoutine = routine, editConfirmBottomSheetVisible = true) }
         }
+    }
 
-        return newState
+    fun hideEditConfirmBottomSheet() {
+        intent {
+            reduce { state.copy(editConfirmBottomSheetVisible = false) }
+        }
     }
 
     private fun observeRoutineChanges() {
@@ -126,55 +84,80 @@ class RoutineListViewModel @Inject constructor(
     }
 
     private fun fetchRoutines() {
-        sendIntent(RoutineListIntent.UpdateLoading(true))
-        val currentWeek = stateFlow.value.selectedDate.getCurrentWeekDays()
-        val startDate = currentWeek.first().toString()
-        val endDate = currentWeek.last().toString()
-        viewModelScope.launch {
+        intent {
+            reduce { state.copy(isLoading = true) }
+            val currentWeek = state.selectedDate.getCurrentWeekDays()
+            val startDate = currentWeek.first().toString()
+            val endDate = currentWeek.last().toString()
             fetchWeeklyRoutinesUseCase(startDate, endDate).fold(
-                onSuccess = { routines ->
-                    sendIntent(RoutineListIntent.LoadRoutines(routines.toUiModel()))
-                    sendIntent(RoutineListIntent.UpdateLoading(false))
+                onSuccess = { routineSchedule ->
+                    reduce { state.copy(isLoading = false, routines = routineSchedule.toUiModel()) }
                 },
                 onFailure = {
                     Log.e("RoutineListViewModel", "루틴 가져오기 실패: ${it.message}")
-                    sendIntent(RoutineListIntent.UpdateLoading(false))
+                    reduce { state.copy(isLoading = false) }
                 },
             )
         }
     }
 
     fun deleteRoutineCompletely() {
-        sendIntent(RoutineListIntent.UpdateLoading(true))
-        val selectedRoutine = stateFlow.value.selectedRoutine!!
-        viewModelScope.launch {
+        intent {
+            reduce { state.copy(isLoading = true) }
+            val selectedRoutine = state.selectedRoutine ?: return@intent
             deleteRoutineUseCase(selectedRoutine.routineId).fold(
                 onSuccess = {
                     fetchRoutines()
-                    sendIntent(RoutineListIntent.OnSuccessDeletedRoutine)
+                    reduce { state.copy(isLoading = false, deleteConfirmBottomSheetVisible = false) }
+                    postSideEffect(RoutineListSideEffect.ShowToast("삭제가 완료되었습니다."))
                 },
                 onFailure = {
                     Log.e("RoutineListViewModel", "루틴 삭제 실패: ${it.message}")
-                    sendIntent(RoutineListIntent.UpdateLoading(false))
+                    reduce { state.copy(isLoading = false) }
                 },
             )
         }
     }
 
     fun deleteRoutineForToday() {
-        sendIntent(RoutineListIntent.UpdateLoading(true))
-        val selectedRoutine = stateFlow.value.selectedRoutine!!
-        viewModelScope.launch {
+        intent {
+            reduce { state.copy(isLoading = true) }
+            val selectedRoutine = state.selectedRoutine ?: return@intent
             deleteRoutineForDayUseCase(selectedRoutine.routineId).fold(
                 onSuccess = {
                     fetchRoutines()
-                    sendIntent(RoutineListIntent.OnSuccessDeletedRoutine)
+                    reduce { state.copy(isLoading = false, deleteConfirmBottomSheetVisible = false) }
+                    postSideEffect(RoutineListSideEffect.ShowToast("삭제가 완료되었습니다."))
                 },
                 onFailure = {
                     Log.e("RoutineListViewModel", "루틴 삭제 실패: ${it.message}")
-                    sendIntent(RoutineListIntent.UpdateLoading(false))
+                    reduce { state.copy(isLoading = false) }
                 },
             )
         }
     }
+
+    fun navigateToAddRoutine() {
+        intent {
+            postSideEffect(RoutineListSideEffect.NavigateToAddRoutine)
+        }
+    }
+
+    fun navigateToEditRoutine(updateFromNow: Boolean) {
+        intent {
+            val selectedRoutine = state.selectedRoutine ?: return@intent
+            postSideEffect(
+                RoutineListSideEffect.NavigateToEditRoutine(
+                    routineId = selectedRoutine.routineId,
+                    updateRoutineFromNowDate = updateFromNow,
+                ),
+            )
+        }
+    }
+
+    fun navigateToBack() {
+        intent {
+            postSideEffect(RoutineListSideEffect.NavigateToBack)
+        }
+    }
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineListIntent.kt

@@ -1,8 +1,6 @@
 package com.threegap.bitnagil.presentation.routinelist.model
 
-import com.threegap.bitnagil.presentation.common.mviviewmodel.MviSideEffect
-
-sealed interface RoutineListSideEffect : MviSideEffect {
+sealed interface RoutineListSideEffect {
     data object NavigateToBack : RoutineListSideEffect
     data object NavigateToAddRoutine : RoutineListSideEffect
     data class NavigateToEditRoutine(val routineId: String, val updateRoutineFromNowDate: Boolean) : RoutineListSideEffect