REFACTOR: 루틴 작성/수정 관련 API v2 반영

Author: l5x5l

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

@@ -197,7 +197,7 @@ fun MainNavHost(
             val writeScreenNavArg = if (arg.isRegister) {
                 WriteRoutineScreenArg.Add(baseRoutineId = arg.routineId)
             } else {
-                WriteRoutineScreenArg.Edit(routineId = arg.routineId!!)
+                WriteRoutineScreenArg.Edit(routineId = arg.routineId!!, updateRoutineFromNowDate = arg.isUpdateRoutineFromNowDate)
             }
 
             val viewModel = hiltViewModel<WriteRoutineViewModel, WriteRoutineViewModel.Factory> { factory ->

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

@@ -34,6 +34,7 @@ sealed interface Route {
     data class WriteRoutine(
         val routineId: String? = null,
         val isRegister: Boolean = true,
+        val isUpdateRoutineFromNowDate: Boolean = true,
     ) : Route
 
     @Serializable

data/src/main/java/com/threegap/bitnagil/data/writeroutine/model/dto/RoutineDto.kt

@@ -1,19 +1,24 @@
 package com.threegap.bitnagil.data.writeroutine.model.request
 
-import com.threegap.bitnagil.data.writeroutine.model.dto.SubRoutineInfosDiffDto
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class EditRoutineRequest(
     @SerialName("routineId")
     val routineId: String,
+    @SerialName("updateApplyDate")
+    val updateApplyDate: String,
     @SerialName("routineName")
     val routineName: String,
     @SerialName("repeatDay")
     val repeatDay: List<String>,
+    @SerialName("routineStartDate")
+    val routineStartDate: String?,
+    @SerialName("routineEndDate")
+    val routineEndDate: String?,
     @SerialName("executionTime")
     val executionTime: String,
-    @SerialName("subRoutineInfos")
-    val subRoutineInfos: List<SubRoutineInfosDiffDto>,
+    @SerialName("subRoutineName")
+    val subRoutineName: List<String>,
 )

data/src/main/java/com/threegap/bitnagil/data/writeroutine/model/dto/SubRoutineDto.kt

@@ -9,6 +9,10 @@ data class RegisterRoutineRequest(
     val routineName: String,
     @SerialName("repeatDay")
     val repeatDay: List<String>,
+    @SerialName("routineStartDate")
+    val routineStartDate: String?,
+    @SerialName("routineEndDate")
+    val routineEndDate: String?,
     @SerialName("executionTime")
     val executionTime: String,
     @SerialName("subRoutineName")

data/src/main/java/com/threegap/bitnagil/data/writeroutine/model/dto/SubRoutineInfosDiffDto.kt

@@ -1,11 +1,11 @@
 package com.threegap.bitnagil.data.writeroutine.repositoryImpl
 
 import com.threegap.bitnagil.data.writeroutine.datasource.WriteRoutineDataSource
-import com.threegap.bitnagil.data.writeroutine.model.dto.SubRoutineInfosDiffDto
 import com.threegap.bitnagil.data.writeroutine.model.request.EditRoutineRequest
 import com.threegap.bitnagil.data.writeroutine.model.request.RegisterRoutineRequest
+import com.threegap.bitnagil.domain.writeroutine.model.Date
 import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay
-import com.threegap.bitnagil.domain.writeroutine.model.SubRoutineDiff
+import com.threegap.bitnagil.domain.writeroutine.model.RoutineUpdateType
 import com.threegap.bitnagil.domain.writeroutine.model.Time
 import com.threegap.bitnagil.domain.writeroutine.model.WriteRoutineEvent
 import com.threegap.bitnagil.domain.writeroutine.repository.WriteRoutineRepository
@@ -17,11 +17,20 @@ import javax.inject.Inject
 class WriteRoutineRepositoryImpl @Inject constructor(
     private val writeRoutineDataSource: WriteRoutineDataSource,
 ) : WriteRoutineRepository {
-    override suspend fun registerRoutine(name: String, repeatDay: List<RepeatDay>, startTime: Time, subRoutines: List<String>): Result<Unit> {
+    override suspend fun registerRoutine(
+        name: String,
+        repeatDay: List<RepeatDay>,
+        startTime: Time,
+        startDate: Date?,
+        endDate: Date?,
+        subRoutines: List<String>
+    ): Result<Unit> {
         val request = RegisterRoutineRequest(
             routineName = name,
             repeatDay = repeatDay.map { it.fullName },
             executionTime = startTime.toFormattedString(),
+            routineStartDate = startDate?.toFormattedString(),
+            routineEndDate = endDate?.toFormattedString(),
             subRoutineName = subRoutines,
         )
         return writeRoutineDataSource.registerRoutine(request).also {
@@ -33,19 +42,23 @@ class WriteRoutineRepositoryImpl @Inject constructor(
 
     override suspend fun editRoutine(
         routineId: String,
+        routineUpdateType: RoutineUpdateType,
         name: String,
         repeatDay: List<RepeatDay>,
         startTime: Time,
-        subRoutines: List<SubRoutineDiff>,
+        startDate: Date?,
+        endDate: Date?,
+        subRoutines: List<String>,
     ): Result<Unit> {
         val request = EditRoutineRequest(
             routineId = routineId,
+            updateApplyDate = routineUpdateType.value,
             routineName = name,
             repeatDay = repeatDay.map { it.fullName },
             executionTime = startTime.toFormattedString(),
-            subRoutineInfos = subRoutines.map {
-                SubRoutineInfosDiffDto.fromSubRoutineDiff(it)
-            },
+            routineStartDate = startDate?.toFormattedString(),
+            routineEndDate = endDate?.toFormattedString(),
+            subRoutineName = subRoutines,
         )
 
         return writeRoutineDataSource.editRoutine(request).also {

data/src/main/java/com/threegap/bitnagil/data/writeroutine/model/request/EditRoutineRequest.kt

@@ -8,12 +8,12 @@ import retrofit2.http.PATCH
 import retrofit2.http.POST
 
 interface WriteRoutineService {
-    @POST("/api/v1/routines")
+    @POST("/api/v2/routines")
     suspend fun postRoutine(
         @Body registerRoutineRequest: RegisterRoutineRequest,
     ): BaseResponse<Unit>
 
-    @PATCH("/api/v1/routines")
+    @PATCH("/api/v2/routines")
     suspend fun patchRoutine(
         @Body editRoutineRequest: EditRoutineRequest,
     ): BaseResponse<Unit>

data/src/main/java/com/threegap/bitnagil/data/writeroutine/model/request/RegisterRoutineRequest.kt

@@ -10,4 +10,8 @@ data class Date(
         require(month in 1..12) { "Month must be in range 1..12, but was $month" }
         require(day in 1..31) { "Day must be in range 1..31, but was $day" }
     }
+
+    fun toFormattedString(): String {
+        return "%04d.%02d.%02d".format(year, month, day)
+    }
 }