FIX: 루틴 작성/수정시 반복 요일을 설정하지 않아도 등록이 가능하도록 수정, 반복 요일을 등록하지 않을 시 startDate와 endDate를 모두 현재 날자로 서버에 전달하도록 수정

Author: l5x5l

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

@@ -77,9 +77,9 @@ fun WriteRoutineScreenContainer(
         DatePickerBottomSheet(
             modifier = Modifier.fillMaxWidth(),
             onDateSelected = viewModel::setStartDate,
-            date = state.startDate ?: state.endDate?.let { Date.min(it, Date.now()) } ?: Date.now(),
+            date = state.startDate,
             onDismiss = viewModel::hideStartDatePickerBottomSheet,
-            availableStartDate = null,
+            availableStartDate = Date.now(),
             availableEndDate = state.endDate,
         )
     }
@@ -88,7 +88,7 @@ fun WriteRoutineScreenContainer(
         DatePickerBottomSheet(
             modifier = Modifier.fillMaxWidth(),
             onDateSelected = viewModel::setEndDate,
-            date = state.endDate ?: state.startDate?.let { Date.max(it, Date.now()) } ?: Date.now(),
+            date = state.endDate,
             onDismiss = viewModel::hideEndDatePickerBottomSheet,
             availableStartDate = state.startDate,
             availableEndDate = null,
@@ -289,14 +289,14 @@ private fun WriteRoutineScreen(
                         RoutineDetailRow(
                             title = "시작일",
                             placeHolder = "눌러서 선택",
-                            value = state.startDate?.toFormattedString() ?: "",
+                            value = state.startDate.toFormattedString(),
                             onClick = showStartDatePickerBottomSheet,
                         )
 
                         RoutineDetailRow(
                             title = "종료일",
                             placeHolder = "눌러서 선택",
-                            value = state.endDate?.toFormattedString() ?: "",
+                            value = state.endDate.toFormattedString(),
                             onClick = showEndDatePickerBottomSheet,
                         )
                     }

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

@@ -457,20 +457,21 @@ class WriteRoutineViewModel @AssistedInject constructor(
                         .filter { it.selected }
                         .map { it.day.toRepeatDay() }
 
-                null -> return@launch
+                null -> listOf()
             }
 
             when (val writeRoutineType = currentState.writeRoutineType) {
                 WriteRoutineType.Add -> {
                     sendIntent(WriteRoutineIntent.RegisterRoutineLoading)
                     val subRoutines = if (currentState.selectNotUseSUbRoutines) emptyList() else currentState.subRoutineNames.filter { it.isNotEmpty() }
+                    val noRepeatRoutine = repeatDay.isEmpty()
 
                     val registerRoutineResult = registerRoutineUseCase(
                         name = currentState.routineName,
                         repeatDay = repeatDay,
                         startTime = startTime.toDomainTime(),
-                        startDate = currentState.startDate?.toDomainDate(),
-                        endDate = currentState.endDate?.toDomainDate(),
+                        startDate = if (noRepeatRoutine) Date.now().toDomainDate() else currentState.startDate.toDomainDate(),
+                        endDate = if (noRepeatRoutine) Date.now().toDomainDate() else currentState.endDate.toDomainDate(),
                         subRoutines = subRoutines,
                     )
 
@@ -496,8 +497,8 @@ class WriteRoutineViewModel @AssistedInject constructor(
                         name = currentState.routineName,
                         repeatDay = repeatDay,
                         startTime = startTime.toDomainTime(),
-                        startDate = currentState.startDate?.toDomainDate(),
-                        endDate = currentState.endDate?.toDomainDate(),
+                        startDate = currentState.startDate.toDomainDate(),
+                        endDate = currentState.endDate.toDomainDate(),
                         subRoutines = subRoutines,
                     )
 

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

@@ -17,8 +17,8 @@ data class WriteRoutineState(
     val repeatType: RepeatType?,
     val repeatDays: List<SelectableDay>,
     val startTime: Time?,
-    val startDate: Date?,
-    val endDate: Date?,
+    val startDate: Date,
+    val endDate: Date,
     val selectAllTime: Boolean,
     val loading: Boolean,
     val showTimePickerBottomSheet: Boolean,
@@ -77,28 +77,25 @@ data class WriteRoutineState(
             repeatDaysUiExpanded = false,
             periodUiExpanded = false,
             startTimeUiExpanded = false,
-            startDate = null,
-            endDate = null,
+            startDate = Date.now(),
+            endDate = Date.now(),
         )
     }
 
     val registerButtonEnabled: Boolean
-        get() = routineName.isNotEmpty() &&
-            (repeatType == RepeatType.DAILY || (repeatType == RepeatType.DAY && repeatDays.any { it.selected })) &&
-            startTime != null && !loading
+        get() = routineName.isNotEmpty() && startTime != null && !loading
 
     val subRoutinesText: String get() = subRoutineNames.filter { it.isNotEmpty() }.joinToString(separator = "\n")
 
     val repeatDaysText: String
         get() = when (repeatType) {
             RepeatType.DAILY -> "매일"
-            RepeatType.DAY -> "매주 ${repeatDays.filter { it.selected }.joinToString { it.day.text }}"
+            RepeatType.DAY -> if (repeatDays.none { it.selected }) "반복 안함" else "매주 ${repeatDays.filter { it.selected }.joinToString { it.day.text }}"
             null -> ""
         }
 
     val periodText: String get() {
-        if (startDate == null && endDate == null) return ""
-        return "${startDate?.toYearShrinkageFormattedString() ?: ""} ~ ${endDate?.toYearShrinkageFormattedString() ?: ""}"
+        return "${startDate.toYearShrinkageFormattedString()} ~ ${endDate.toYearShrinkageFormattedString()}"
     }
 
     val startTimeText: String