FIX: 루틴 수정/작성 useCase와 repository에서 시작/종료일자를 nullable하지 않도록 수정, 날자 선택 바텀시트에서 월을 변경해도 초기 달력이 항상 유지되던 문제 수정

Author: l5x5l

data/src/main/java/com/threegap/bitnagil/data/writeroutine/repositoryImpl/WriteRoutineRepositoryImpl.kt

@@ -21,16 +21,16 @@ class WriteRoutineRepositoryImpl @Inject constructor(
         name: String,
         repeatDay: List<RepeatDay>,
         startTime: Time,
-        startDate: Date?,
-        endDate: Date?,
+        startDate: Date,
+        endDate: Date,
         subRoutines: List<String>,
     ): Result<Unit> {
         val request = RegisterRoutineRequest(
             routineName = name,
             repeatDay = repeatDay.map { it.fullName },
             executionTime = startTime.toFormattedString(),
-            routineStartDate = startDate?.toFormattedString(),
-            routineEndDate = endDate?.toFormattedString(),
+            routineStartDate = startDate.toFormattedString(),
+            routineEndDate = endDate.toFormattedString(),
             subRoutineName = subRoutines,
         )
         return writeRoutineDataSource.registerRoutine(request).also {
@@ -46,8 +46,8 @@ class WriteRoutineRepositoryImpl @Inject constructor(
         name: String,
         repeatDay: List<RepeatDay>,
         startTime: Time,
-        startDate: Date?,
-        endDate: Date?,
+        startDate: Date,
+        endDate: Date,
         subRoutines: List<String>,
     ): Result<Unit> {
         val request = EditRoutineRequest(
@@ -56,8 +56,8 @@ class WriteRoutineRepositoryImpl @Inject constructor(
             routineName = name,
             repeatDay = repeatDay.map { it.fullName },
             executionTime = startTime.toFormattedString(),
-            routineStartDate = startDate?.toFormattedString(),
-            routineEndDate = endDate?.toFormattedString(),
+            routineStartDate = startDate.toFormattedString(),
+            routineEndDate = endDate.toFormattedString(),
             subRoutineName = subRoutines,
         )
 

domain/src/main/java/com/threegap/bitnagil/domain/writeroutine/repository/WriteRoutineRepository.kt

@@ -12,8 +12,8 @@ interface WriteRoutineRepository {
         name: String,
         repeatDay: List<RepeatDay>,
         startTime: Time,
-        startDate: Date?,
-        endDate: Date?,
+        startDate: Date,
+        endDate: Date,
         subRoutines: List<String>,
     ): Result<Unit>
 
@@ -23,8 +23,8 @@ interface WriteRoutineRepository {
         name: String,
         repeatDay: List<RepeatDay>,
         startTime: Time,
-        startDate: Date?,
-        endDate: Date?,
+        startDate: Date,
+        endDate: Date,
         subRoutines: List<String>,
     ): Result<Unit>
 

domain/src/main/java/com/threegap/bitnagil/domain/writeroutine/usecase/EditRoutineUseCase.kt

@@ -16,8 +16,8 @@ class EditRoutineUseCase @Inject constructor(
         name: String,
         repeatDay: List<RepeatDay>,
         startTime: Time,
-        startDate: Date?,
-        endDate: Date?,
+        startDate: Date,
+        endDate: Date,
         subRoutines: List<String>,
     ): Result<Unit> {
         return writeRoutineRepository.editRoutine(

domain/src/main/java/com/threegap/bitnagil/domain/writeroutine/usecase/RegisterRoutineUseCase.kt

@@ -13,8 +13,8 @@ class RegisterRoutineUseCase @Inject constructor(
         name: String,
         repeatDay: List<RepeatDay>,
         startTime: Time,
-        startDate: Date?,
-        endDate: Date?,
+        startDate: Date,
+        endDate: Date,
         subRoutines: List<String>,
     ): Result<Unit> {
         return writeRoutineRepository.registerRoutine(

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

@@ -95,14 +95,14 @@ private fun DatePickerBottomSheetContent(
     var currentMonth by remember { mutableIntStateOf(initDate.month) }
     var selectedDate by remember { mutableStateOf(initDate) }
 
-    val lastDaysOfPrevMonth = remember(initDate) {
-        CalendarUtils.lastDaysOfPrevMonth(initDate.year, initDate.month)
+    val lastDaysOfPrevMonth = remember(currentYear, currentMonth) {
+        CalendarUtils.lastDaysOfPrevMonth(currentYear, currentMonth)
     }
     val firstDaysOfNextMonth = remember(currentYear, currentMonth) {
-        CalendarUtils.firstDaysOfNextMonth(initDate.year, initDate.month)
+        CalendarUtils.firstDaysOfNextMonth(currentYear, currentMonth)
     }
     val currentDaysOfMonth = remember(currentYear, currentMonth) {
-        CalendarUtils.getDayAmountOfMonth(initDate.year, initDate.month)
+        CalendarUtils.getDayAmountOfMonth(currentYear, currentMonth)
     }
 
     val prevMonthButtonEnabled by remember(availableStartDate) {