Refactor: RecommendCategory enum 직렬화 및 관련 로직 변경

wjdrjs00 · wjdrjs00 · commit f6df1dfe8891 · 2026-02-05T15:46:47.000+09:00
diff --git a/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/model/response/RecommendRoutinesDto.kt b/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/model/response/RecommendRoutinesDto.kt
@@ -9,15 +9,15 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class RecommendRoutinesDto(
     @SerialName("recommendedRoutines")
-    val recommendedRoutinesByCategory: Map<String, List<RecommendedRoutineDto>>,
+    val recommendedRoutinesByCategory: Map<RecommendCategory, List<RecommendedRoutineDto>>,
     @SerialName("emotionMarbleType")
     val emotionMarbleType: EmotionMarbleType?,
 )
 
 fun RecommendRoutinesDto.toDomain(): RecommendRoutines =
     RecommendRoutines(
-        recommendRoutinesByCategory = this.recommendedRoutinesByCategory.map { (categoryString, routines) ->
-            RecommendCategory.fromString(categoryString) to routines.map { it.toDomain() }
+        recommendRoutinesByCategory = this.recommendedRoutinesByCategory.map { (category, routines) ->
+            category to routines.map { it.toDomain() }
         }.toMap(),
         emotionMarbleType = this.emotionMarbleType,
     )
diff --git a/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/model/response/RecommendedRoutineDto.kt b/data/src/main/java/com/threegap/bitnagil/data/recommendroutine/model/response/RecommendedRoutineDto.kt
@@ -19,7 +19,7 @@ data class RecommendedRoutineDto(
     @SerialName("executionTime")
     val executionTime: String,
     @SerialName("recommendedRoutineType")
-    val recommendedRoutineType: String,
+    val recommendedRoutineType: RecommendCategory,
     @SerialName("recommendedSubRoutineSearchResult")
     val recommendedSubRoutineSearchResult: List<RecommendedSubRoutineDto>,
 )
@@ -31,6 +31,6 @@ fun RecommendedRoutineDto.toDomain(): RecommendRoutine =
         description = this.recommendedRoutineDescription,
         level = this.recommendedRoutineLevel,
         executionTime = this.executionTime,
-        recommendedRoutineType = RecommendCategory.fromString(recommendedRoutineType),
+        recommendedRoutineType = this.recommendedRoutineType,
         recommendSubRoutines = this.recommendedSubRoutineSearchResult.map { it.toDomain() },
     )
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/recommendroutine/model/RecommendCategory.kt b/domain/src/main/java/com/threegap/bitnagil/domain/recommendroutine/model/RecommendCategory.kt
@@ -1,22 +1,16 @@
 package com.threegap.bitnagil.domain.recommendroutine.model
 
-enum class RecommendCategory(
-    val categoryName: String,
-    val displayName: String,
-    val isVisible: Boolean = true,
-) {
-    PERSONALIZED("PERSONALIZED", "맞춤 추천"),
-    OUTING("OUTING", "나가봐요"),
-    WAKE_UP("WAKE_UP", "일어나요"),
-    CONNECT("CONNECT", "연결해요"),
-    REST("REST", "쉬어가요"),
-    GROW("GROW", "성장해요"),
-    OUTING_REPORT("OUTING_REPORT", "신고", isVisible = false),
-    UNKNOWN("UNKNOWN", "알 수 없음", isVisible = false),
-    ;
+import kotlinx.serialization.Serializable
 
-    companion object {
-        fun fromString(categoryName: String): RecommendCategory =
-            entries.find { it.categoryName == categoryName } ?: UNKNOWN
-    }
+@Serializable
+enum class RecommendCategory {
+    PERSONALIZED,
+    OUTING,
+    WAKE_UP,
+    CONNECT,
+    REST,
+    GROW,
+    OUTING_REPORT,
+    UNKNOWN,
+    ;
 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/RecommendCategoryEtx.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/common/extension/RecommendCategoryEtx.kt
@@ -0,0 +1,51 @@
+package com.threegap.bitnagil.presentation.common.extension
+
+import androidx.annotation.DrawableRes
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import com.threegap.bitnagil.designsystem.BitnagilTheme
+import com.threegap.bitnagil.designsystem.R
+import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
+
+val RecommendCategory.displayColor: Color
+    @Composable get() = when (this) {
+        RecommendCategory.OUTING -> BitnagilTheme.colors.skyBlue10
+        RecommendCategory.WAKE_UP -> BitnagilTheme.colors.orange25
+        RecommendCategory.CONNECT -> BitnagilTheme.colors.purple10
+        RecommendCategory.REST -> BitnagilTheme.colors.green10
+        RecommendCategory.GROW -> BitnagilTheme.colors.pink10
+        RecommendCategory.PERSONALIZED -> BitnagilTheme.colors.yellow10
+        RecommendCategory.OUTING_REPORT -> BitnagilTheme.colors.yellow10
+        RecommendCategory.UNKNOWN -> BitnagilTheme.colors.yellow10
+    }
+
+val RecommendCategory.displayIcon: Int
+    @DrawableRes get() = when (this) {
+        RecommendCategory.OUTING -> R.drawable.ic_outside
+        RecommendCategory.WAKE_UP -> R.drawable.ic_wakeup
+        RecommendCategory.CONNECT -> R.drawable.ic_connect
+        RecommendCategory.REST -> R.drawable.ic_rest
+        RecommendCategory.GROW -> R.drawable.ic_grow
+        RecommendCategory.PERSONALIZED -> R.drawable.ic_shine
+        RecommendCategory.OUTING_REPORT -> R.drawable.ic_shine
+        RecommendCategory.UNKNOWN -> R.drawable.ic_shine
+    }
+
+val RecommendCategory.displayTitle: String
+    get() = when (this) {
+        RecommendCategory.PERSONALIZED -> "맞춤 추천"
+        RecommendCategory.OUTING -> "나가봐요"
+        RecommendCategory.WAKE_UP -> "일어나요"
+        RecommendCategory.CONNECT -> "연결해요"
+        RecommendCategory.REST -> "쉬어가요"
+        RecommendCategory.GROW -> "성장해요"
+        RecommendCategory.OUTING_REPORT -> "신고"
+        RecommendCategory.UNKNOWN -> "알 수 없음"
+    }
+
+val RecommendCategory.isVisible: Boolean
+    get() = when (this) {
+        RecommendCategory.OUTING_REPORT -> false
+        RecommendCategory.UNKNOWN -> false
+        else -> true
+    }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/RecommendRoutineScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/recommendroutine/RecommendRoutineScreen.kt
@@ -33,6 +33,8 @@ import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar
 import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
 import com.threegap.bitnagil.presentation.common.extension.displayLevel
+import com.threegap.bitnagil.presentation.common.extension.displayTitle
+import com.threegap.bitnagil.presentation.common.extension.isVisible
 import com.threegap.bitnagil.presentation.recommendroutine.component.atom.RecommendCategoryChip
 import com.threegap.bitnagil.presentation.recommendroutine.component.block.EmotionRecommendRoutineButton
 import com.threegap.bitnagil.presentation.recommendroutine.component.block.RecommendRoutineItem
@@ -110,7 +112,7 @@ private fun RecommendRoutineScreen(
                 key = { it.name },
             ) { category ->
                 RecommendCategoryChip(
-                    categoryName = category.displayName,
+                    categoryName = category.displayTitle,
                     isSelected = uiState.selectedCategory == category,
                     onCategorySelected = {
                         onCategorySelected(category)
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
@@ -22,6 +22,8 @@ import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon
 import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel
+import com.threegap.bitnagil.presentation.common.extension.displayColor
+import com.threegap.bitnagil.presentation.common.extension.displayIcon
 import com.threegap.bitnagil.presentation.recommendroutine.model.RecommendRoutineUiModel
 import com.threegap.bitnagil.presentation.recommendroutine.model.RecommendSubRoutineUiModel
 
@@ -47,11 +49,11 @@ fun RecommendRoutineItem(
             verticalAlignment = Alignment.CenterVertically,
         ) {
             BitnagilIcon(
-                id = routine.icon,
+                id = routine.recommendedRoutineType?.displayIcon ?: R.drawable.ic_shine,
                 tint = null,
                 modifier = Modifier
                     .background(
-                        color = routine.color,
+                        color = routine.recommendedRoutineType?.displayColor ?: BitnagilTheme.colors.yellow10,
                         shape = RoundedCornerShape(4.dp),
                     )
                     .padding(4.dp),
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,10 +1,6 @@
 package com.threegap.bitnagil.presentation.recommendroutine.model
 
 import android.os.Parcelable
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import com.threegap.bitnagil.designsystem.BitnagilTheme
-import com.threegap.bitnagil.designsystem.R
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendLevel
 import com.threegap.bitnagil.domain.recommendroutine.model.RecommendRoutine
@@ -17,13 +13,7 @@ data class RecommendRoutineUiModel(
     val level: RecommendLevel? = null,
     val recommendedRoutineType: RecommendCategory? = null,
     val recommendSubRoutines: List<RecommendSubRoutineUiModel> = emptyList(),
-) : Parcelable {
-    val icon: Int
-        get() = recommendedRoutineType?.getIcon() ?: R.drawable.ic_shine
-
-    val color: Color
-        @Composable get() = recommendedRoutineType?.getColor() ?: BitnagilTheme.colors.yellow10
-}
+) : Parcelable
 
 fun RecommendRoutine.toUiModel() =
     RecommendRoutineUiModel(
@@ -33,28 +23,3 @@ fun RecommendRoutine.toUiModel() =
         recommendedRoutineType = this.recommendedRoutineType,
         recommendSubRoutines = this.recommendSubRoutines.map { it.toUiModel() },
     )
-
-private fun RecommendCategory.getIcon(): Int =
-    when (this) {
-        RecommendCategory.OUTING -> R.drawable.ic_outside
-        RecommendCategory.WAKE_UP -> R.drawable.ic_wakeup
-        RecommendCategory.CONNECT -> R.drawable.ic_connect
-        RecommendCategory.REST -> R.drawable.ic_rest
-        RecommendCategory.GROW -> R.drawable.ic_grow
-        RecommendCategory.PERSONALIZED -> R.drawable.ic_shine
-        RecommendCategory.OUTING_REPORT -> R.drawable.ic_shine
-        RecommendCategory.UNKNOWN -> R.drawable.ic_shine
-    }
-
-@Composable
-private fun RecommendCategory.getColor(): Color =
-    when (this) {
-        RecommendCategory.OUTING -> BitnagilTheme.colors.skyBlue10
-        RecommendCategory.WAKE_UP -> BitnagilTheme.colors.orange25
-        RecommendCategory.CONNECT -> BitnagilTheme.colors.purple10
-        RecommendCategory.REST -> BitnagilTheme.colors.green10
-        RecommendCategory.GROW -> BitnagilTheme.colors.pink10
-        RecommendCategory.PERSONALIZED -> BitnagilTheme.colors.yellow10
-        RecommendCategory.OUTING_REPORT -> BitnagilTheme.colors.yellow10
-        RecommendCategory.UNKNOWN -> BitnagilTheme.colors.yellow10
-    }
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
@@ -8,6 +8,7 @@ import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay
 import com.threegap.bitnagil.domain.writeroutine.model.RoutineUpdateType
 import com.threegap.bitnagil.domain.writeroutine.usecase.EditRoutineUseCase
 import com.threegap.bitnagil.domain.writeroutine.usecase.RegisterRoutineUseCase
+import com.threegap.bitnagil.presentation.common.extension.displayTitle
 import com.threegap.bitnagil.presentation.writeroutine.model.Date
 import com.threegap.bitnagil.presentation.writeroutine.model.Day
 import com.threegap.bitnagil.presentation.writeroutine.model.RepeatType
@@ -146,7 +147,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
                             oldSubRoutines.getOrNull(2)?.name ?: "",
                         ),
                         loading = false,
-                        recommendedRoutineType = routine.recommendedRoutineType.categoryName,
+                        recommendedRoutineType = routine.recommendedRoutineType.displayTitle,
                     )
                 }
             },
