FIX: 누락된 Serialize 의존성 추가, 일부 클래스 생성시 인자 유효성 검증 추가, 일부 클래스 오타 수정

Author: l5x5l

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

@@ -21,16 +21,25 @@ data class RoutineDto(
     val subRoutineInfos: List<SubRoutineDto>,
 ) {
     fun toRoutine(): Routine {
+        val dividedTimeStrings = executionTime.split(":")
+        require(dividedTimeStrings.size >= 2) { "Invalid time format: $executionTime Expected format: HH:mm / HH:mm:ss" }
+
         val startTime = Time(
-            hour = executionTime.split(":")[0].toInt(),
-            minute = executionTime.split(":")[1].toInt(),
+            hour = dividedTimeStrings[0].toIntOrNull() ?: throw IllegalArgumentException("Invalid hour: ${dividedTimeStrings[0]}"),
+            minute = dividedTimeStrings[1].toIntOrNull() ?: throw IllegalArgumentException("Invalid minute: ${dividedTimeStrings[1]}"),
         )
 
         return Routine(
             id = routineId,
             name = routineName,
             subRoutines = subRoutineInfos.map { it.toSubRoutine() },
-            repeatDays = repeatDay.map { RepeatDay.valueOf(it) },
+            repeatDays = repeatDay.mapNotNull {
+                try {
+                    RepeatDay.valueOf(it)
+                } catch (e: IllegalArgumentException) {
+                    null
+                }
+            },
             startTime = startTime,
             endDate = Date(
                 year = 2099,

domain/src/main/java/com/threegap/bitnagil/domain/writeroutine/model/Date.kt

@@ -4,4 +4,10 @@ data class Date(
     val year: Int,
     val month: Int,
     val day: Int,
-)
+) {
+    init {
+        require(year in 1970..2099) { "Year must be in range 1970..2099, but was $year" }
+        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" }
+    }
+}

domain/src/main/java/com/threegap/bitnagil/domain/writeroutine/model/Time.kt

@@ -3,4 +3,13 @@ package com.threegap.bitnagil.domain.writeroutine.model
 data class Time(
     val hour: Int,
     val minute: Int,
-)
+) {
+    init {
+        require(hour in 0..23) { "Hour must be in range 0..23, but was $hour" }
+        require(minute in 0..59) { "Minute must be in range 0..59, but was $minute" }
+    }
+
+    override fun toString(): String {
+        return "%02d:%02d".format(hour, minute)
+    }
+}

…riteroutine/usecase/EditRoutineUseCse.kt …iteroutine/usecase/EditRoutineUseCase.ktdomain/src/main/java/com/threegap/bitnagil/domain/writeroutine/usecase/EditRoutineUseCse.kt renamed to domain/src/main/java/com/threegap/bitnagil/domain/writeroutine/usecase/EditRoutineUseCase.kt domain/src/main/java/com/threegap/bitnagil/domain/writeroutine/usecase/EditRoutineUseCse.kt renamed to domain/src/main/java/com/threegap/bitnagil/domain/writeroutine/usecase/EditRoutineUseCase.kt

@@ -6,7 +6,7 @@ import com.threegap.bitnagil.domain.writeroutine.model.Time
 import com.threegap.bitnagil.domain.writeroutine.repository.WriteRoutineRepository
 import javax.inject.Inject
 
-class EditRoutineUseCse @Inject constructor(
+class EditRoutineUseCase @Inject constructor(
     private val writeRoutineRepository: WriteRoutineRepository,
 ) {
     suspend operator fun invoke(

presentation/build.gradle.kts

@@ -17,6 +17,7 @@ dependencies {
     implementation(libs.bundles.androidx.core)
     implementation(libs.bundles.orbit)
     implementation(libs.kakao.v2.user)
+    implementation(libs.kotlinx.serialization.json)
 
     testImplementation(libs.junit)
     testImplementation(libs.kotlin.coroutines.test)

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineScreen.kt

@@ -34,7 +34,7 @@ import com.threegap.bitnagil.presentation.writeroutine.component.atom.strokebutt
 import com.threegap.bitnagil.presentation.writeroutine.component.atom.textbutton.TextButton
 import com.threegap.bitnagil.presentation.writeroutine.component.atom.tooltipbutton.TooltipButton
 import com.threegap.bitnagil.presentation.writeroutine.component.block.labeledcheckbox.LabeledCheckBox
-import com.threegap.bitnagil.presentation.writeroutine.component.template.TImePickerBottomSheet
+import com.threegap.bitnagil.presentation.writeroutine.component.template.TimePickerBottomSheet
 import com.threegap.bitnagil.presentation.writeroutine.model.Day
 import com.threegap.bitnagil.presentation.writeroutine.model.RepeatType
 import com.threegap.bitnagil.presentation.writeroutine.model.SelectableDay
@@ -59,7 +59,7 @@ fun WriteRoutineScreenContainer(
     }
 
     if (state.showTimePickerBottomSheet) {
-        TImePickerBottomSheet(
+        TimePickerBottomSheet(
             modifier = Modifier.fillMaxWidth(),
             onTimeSelected = viewModel::setStartTime,
             hour = state.startTime?.hour ?: Time.Init.hour,

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineViewModel.kt

@@ -3,7 +3,7 @@ package com.threegap.bitnagil.presentation.writeroutine
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.toRoute
-import com.threegap.bitnagil.domain.writeroutine.usecase.EditRoutineUseCse
+import com.threegap.bitnagil.domain.writeroutine.usecase.EditRoutineUseCase
 import com.threegap.bitnagil.domain.writeroutine.usecase.GetChangedSubRoutinesUseCase
 import com.threegap.bitnagil.domain.writeroutine.usecase.GetRoutineUseCase
 import com.threegap.bitnagil.domain.writeroutine.usecase.RegisterRoutineUseCase
@@ -29,7 +29,7 @@ class WriteRoutineViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val getChangedSubRoutinesUseCase: GetChangedSubRoutinesUseCase,
     private val registerRoutineUseCase: RegisterRoutineUseCase,
-    private val editRoutineUseCase: EditRoutineUseCse,
+    private val editRoutineUseCase: EditRoutineUseCase,
     private val getRoutineUseCase: GetRoutineUseCase,
 ) : MviViewModel<WriteRoutineState, WriteRoutineSideEffect, WriteRoutineIntent>(
     initState = WriteRoutineState.Init,

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/atom/namefield/NameField.kt

@@ -17,7 +17,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.threegap.bitnagil.designsystem.BitnagilTheme
 
@@ -60,8 +59,8 @@ fun NameField(
                     ) {
                         Icon(
                             imageVector = Icons.Default.Close,
-                            contentDescription = "텍스트 전체 삭제",
-                            tint = Color.Gray,
+                            contentDescription = "제거",
+                            tint = BitnagilTheme.colors.coolGray80,
                         )
                     }
                 }

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/component/template/TimePickerBottomSheet.kt

@@ -25,7 +25,7 @@ import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun TImePickerBottomSheet(
+fun TimePickerBottomSheet(
     modifier: Modifier = Modifier,
     onTimeSelected: (Int, Int) -> Unit,
     hour: Int,

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/RepeatType.kt

@@ -1,5 +1,9 @@
 package com.threegap.bitnagil.presentation.writeroutine.model
 
-enum class RepeatType {
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+enum class RepeatType : Parcelable {
     DAILY, DAY
 }