Refactor: 루틴 조회 api 버전업

wjdrjs00 · wjdrjs00 · commit 5b57cc8a3969 · 2025-08-15T04:29:23.000+09:00
- v1 -&gt; v2 버전업
- response 변화에 따른 모델 수정
diff --git a/data/src/main/java/com/threegap/bitnagil/data/routine/model/response/DayRoutinesDto.kt b/data/src/main/java/com/threegap/bitnagil/data/routine/model/response/DayRoutinesDto.kt
@@ -0,0 +1,19 @@
+package com.threegap.bitnagil.data.routine.model.response
+
+import com.threegap.bitnagil.domain.routine.model.DayRoutines
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class DayRoutinesDto(
+    @SerialName("routineList")
+    val routineList: List<RoutineDto>,
+    @SerialName("allCompleted")
+    val allCompleted: Boolean,
+)
+
+fun DayRoutinesDto.toDomain(): DayRoutines =
+    DayRoutines(
+        routineList = routineList.map { it.toDomain() },
+        allCompleted = allCompleted,
+    )
diff --git a/data/src/main/java/com/threegap/bitnagil/data/routine/model/response/RoutineDto.kt b/data/src/main/java/com/threegap/bitnagil/data/routine/model/response/RoutineDto.kt
@@ -1,28 +1,42 @@
 package com.threegap.bitnagil.data.routine.model.response
 
+import com.threegap.bitnagil.domain.routine.model.DayOfWeek
+import com.threegap.bitnagil.domain.routine.model.RecommendedRoutineType
+import com.threegap.bitnagil.domain.routine.model.Routine
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class RoutineDto(
     @SerialName("routineId")
     val routineId: String,
-    @SerialName("historySeq")
-    val historySeq: Int,
     @SerialName("routineName")
     val routineName: String,
     @SerialName("repeatDay")
     val repeatDay: List<String>,
     @SerialName("executionTime")
     val executionTime: String,
-    @SerialName("subRoutineSearchResultDto")
-    val subRoutines: List<SubRoutineDto>,
-    @SerialName("modifiedYn")
-    val isModified: Boolean,
-    @SerialName("routineCompletionId")
-    val routineCompletionId: Int?,
-    @SerialName("completeYn")
-    val isCompleted: Boolean,
-    @SerialName("routineType")
-    val routineType: String,
+    @SerialName("routineDate")
+    val routineDate: String,
+    @SerialName("routineCompleteYn")
+    val routineCompleteYn: Boolean,
+    @SerialName("subRoutineNames")
+    val subRoutineNames: List<String>,
+    @SerialName("subRoutineCompleteYn")
+    val subRoutineCompleteYn: List<Boolean>,
+    @SerialName("recommendedRoutineType")
+    val recommendedRoutineType: String?,
 )
+
+fun RoutineDto.toDomain(): Routine =
+    Routine(
+        routineId = this.routineId,
+        routineName = this.routineName,
+        repeatDay = this.repeatDay.map { DayOfWeek.fromString(it) },
+        executionTime = this.executionTime,
+        routineDate = this.routineDate,
+        routineCompleteYn = this.routineCompleteYn,
+        subRoutineNames = this.subRoutineNames,
+        subRoutineCompleteYn = this.subRoutineCompleteYn,
+        recommendedRoutineType = RecommendedRoutineType.fromString(this.recommendedRoutineType),
+    )
diff --git a/data/src/main/java/com/threegap/bitnagil/data/routine/model/response/RoutinesResponseDto.kt b/data/src/main/java/com/threegap/bitnagil/data/routine/model/response/RoutinesResponseDto.kt
@@ -1,10 +1,18 @@
 package com.threegap.bitnagil.data.routine.model.response
 
+import com.threegap.bitnagil.domain.routine.model.Routines
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class RoutinesResponseDto(
     @SerialName("routines")
-    val routines: Map<String, List<RoutineDto>>,
+    val routines: Map<String, DayRoutinesDto>,
 )
+
+fun RoutinesResponseDto.toDomain() =
+    Routines(
+        routines = this.routines.mapValues { (_, dayRoutinesDto) ->
+            dayRoutinesDto.toDomain()
+        },
+    )
diff --git a/data/src/main/java/com/threegap/bitnagil/data/routine/service/RoutineService.kt b/data/src/main/java/com/threegap/bitnagil/data/routine/service/RoutineService.kt
@@ -14,7 +14,7 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface RoutineService {
-    @GET("/api/v1/routines")
+    @GET("/api/v2/routines")
     suspend fun fetchRoutines(
         @Query("startDate") startDate: String,
         @Query("endDate") endDate: String,
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/routine/model/DayRoutines.kt b/domain/src/main/java/com/threegap/bitnagil/domain/routine/model/DayRoutines.kt
@@ -0,0 +1,6 @@
+package com.threegap.bitnagil.domain.routine.model
+
+data class DayRoutines(
+    val routineList: List<Routine>,
+    val allCompleted: Boolean,
+)
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/routine/model/RecommendedRoutineType.kt b/domain/src/main/java/com/threegap/bitnagil/domain/routine/model/RecommendedRoutineType.kt
@@ -0,0 +1,18 @@
+package com.threegap.bitnagil.domain.routine.model
+
+enum class RecommendedRoutineType {
+    PERSONALIZED,
+    OUTING,
+    WAKE_UP,
+    CONNECT,
+    REST,
+    GROW,
+    OUTING_REPORT,
+    UNKNOWN,
+    ;
+
+    companion object {
+        fun fromString(categoryName: String?): RecommendedRoutineType =
+            RecommendedRoutineType.entries.find { it.name == categoryName } ?: UNKNOWN
+    }
+}
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/routine/model/Routine.kt b/domain/src/main/java/com/threegap/bitnagil/domain/routine/model/Routine.kt
@@ -2,16 +2,12 @@ package com.threegap.bitnagil.domain.routine.model
 
 data class Routine(
     val routineId: String,
-    val historySeq: Int,
     val routineName: String,
     val repeatDay: List<DayOfWeek>,
     val executionTime: String,
-    val subRoutines: List<SubRoutine>,
-    val isModified: Boolean,
-    val routineCompletionId: Int?,
-    val isCompleted: Boolean,
-    val routineType: RoutineType,
-) {
-    fun withSortedSubRoutines(): Routine =
-        copy(subRoutines = subRoutines.sortedBy { it.sortOrder })
-}
+    val routineDate: String,
+    val routineCompleteYn: Boolean,
+    val subRoutineNames: List<String>,
+    val subRoutineCompleteYn: List<Boolean>,
+    val recommendedRoutineType: RecommendedRoutineType?,
+)
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/routine/model/Routines.kt b/domain/src/main/java/com/threegap/bitnagil/domain/routine/model/Routines.kt
@@ -1,12 +1,5 @@
 package com.threegap.bitnagil.domain.routine.model
 
 data class Routines(
-    val routinesByDate: Map<String, List<Routine>>,
-) {
-    fun withSortedSubRoutines(): Routines =
-        copy(
-            routinesByDate = routinesByDate.mapValues { (_, routinesList) ->
-                routinesList.map { it.withSortedSubRoutines() }
-            },
-        )
-}
+    val routines: Map<String, DayRoutines>,
+)
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/routine/usecase/FetchWeeklyRoutinesUseCase.kt b/domain/src/main/java/com/threegap/bitnagil/domain/routine/usecase/FetchWeeklyRoutinesUseCase.kt
@@ -9,5 +9,4 @@ class FetchWeeklyRoutinesUseCase @Inject constructor(
 ) {
     suspend operator fun invoke(startDate: String, endDate: String): Result<Routines> =
         routineRepository.fetchWeeklyRoutines(startDate, endDate)
-            .map { it.withSortedSubRoutines() }
 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/DayRoutinesUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/DayRoutinesUiModel.kt
@@ -0,0 +1,17 @@
+package com.threegap.bitnagil.presentation.home.model
+
+import android.os.Parcelable
+import com.threegap.bitnagil.domain.routine.model.DayRoutines
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class DayRoutinesUiModel(
+    val routineList: List<RoutineUiModel> = emptyList(),
+    val allCompleted: Boolean = false,
+) : Parcelable
+
+fun DayRoutines.toUiModel(): DayRoutinesUiModel =
+    DayRoutinesUiModel(
+        routineList = routineList.map { it.toUiModel() },
+        allCompleted = allCompleted,
+    )
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/HomeState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/HomeState.kt
@@ -15,5 +15,5 @@ data class HomeState(
     val routines: RoutinesUiModel = RoutinesUiModel(),
 ) : MviState {
     val selectedDateRoutines: List<RoutineUiModel>
-        get() = routines.routinesByDate[selectedDate.toString()] ?: emptyList()
+        get() = routines.routines[selectedDate.toString()]?.routineList ?: emptyList()
 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/RoutineUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/RoutineUiModel.kt
@@ -2,45 +2,32 @@ package com.threegap.bitnagil.presentation.home.model
 
 import android.os.Parcelable
 import com.threegap.bitnagil.domain.routine.model.DayOfWeek
+import com.threegap.bitnagil.domain.routine.model.RecommendedRoutineType
 import com.threegap.bitnagil.domain.routine.model.Routine
-import com.threegap.bitnagil.domain.routine.model.RoutineByDayDeletion
-import com.threegap.bitnagil.domain.routine.model.RoutineType
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class RoutineUiModel(
     val routineId: String,
-    val historySeq: Int,
-    val repeatDay: List<DayOfWeek>,
     val routineName: String,
+    val repeatDay: List<DayOfWeek>,
     val executionTime: String,
-    val subRoutines: List<SubRoutineUiModel>,
-    val isModified: Boolean = false,
-    val routineCompletionId: Int?,
-    val isCompleted: Boolean = false,
-    val routineType: RoutineType,
+    val routineDate: String,
+    val routineCompleteYn: Boolean,
+    val subRoutineNames: List<String>,
+    val subRoutineCompleteYn: List<Boolean>,
+    val recommendedRoutineType: RecommendedRoutineType?,
 ) : Parcelable
 
 fun Routine.toUiModel(): RoutineUiModel =
     RoutineUiModel(
         routineId = this.routineId,
-        historySeq = this.historySeq,
-        repeatDay = this.repeatDay,
         routineName = this.routineName,
+        repeatDay = this.repeatDay,
         executionTime = this.executionTime,
-        subRoutines = this.subRoutines.map { it.toUiModel() },
-        isModified = this.isModified,
-        routineCompletionId = this.routineCompletionId,
-        isCompleted = this.isCompleted,
-        routineType = this.routineType,
-    )
-
-fun RoutineUiModel.toRoutineByDayDeletion(performedDate: String): RoutineByDayDeletion =
-    RoutineByDayDeletion(
-        routineCompletionId = this.routineCompletionId,
-        routineId = this.routineId,
-        routineType = this.routineType,
-        subRoutineInfosForDelete = this.subRoutines.map { it.toSubRoutineDeletionInfo() },
-        performedDate = performedDate,
-        historySeq = this.historySeq,
+        routineDate = this.routineDate,
+        routineCompleteYn = this.routineCompleteYn,
+        subRoutineNames = this.subRoutineNames,
+        subRoutineCompleteYn = this.subRoutineCompleteYn,
+        recommendedRoutineType = this.recommendedRoutineType,
     )
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/RoutinesUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/RoutinesUiModel.kt
@@ -6,12 +6,12 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class RoutinesUiModel(
-    val routinesByDate: Map<String, List<RoutineUiModel>> = emptyMap(),
+    val routines: Map<String, DayRoutinesUiModel> = emptyMap(),
 ) : Parcelable
 
 fun Routines.toUiModel(): RoutinesUiModel =
     RoutinesUiModel(
-        routinesByDate = this.routinesByDate.mapValues { (_, routines) ->
-            routines.map { it.toUiModel() }
+        routines = this.routines.mapValues { (_, dayRoutines) ->
+            dayRoutines.toUiModel()
         },
     )
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineViewModel.kt
@@ -82,13 +82,14 @@ class WriteRoutineViewModel @AssistedInject constructor(
             sendIntent(WriteRoutineIntent.GetRoutineLoading)
             getRoutineUseCase(routineId).fold(
                 onSuccess = { routine ->
-                    oldSubRoutines = routine.subRoutines.map { SubRoutine.fromDomainSubRoutine(it) }
+//                    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 = routine.subRoutines.map { it.subRoutineName },
+//                            subRoutines = routine.subRoutines.map { it.subRoutineName },
+                            subRoutines = emptyList(),
                         ),
                     )
                 },

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,4 @@ class FetchWeeklyRoutinesUseCase @Inject constructor(`
`9`	`9`	`) {`
`10`	`10`	`suspend operator fun invoke(startDate: String, endDate: String): Result<Routines> =`
`11`	`11`	`routineRepository.fetchWeeklyRoutines(startDate, endDate)`
`12`		`- .map { it.withSortedSubRoutines() }`
`13`	`12`	`}`