Merge pull request #121 from YAPP-Github/fix/#120-write_routine_with_recommend_routine_type

[FIX/#120] 루틴 작성시 추천 루틴 타입 누락 추가

Author: l5x5l

data/src/main/java/com/threegap/bitnagil/data/writeroutine/model/request/RegisterRoutineRequest.kt

@@ -17,4 +17,6 @@ data class RegisterRoutineRequest(
     val executionTime: String,
     @SerialName("subRoutineName")
     val subRoutineName: List<String>,
+    @SerialName("recommendedRoutineType")
+    val recommendedRoutineType: String?,
 )

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

@@ -24,6 +24,7 @@ class WriteRoutineRepositoryImpl @Inject constructor(
         startDate: Date,
         endDate: Date,
         subRoutines: List<String>,
+        recommendedRoutineType: String?,
     ): Result<Unit> {
         val request = RegisterRoutineRequest(
             routineName = name,
@@ -32,6 +33,7 @@ class WriteRoutineRepositoryImpl @Inject constructor(
             routineStartDate = startDate.toFormattedString(),
             routineEndDate = endDate.toFormattedString(),
             subRoutineName = subRoutines,
+            recommendedRoutineType = recommendedRoutineType,
         )
         return writeRoutineDataSource.registerRoutine(request).also {
             if (it.isSuccess) {

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

@@ -15,6 +15,7 @@ interface WriteRoutineRepository {
         startDate: Date,
         endDate: Date,
         subRoutines: List<String>,
+        recommendedRoutineType: String?,
     ): Result<Unit>
 
     suspend fun editRoutine(

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

@@ -16,6 +16,7 @@ class RegisterRoutineUseCase @Inject constructor(
         startDate: Date,
         endDate: Date,
         subRoutines: List<String>,
+        recommendedRoutineType: String?,
     ): Result<Unit> {
         return writeRoutineRepository.registerRoutine(
             name = name,
@@ -24,6 +25,7 @@ class RegisterRoutineUseCase @Inject constructor(
             startDate = startDate,
             endDate = endDate,
             subRoutines = subRoutines,
+            recommendedRoutineType = recommendedRoutineType,
         )
     }
 }

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

@@ -93,6 +93,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
                             ),
                             startDate = Date.fromString(routine.startDate),
                             endDate = Date.fromString(routine.endDate),
+                            recommendedRoutineType = null,
                         ),
                     )
                 },
@@ -121,6 +122,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
                             ),
                             startDate = Date.now(),
                             endDate = Date.now(),
+                            recommendedRoutineType = routine.recommendedRoutineType.categoryName,
                         ),
                     )
                 },
@@ -134,7 +136,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
     override suspend fun SimpleSyntax<WriteRoutineState, WriteRoutineSideEffect>.reduceState(
         intent: WriteRoutineIntent,
         state: WriteRoutineState,
-    ): WriteRoutineState {
+    ): WriteRoutineState? {
         when (intent) {
             WriteRoutineIntent.SelectAllTime -> {
                 return state.copy(
@@ -221,9 +223,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
             WriteRoutineIntent.RegisterRoutineSuccess -> {
                 sendSideEffect(WriteRoutineSideEffect.MoveToPreviousScreen)
 
-                return state.copy(
-                    loading = false,
-                )
+                return null
             }
             WriteRoutineIntent.RegisterRoutineLoading -> {
                 return state.copy(
@@ -254,6 +254,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
                     endDate = intent.endDate,
                     subRoutineNames = intent.subRoutines,
                     loading = false,
+                    recommendedRoutineType = intent.recommendedRoutineType,
                 )
             }
 
@@ -449,6 +450,8 @@ class WriteRoutineViewModel @AssistedInject constructor(
         viewModelScope.launch {
             val currentState = stateFlow.value
 
+            if (currentState.loading) return@launch
+
             val startTime = currentState.startTime ?: return@launch
 
             val repeatDay = when (currentState.repeatType) {
@@ -483,6 +486,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
                         startDate = if (noRepeatRoutine) Date.now().toDomainDate() else currentState.startDate.toDomainDate(),
                         endDate = if (noRepeatRoutine) Date.now().toDomainDate() else currentState.endDate.toDomainDate(),
                         subRoutines = subRoutines,
+                        recommendedRoutineType = currentState.recommendedRoutineType,
                     )
 
                     if (registerRoutineResult.isSuccess) {

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

@@ -22,6 +22,7 @@ sealed class WriteRoutineIntent : MviIntent {
         val subRoutines: List<String>,
         val startDate: Date,
         val endDate: Date,
+        val recommendedRoutineType: String?,
     ) : WriteRoutineIntent()
     data object SelectAllTime : WriteRoutineIntent()
     data object ShowTimePickerBottomSheet : WriteRoutineIntent()

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

@@ -29,6 +29,7 @@ data class WriteRoutineState(
     val repeatDaysUiExpanded: Boolean,
     val periodUiExpanded: Boolean,
     val startTimeUiExpanded: Boolean,
+    val recommendedRoutineType: String?,
 ) : MviState {
     companion object {
         val Init = WriteRoutineState(
@@ -79,6 +80,7 @@ data class WriteRoutineState(
             startTimeUiExpanded = false,
             startDate = Date.now(),
             endDate = Date.now(),
+            recommendedRoutineType = null,
         )
     }