FIX: 루틴 리스트 화면에서 루틴 작성/수정 화면 연결 및 루틴 DTO에 시작/종료 날자 변수 추가, 루틴 단일 조회 API v2 반영

Author: l5x5l

app/src/main/java/com/threegap/bitnagil/MainNavHost.kt

@@ -263,6 +263,18 @@ fun MainNavHost(
                         navigator.navController.popBackStack()
                     }
                 },
+                navigateToAddRoutine = {
+                    navigator.navController.navigate(Route.WriteRoutine())
+                },
+                navigateToEditRoutine = { routineId, updateRoutineFromNowDate ->
+                    navigator.navController.navigate(
+                        Route.WriteRoutine(
+                            routineId = routineId,
+                            isRegister = false,
+                            isUpdateRoutineFromNowDate = updateRoutineFromNowDate,
+                        ),
+                    )
+                },
             )
         }
 

data/src/main/java/com/threegap/bitnagil/data/routine/model/response/RoutineDto.kt

@@ -26,6 +26,12 @@ data class RoutineDto(
     val subRoutineCompleteYn: List<Boolean>,
     @SerialName("recommendedRoutineType")
     val recommendedRoutineType: String?,
+    @SerialName("routineDeletedYn")
+    val routineDeletedYn: Boolean,
+    @SerialName("routineStartDate")
+    val routineStartDate: String,
+    @SerialName("routineEndDate")
+    val routineEndDate: String,
 )
 
 fun RoutineDto.toDomain(): Routine =
@@ -39,4 +45,6 @@ fun RoutineDto.toDomain(): Routine =
         subRoutineNames = this.subRoutineNames,
         subRoutineCompleteYn = this.subRoutineCompleteYn,
         recommendedRoutineType = RecommendedRoutineType.fromString(this.recommendedRoutineType),
+        startDate = this.routineStartDate,
+        endDate = this.routineEndDate,
     )

data/src/main/java/com/threegap/bitnagil/data/routine/service/RoutineService.kt

@@ -18,7 +18,7 @@ interface RoutineService {
         @Query("endDate") endDate: String,
     ): BaseResponse<RoutinesResponseDto>
 
-    @GET("/api/v1/routines/{routineId}")
+    @GET("/api/v2/routines/{routineId}")
     suspend fun getRoutine(
         @Path("routineId") routineId: String,
     ): BaseResponse<RoutineDto>

domain/src/main/java/com/threegap/bitnagil/domain/routine/model/Routine.kt

@@ -5,6 +5,8 @@ data class Routine(
     val routineName: String,
     val repeatDay: List<DayOfWeek>,
     val executionTime: String,
+    val startDate: String,
+    val endDate: String,
     val routineDate: String,
     val routineCompleteYn: Boolean,
     val subRoutineNames: List<String>,

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

@@ -36,19 +36,20 @@ import java.time.LocalDate
 @Composable
 fun RoutineListScreenContainer(
     navigateToBack: () -> Unit,
+    navigateToEditRoutine: (String, Boolean) -> Unit,
+    navigateToAddRoutine: () -> Unit,
     viewModel: RoutineListViewModel = hiltViewModel(),
 ) {
     val uiState by viewModel.stateFlow.collectAsStateWithLifecycle()
 
     viewModel.sideEffectFlow.collectAsEffect { sideEffect ->
         when (sideEffect) {
             is RoutineListSideEffect.NavigateToBack -> navigateToBack()
-            is RoutineListSideEffect.NavigateToWriteRoutine -> {
-//                TODO: 네비게이션 연결하기
-//                navigateToWriteRoutine(
-//                    routineId = sideEffect.routineId,
-//                    applyDate = sideEffect.applyDate,
-//                )
+            is RoutineListSideEffect.NavigateToAddRoutine -> {
+                navigateToAddRoutine()
+            }
+            is RoutineListSideEffect.NavigateToEditRoutine -> {
+                navigateToEditRoutine(sideEffect.routineId, sideEffect.updateRoutineFromNowDate)
             }
         }
     }

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

@@ -73,10 +73,7 @@ class RoutineListViewModel @Inject constructor(
 
             is RoutineListIntent.OnRegisterRoutineClick -> {
                 sendSideEffect(
-                    RoutineListSideEffect.NavigateToWriteRoutine(
-                        routineId = null,
-                        applyDate = null,
-                    ),
+                    RoutineListSideEffect.NavigateToAddRoutine,
                 )
                 null
             }
@@ -85,9 +82,9 @@ class RoutineListViewModel @Inject constructor(
                 val selectedRoutine = state.selectedRoutine
                 if (selectedRoutine != null) {
                     sendSideEffect(
-                        RoutineListSideEffect.NavigateToWriteRoutine(
+                        RoutineListSideEffect.NavigateToEditRoutine(
                             routineId = selectedRoutine.routineId,
-                            applyDate = "TODAY",
+                            updateRoutineFromNowDate = true,
                         ),
                     )
                 }
@@ -98,9 +95,9 @@ class RoutineListViewModel @Inject constructor(
                 val selectedRoutine = state.selectedRoutine
                 if (selectedRoutine != null) {
                     sendSideEffect(
-                        RoutineListSideEffect.NavigateToWriteRoutine(
+                        RoutineListSideEffect.NavigateToEditRoutine(
                             routineId = selectedRoutine.routineId,
-                            applyDate = "TOMORROW",
+                            updateRoutineFromNowDate = false,
                         ),
                     )
                 }

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

@@ -4,5 +4,6 @@ import com.threegap.bitnagil.presentation.common.mviviewmodel.MviSideEffect
 
 sealed interface RoutineListSideEffect : MviSideEffect {
     data object NavigateToBack : RoutineListSideEffect
-    data class NavigateToWriteRoutine(val routineId: String?, val applyDate: String?) : RoutineListSideEffect
+    data object NavigateToAddRoutine : RoutineListSideEffect
+    data class NavigateToEditRoutine(val routineId: String, val updateRoutineFromNowDate: Boolean) : RoutineListSideEffect
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineViewModel.kt

@@ -81,17 +81,18 @@ class WriteRoutineViewModel @AssistedInject constructor(
             sendIntent(WriteRoutineIntent.GetRoutineLoading)
             getRoutineUseCase(routineId).fold(
                 onSuccess = { routine ->
-                    oldSubRoutines = routine.subRoutines.map { SubRoutine.fromDomainSubRoutine(it) }
                     sendIntent(
                         WriteRoutineIntent.SetRoutine(
                             name = routine.routineName,
                             repeatDays = routine.repeatDay.map { Day.fromDayOfWeek(it) },
                             startTime = Time.fromDomainTimeString(routine.executionTime),
                             subRoutines = listOf(
-                                oldSubRoutines.getOrNull(0)?.name ?: "",
-                                oldSubRoutines.getOrNull(1)?.name ?: "",
-                                oldSubRoutines.getOrNull(2)?.name ?: "",
+                                routine.subRoutineNames.getOrNull(0) ?: "",
+                                routine.subRoutineNames.getOrNull(1) ?: "",
+                                routine.subRoutineNames.getOrNull(2) ?: "",
                             ),
+                            startDate = Date.fromString(routine.startDate),
+                            endDate = Date.fromString(routine.endDate),
                         ),
                     )
                 },
@@ -118,6 +119,8 @@ class WriteRoutineViewModel @AssistedInject constructor(
                                 oldSubRoutines.getOrNull(1)?.name ?: "",
                                 oldSubRoutines.getOrNull(2)?.name ?: "",
                             ),
+                            startDate = Date.now(),
+                            endDate = Date.now(),
                         ),
                     )
                 },

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/Date.kt

@@ -40,6 +40,11 @@ data class Date(
 
             return d2
         }
+
+        fun fromString(dateString: String): Date {
+            val (year, month, day) = dateString.split("-").map { it.toInt() }
+            return Date(year, month, day)
+        }
     }
 
     fun toFormattedString(): String = "%04d.%02d.%02d".format(year, month, day)

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/mvi/WriteRoutineIntent.kt

@@ -15,7 +15,14 @@ sealed class WriteRoutineIntent : MviIntent {
     data class SelectDay(val day: Day) : WriteRoutineIntent()
     data class SetStartTime(val time: Time) : WriteRoutineIntent()
     data class SetWriteRoutineType(val writeRoutineType: WriteRoutineType) : WriteRoutineIntent()
-    data class SetRoutine(val name: String, val repeatDays: List<Day>, val startTime: Time, val subRoutines: List<String>) : WriteRoutineIntent()
+    data class SetRoutine(
+        val name: String,
+        val repeatDays: List<Day>,
+        val startTime: Time,
+        val subRoutines: List<String>,
+        val startDate: Date,
+        val endDate: Date,
+    ) : WriteRoutineIntent()
     data object SelectAllTime : WriteRoutineIntent()
     data object ShowTimePickerBottomSheet : WriteRoutineIntent()
     data object HideTimePickerBottomSheet : WriteRoutineIntent()