Refactor: 포멧로직 ui 계층 책임 이전

Author: wjdrjs00

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

@@ -1,9 +1,5 @@
 package com.threegap.bitnagil.domain.routine.model
 
-import java.time.LocalTime
-import java.time.format.DateTimeFormatter
-import java.util.Locale
-
 data class Routine(
     val routineId: String,
     val routineName: String,
@@ -14,19 +10,4 @@ data class Routine(
     val subRoutineNames: List<String>,
     val subRoutineCompleteYn: List<Boolean>,
     val recommendedRoutineType: RecommendedRoutineType?,
-) {
-    private val koreanLocale = Locale.KOREAN
-    private val executionTimeFormatter12 = DateTimeFormatter.ofPattern("a h:mm", koreanLocale)
-
-    val formattedExecutionTime: String =
-        try {
-            val time = LocalTime.parse(executionTime)
-            if (time == LocalTime.MIDNIGHT) {
-                "하루종일"
-            } else {
-                time.format(executionTimeFormatter12)
-            }
-        } catch (e: Exception) {
-            "시간 미정"
-        }
-}
+)

presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/RoutineSection.kt

@@ -12,7 +12,7 @@ import androidx.compose.ui.unit.dp
 import com.threegap.bitnagil.designsystem.BitnagilTheme
 import com.threegap.bitnagil.presentation.home.component.block.RoutineItem
 import com.threegap.bitnagil.presentation.home.model.RoutineUiModel
-import com.threegap.bitnagil.presentation.home.util.formatExecutionTime
+import com.threegap.bitnagil.presentation.home.util.formatExecutionTime24Hour
 
 @Composable
 fun RoutineSection(
@@ -26,7 +26,7 @@ fun RoutineSection(
         horizontalArrangement = Arrangement.spacedBy(8.dp),
     ) {
         Text(
-            text = routine.executionTime.formatExecutionTime(),
+            text = routine.executionTime.formatExecutionTime24Hour(),
             style = BitnagilTheme.typography.body2Medium,
             color = BitnagilTheme.colors.coolGray10,
             modifier = Modifier.defaultMinSize(minWidth = 42.dp),

presentation/src/main/java/com/threegap/bitnagil/presentation/home/util/LocalDateExtension.kt

@@ -9,6 +9,7 @@ import java.util.Locale
 
 private val koreanLocale = Locale.KOREAN
 private val monthYearFormatter = DateTimeFormatter.ofPattern("yyyy년 M월", koreanLocale)
+private val executionTimeFormatter12 = DateTimeFormatter.ofPattern("a h:mm", koreanLocale)
 private val executionTimeFormatter24 = DateTimeFormatter.ofPattern("HH:mm", koreanLocale)
 
 fun LocalDate.getCurrentWeekDays(): List<LocalDate> =
@@ -23,7 +24,7 @@ fun LocalDate.formatDayOfWeekShort(): String =
 fun LocalDate.formatDayOfMonth(): String =
     this.dayOfMonth.toString()
 
-fun String.formatExecutionTime(): String =
+fun String.formatExecutionTime24Hour(): String =
     try {
         val time = LocalTime.parse(this)
         if (time == LocalTime.MIDNIGHT) {
@@ -34,3 +35,15 @@ fun String.formatExecutionTime(): String =
     } catch (e: Exception) {
         "시간 미정"
     }
+
+fun String.formatExecutionTime12Hour(): String =
+    try {
+        val time = LocalTime.parse(this)
+        if (time == LocalTime.MIDNIGHT) {
+            "하루종일"
+        } else {
+            time.format(executionTimeFormatter12)
+        }
+    } catch (e: Exception) {
+        "시간 미정"
+    }

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

@@ -8,6 +8,7 @@ import com.threegap.bitnagil.designsystem.R
 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.presentation.home.util.formatExecutionTime12Hour
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -26,7 +27,7 @@ fun Routine.toUiModel(): RoutineUiModel =
         routineId = this.routineId,
         routineName = this.routineName,
         repeatDay = this.repeatDay,
-        executionTime = this.formattedExecutionTime,
+        executionTime = this.executionTime.formatExecutionTime12Hour(),
         routineDate = this.routineDate,
         subRoutineNames = this.subRoutineNames,
         recommendedRoutineType = this.recommendedRoutineType,