Refactor: 추천 루틴 관련 모델 및 네이밍 변경

wjdrjs00 · wjdrjs00 · commit 85eb3d1ddb07 · 2026-02-14T23:45:01.000+09:00
diff --git a/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/datasource/RecommendRoutineDataSource.kt b/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/datasource/RecommendRoutineDataSource.kt
@@ -1,9 +1,9 @@
 package com.threegap.bitnagil.data.recommendroutine.datasource
 
-import com.threegap.bitnagil.data.recommendroutine.model.response.RecommendRoutinesDto
-import com.threegap.bitnagil.data.recommendroutine.model.response.RecommendedRoutineDto
+import com.threegap.bitnagil.data.recommendroutine.model.response.RecommendRoutinesResponse
+import com.threegap.bitnagil.data.recommendroutine.model.response.RecommendedRoutineResponse
 
 interface RecommendRoutineDataSource {
-    suspend fun fetchRecommendRoutines(): Result<RecommendRoutinesDto>
-    suspend fun getRecommendRoutine(recommendRoutineId: Long): Result<RecommendedRoutineDto>
+    suspend fun fetchRecommendRoutines(): Result<RecommendRoutinesResponse>
+    suspend fun getRecommendRoutine(recommendRoutineId: Long): Result<RecommendedRoutineResponse>
 }
diff --git a/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/datasourceImpl/RecommendRoutineDataSourceImpl.kt b/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/datasourceImpl/RecommendRoutineDataSourceImpl.kt
@@ -2,21 +2,21 @@ package com.threegap.bitnagil.data.recommendroutine.datasourceImpl
 
 import com.threegap.bitnagil.data.common.safeApiCall
 import com.threegap.bitnagil.data.recommendroutine.datasource.RecommendRoutineDataSource
-import com.threegap.bitnagil.data.recommendroutine.model.response.RecommendRoutinesDto
-import com.threegap.bitnagil.data.recommendroutine.model.response.RecommendedRoutineDto
+import com.threegap.bitnagil.data.recommendroutine.model.response.RecommendRoutinesResponse
+import com.threegap.bitnagil.data.recommendroutine.model.response.RecommendedRoutineResponse
 import com.threegap.bitnagil.data.recommendroutine.service.RecommendRoutineService
 import javax.inject.Inject
 
 class RecommendRoutineDataSourceImpl @Inject constructor(
     private val recommendRoutineService: RecommendRoutineService,
 ) : RecommendRoutineDataSource {
 
-    override suspend fun fetchRecommendRoutines(): Result<RecommendRoutinesDto> =
+    override suspend fun fetchRecommendRoutines(): Result<RecommendRoutinesResponse> =
         safeApiCall {
             recommendRoutineService.fetchRecommendRoutines()
         }
 
-    override suspend fun getRecommendRoutine(recommendRoutineId: Long): Result<RecommendedRoutineDto> =
+    override suspend fun getRecommendRoutine(recommendRoutineId: Long): Result<RecommendedRoutineResponse> =
         safeApiCall {
             recommendRoutineService.getRecommendRoutine(recommendRoutineId)
         }
diff --git a/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/model/response/RecommendRoutinesResponse.kt b/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/model/response/RecommendRoutinesResponse.kt
@@ -1,23 +1,23 @@
 package com.threegap.bitnagil.data.recommendroutine.model.response
 
-import com.threegap.bitnagil.domain.recommendroutine.model.EmotionMarbleType
+import com.threegap.bitnagil.domain.emotion.model.EmotionMarbleType
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendRoutines
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class RecommendRoutinesDto(
+data class RecommendRoutinesResponse(
     @SerialName("recommendedRoutines")
-    val recommendedRoutinesByCategory: Map<RecommendCategory, List<RecommendedRoutineDto>>,
+    val recommendedRoutinesByCategory: Map<RecommendCategory, List<RecommendedRoutineResponse>>,
     @SerialName("emotionMarbleType")
     val emotionMarbleType: EmotionMarbleType?,
 )
 
-fun RecommendRoutinesDto.toDomain(): RecommendRoutines =
+fun RecommendRoutinesResponse.toDomain(): RecommendRoutines =
     RecommendRoutines(
-        recommendRoutinesByCategory = this.recommendedRoutinesByCategory.map { (category, routines) ->
-            category to routines.map { it.toDomain() }
-        }.toMap(),
+        recommendRoutinesByCategory = this.recommendedRoutinesByCategory.mapValues { (_, routines) ->
+            routines.map { it.toDomain() }
+        },
         emotionMarbleType = this.emotionMarbleType,
     )
diff --git a/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/model/response/RecommendedRoutineResponse.kt b/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/model/response/RecommendedRoutineResponse.kt
@@ -7,7 +7,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class RecommendedRoutineDto(
+data class RecommendedRoutineResponse(
     @SerialName("recommendedRoutineId")
     val recommendedRoutineId: Long,
     @SerialName("recommendedRoutineName")
@@ -21,16 +21,16 @@ data class RecommendedRoutineDto(
     @SerialName("recommendedRoutineType")
     val recommendedRoutineType: RecommendCategory,
     @SerialName("recommendedSubRoutineSearchResult")
-    val recommendedSubRoutineSearchResult: List<RecommendedSubRoutineDto>,
+    val recommendedSubRoutineSearchResult: List<RecommendedSubRoutineResponse>,
 )
 
-fun RecommendedRoutineDto.toDomain(): RecommendRoutine =
+fun RecommendedRoutineResponse.toDomain(): RecommendRoutine =
     RecommendRoutine(
         id = this.recommendedRoutineId,
         name = this.recommendedRoutineName,
         description = this.recommendedRoutineDescription,
         level = this.recommendedRoutineLevel,
         executionTime = this.executionTime,
-        recommendedRoutineType = this.recommendedRoutineType,
-        recommendSubRoutines = this.recommendedSubRoutineSearchResult.map { it.toDomain() },
+        category = this.recommendedRoutineType,
+        subRoutines = this.recommendedSubRoutineSearchResult.map { it.toDomain() },
     )
diff --git a/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/model/response/RecommendedSubRoutineResponse.kt b/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/model/response/RecommendedSubRoutineResponse.kt
@@ -5,14 +5,14 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class RecommendedSubRoutineDto(
+data class RecommendedSubRoutineResponse(
     @SerialName("recommendedSubRoutineId")
     val recommendedSubRoutineId: Long,
     @SerialName("recommendedSubRoutineName")
     val recommendedSubRoutineName: String,
 )
 
-fun RecommendedSubRoutineDto.toDomain(): RecommendSubRoutine =
+fun RecommendedSubRoutineResponse.toDomain(): RecommendSubRoutine =
     RecommendSubRoutine(
         id = recommendedSubRoutineId,
         name = recommendedSubRoutineName,
diff --git a/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/service/RecommendRoutineService.kt b/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/service/RecommendRoutineService.kt
@@ -1,17 +1,17 @@
 package com.threegap.bitnagil.data.recommendroutine.service
 
-import com.threegap.bitnagil.data.recommendroutine.model.response.RecommendRoutinesDto
-import com.threegap.bitnagil.data.recommendroutine.model.response.RecommendedRoutineDto
+import com.threegap.bitnagil.data.recommendroutine.model.response.RecommendRoutinesResponse
+import com.threegap.bitnagil.data.recommendroutine.model.response.RecommendedRoutineResponse
 import com.threegap.bitnagil.network.model.BaseResponse
 import retrofit2.http.GET
 import retrofit2.http.Path
 
 interface RecommendRoutineService {
     @GET("/api/v1/recommend-routines")
-    suspend fun fetchRecommendRoutines(): BaseResponse<RecommendRoutinesDto>
+    suspend fun fetchRecommendRoutines(): BaseResponse<RecommendRoutinesResponse>
 
     @GET("/api/v1/recommend-routines/{recommendedRoutineId}")
     suspend fun getRecommendRoutine(
         @Path("recommendedRoutineId") recommendedRoutineId: Long,
-    ): BaseResponse<RecommendedRoutineDto>
+    ): BaseResponse<RecommendedRoutineResponse>
 }
diff --git a/data/src/main/java/com/threegap/bitnagil/data/routine/model/response/RoutineScheduleResponse.kt b/data/src/main/java/com/threegap/bitnagil/data/routine/model/response/RoutineScheduleResponse.kt
@@ -12,5 +12,5 @@ data class RoutineScheduleResponse(
 
 fun RoutineScheduleResponse.toDomain(): RoutineSchedule =
     RoutineSchedule(
-        dailyRoutines = this.dailyRoutines.mapValues { (_, dailyRoutinesResponse) -> dailyRoutinesResponse.toDomain() }
+        dailyRoutines = this.dailyRoutines.mapValues { (_, dailyRoutinesResponse) -> dailyRoutinesResponse.toDomain() },
     )
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/recommendroutine/model/EmotionMarbleType.kt b/domain/src/main/java/com/threegap/bitnagil/domain/recommendroutine/model/EmotionMarbleType.kt
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/recommendroutine/model/RecommendRoutine.kt b/domain/src/main/java/com/threegap/bitnagil/domain/recommendroutine/model/RecommendRoutine.kt
@@ -6,6 +6,6 @@ data class RecommendRoutine(
     val description: String,
     val level: RecommendLevel,
     val executionTime: String,
-    val recommendedRoutineType: RecommendCategory,
-    val recommendSubRoutines: List<RecommendSubRoutine>,
+    val category: RecommendCategory,
+    val subRoutines: List<RecommendSubRoutine>,
 )
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/recommendroutine/model/RecommendRoutines.kt b/domain/src/main/java/com/threegap/bitnagil/domain/recommendroutine/model/RecommendRoutines.kt
@@ -1,5 +1,7 @@
 package com.threegap.bitnagil.domain.recommendroutine.model
 
+import com.threegap.bitnagil.domain.emotion.model.EmotionMarbleType
+
 data class RecommendRoutines(
     val recommendRoutinesByCategory: Map<RecommendCategory, List<RecommendRoutine>>,
     val emotionMarbleType: EmotionMarbleType?,
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/RecommendRoutineViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/RecommendRoutineViewModel.kt
@@ -32,7 +32,7 @@ class RecommendRoutineViewModel @Inject constructor(
         observeEmotionChangeEvent()
     }
 
-    private var recommendRoutines: RecommendRoutinesUiModel = RecommendRoutinesUiModel()
+    private var recommendRoutines: RecommendRoutinesUiModel = RecommendRoutinesUiModel.INIT
 
     fun updateRoutineCategory(category: RecommendCategory) {
         intent {
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/block/RecommendRoutineItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/component/block/RecommendRoutineItem.kt
@@ -49,11 +49,11 @@ fun RecommendRoutineItem(
             verticalAlignment = Alignment.CenterVertically,
         ) {
             BitnagilIcon(
-                id = routine.recommendedRoutineType?.displayIcon ?: R.drawable.ic_shine,
+                id = routine.category?.displayIcon ?: R.drawable.ic_shine,
                 tint = null,
                 modifier = Modifier
                     .background(
-                        color = routine.recommendedRoutineType?.displayColor ?: BitnagilTheme.colors.yellow10,
+                        color = routine.category?.displayColor ?: BitnagilTheme.colors.yellow10,
                         shape = RoundedCornerShape(4.dp),
                     )
                     .padding(4.dp),
@@ -75,7 +75,7 @@ fun RecommendRoutineItem(
             )
         }
 
-        if (routine.recommendSubRoutines.isNotEmpty()) {
+        if (routine.subRoutines.isNotEmpty()) {
             HorizontalDivider(
                 thickness = 1.dp,
                 color = BitnagilTheme.colors.coolGray97,
@@ -93,7 +93,7 @@ fun RecommendRoutineItem(
                     style = BitnagilTheme.typography.body2Medium,
                 )
 
-                routine.recommendSubRoutines.forEach { subRoutine ->
+                routine.subRoutines.forEach { subRoutine ->
                     Text(
                         text = "•  ${subRoutine.name}",
                         color = BitnagilTheme.colors.coolGray40,
@@ -113,8 +113,8 @@ private fun RecommendRoutineItemPreview() {
             id = 1,
             name = "개운하게 일어나기",
             level = RecommendLevel.LEVEL1,
-            recommendedRoutineType = RecommendCategory.WAKE_UP,
-            recommendSubRoutines = listOf(
+            category = RecommendCategory.WAKE_UP,
+            subRoutines = listOf(
                 RecommendSubRoutineUiModel(
                     id = 1,
                     name = "일어나기",
@@ -133,8 +133,8 @@ private fun EmptySubRoutineRecommendRoutineItemPreview() {
             id = 1,
             name = "개운하게 일어나기",
             level = RecommendLevel.LEVEL1,
-            recommendedRoutineType = RecommendCategory.WAKE_UP,
-            recommendSubRoutines = emptyList(),
+            category = RecommendCategory.WAKE_UP,
+            subRoutines = emptyList(),
         ),
         onAddRoutineClick = {},
     )
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/contract/RecommendRoutineState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/contract/RecommendRoutineState.kt
@@ -1,6 +1,6 @@
 package com.threegap.bitnagil.presentation.recommendroutine.contract
 
-import com.threegap.bitnagil.domain.recommendroutine.model.EmotionMarbleType
+import com.threegap.bitnagil.domain.emotion.model.EmotionMarbleType
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel
 import com.threegap.bitnagil.presentation.recommendroutine.model.RecommendRoutineUiModel
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendRoutineUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendRoutineUiModel.kt
@@ -1,25 +1,22 @@
 package com.threegap.bitnagil.presentation.recommendroutine.model
 
-import android.os.Parcelable
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendRoutine
-import kotlinx.parcelize.Parcelize
 
-@Parcelize
 data class RecommendRoutineUiModel(
-    val id: Long = 0,
-    val name: String = "",
-    val level: RecommendLevel? = null,
-    val recommendedRoutineType: RecommendCategory? = null,
-    val recommendSubRoutines: List<RecommendSubRoutineUiModel> = emptyList(),
-) : Parcelable
+    val id: Long,
+    val name: String,
+    val level: RecommendLevel?,
+    val category: RecommendCategory?,
+    val subRoutines: List<RecommendSubRoutineUiModel>,
+)
 
-fun RecommendRoutine.toUiModel() =
+internal fun RecommendRoutine.toUiModel(): RecommendRoutineUiModel =
     RecommendRoutineUiModel(
         id = this.id,
         name = this.name,
         level = this.level,
-        recommendedRoutineType = this.recommendedRoutineType,
-        recommendSubRoutines = this.recommendSubRoutines.map { it.toUiModel() },
+        category = this.category,
+        subRoutines = this.subRoutines.map { it.toUiModel() },
     )
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendRoutinesUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendRoutinesUiModel.kt
@@ -1,18 +1,22 @@
 package com.threegap.bitnagil.presentation.recommendroutine.model
 
-import android.os.Parcelable
-import com.threegap.bitnagil.domain.recommendroutine.model.EmotionMarbleType
+import com.threegap.bitnagil.domain.emotion.model.EmotionMarbleType
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendRoutines
-import kotlinx.parcelize.Parcelize
 
-@Parcelize
 data class RecommendRoutinesUiModel(
-    val recommendRoutinesByCategory: Map<RecommendCategory, List<RecommendRoutineUiModel>> = emptyMap(),
-    val emotionMarbleType: EmotionMarbleType? = null,
-) : Parcelable
+    val recommendRoutinesByCategory: Map<RecommendCategory, List<RecommendRoutineUiModel>>,
+    val emotionMarbleType: EmotionMarbleType?,
+) {
+    companion object {
+        val INIT = RecommendRoutinesUiModel(
+            recommendRoutinesByCategory = emptyMap(),
+            emotionMarbleType = null,
+        )
+    }
+}
 
-fun RecommendRoutines.toUiModel() =
+internal fun RecommendRoutines.toUiModel(): RecommendRoutinesUiModel =
     RecommendRoutinesUiModel(
         recommendRoutinesByCategory = this.recommendRoutinesByCategory.mapValues { (_, routines) ->
             routines.map { it.toUiModel() }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendSubRoutineUiModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/model/RecommendSubRoutineUiModel.kt
@@ -1,16 +1,13 @@
 package com.threegap.bitnagil.presentation.recommendroutine.model
 
-import android.os.Parcelable
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendSubRoutine
-import kotlinx.parcelize.Parcelize
 
-@Parcelize
 data class RecommendSubRoutineUiModel(
-    val id: Long = 0,
-    val name: String = "",
-) : Parcelable
+    val id: Long,
+    val name: String,
+)
 
-fun RecommendSubRoutine.toUiModel() =
+internal fun RecommendSubRoutine.toUiModel(): RecommendSubRoutineUiModel =
     RecommendSubRoutineUiModel(
         id = this.id,
         name = this.name,
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
@@ -131,7 +131,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
         }
         getRecommendRoutineUseCase(recommendRoutineId).fold(
             onSuccess = { routine ->
-                oldSubRoutines = routine.recommendSubRoutines.map { SubRoutine.fromDomainRecommendSubRoutine(it) }
+                oldSubRoutines = routine.subRoutines.map { SubRoutine.fromDomainRecommendSubRoutine(it) }
 
                 reduce {
                     state.copy(
@@ -147,7 +147,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
                             oldSubRoutines.getOrNull(2)?.name ?: "",
                         ),
                         loading = false,
-                        recommendedRoutineType = routine.recommendedRoutineType.displayTitle,
+                        recommendedRoutineType = routine.category.displayTitle,
                     )
                 }
             },

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@ data class RoutineScheduleResponse(`
`12`	`12`
`13`	`13`	`fun RoutineScheduleResponse.toDomain(): RoutineSchedule =`
`14`	`14`	`RoutineSchedule(`
`15`		`- dailyRoutines = this.dailyRoutines.mapValues { (_, dailyRoutinesResponse) -> dailyRoutinesResponse.toDomain() }`
	`15`	`+ dailyRoutines = this.dailyRoutines.mapValues { (_, dailyRoutinesResponse) -> dailyRoutinesResponse.toDomain() },`
`16`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ data class RecommendRoutine(`
`6`	`6`	`val description: String,`
`7`	`7`	`val level: RecommendLevel,`
`8`	`8`	`val executionTime: String,`
`9`		`- val recommendedRoutineType: RecommendCategory,`
`10`		`- val recommendSubRoutines: List<RecommendSubRoutine>,`
	`9`	`+ val category: RecommendCategory,`
	`10`	`+ val subRoutines: List<RecommendSubRoutine>,`
`11`	`11`	`)`