Chore: DayRoutines -> DailyRoutines 네이밍 변경

Author: wjdrjs00

data/src/main/java/com/threegap/bitnagil/data/routine/model/response/DayRoutinesDto.kt

@@ -1,6 +1,6 @@
 package com.threegap.bitnagil.data.routine.model.response
 
-import com.threegap.bitnagil.domain.routine.model.DayRoutines
+import com.threegap.bitnagil.domain.routine.model.DailyRoutines
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -12,8 +12,8 @@ data class DayRoutinesDto(
     val allCompleted: Boolean,
 )
 
-fun DayRoutinesDto.toDomain(): DayRoutines =
-    DayRoutines(
+fun DayRoutinesDto.toDomain(): DailyRoutines =
+    DailyRoutines(
         routines = routineList.map { it.toDomain() },
         isAllCompleted = allCompleted,
     )

data/src/main/java/com/threegap/bitnagil/data/routine/model/response/RoutineDto.kt

@@ -43,7 +43,7 @@ fun RoutineDto.toDomain(): Routine =
         routineDate = this.routineDate,
         isCompleted = this.routineCompleteYn,
         subRoutineNames = this.subRoutineNames,
-        subRoutineIsCompleted = this.subRoutineCompleteYn,
+        subRoutineCompletionStates = this.subRoutineCompleteYn,
         recommendedRoutineType = RecommendedRoutineType.fromString(this.recommendedRoutineType),
         isDeleted = routineDeletedYn,
         startDate = this.routineStartDate,

…agil/domain/routine/model/DayRoutines.kt …il/domain/routine/model/DailyRoutines.ktdomain/src/main/java/com/threegap/bitnagil/domain/routine/model/DayRoutines.kt renamed to domain/src/main/java/com/threegap/bitnagil/domain/routine/model/DailyRoutines.kt domain/src/main/java/com/threegap/bitnagil/domain/routine/model/DayRoutines.kt renamed to domain/src/main/java/com/threegap/bitnagil/domain/routine/model/DailyRoutines.kt

@@ -7,7 +7,7 @@ package com.threegap.bitnagil.domain.routine.model
  * @property routines 해당 날짜에 포함된 [Routine](개별 루틴)의 목록.
  * @property isAllCompleted 해당 날짜의 모든 루틴이 완료되었는지 여부.
  */
-data class DayRoutines(
+data class DailyRoutines(
     val routines: List<Routine>,
     val isAllCompleted: Boolean,
 )

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

@@ -11,6 +11,6 @@ data class Routine(
     val isCompleted: Boolean,
     val isDeleted: Boolean,
     val subRoutineNames: List<String>,
-    val subRoutineIsCompleted: List<Boolean>,
+    val subRoutineCompletionStates: List<Boolean>,
     val recommendedRoutineType: RecommendedRoutineType?,
 )

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

@@ -4,8 +4,8 @@ package com.threegap.bitnagil.domain.routine.model
  * 특정 기간(예: 주간, 월간) 동안의 루틴 일정표.
  *
  * @property dailyRoutines 날짜(String, "YYYY-MM-DD")를 key로,
- * 해당 날짜의 루틴 정보([DayRoutines])를  value로 가지는 Map.
+ * 해당 날짜의 루틴 정보([DailyRoutines])를  value로 가지는 Map.
  */
 data class RoutineSchedule(
-    val dailyRoutines: Map<String, DayRoutines>,
+    val dailyRoutines: Map<String, DailyRoutines>,
 )

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

@@ -37,7 +37,7 @@ fun RoutineSection(
             name = routine.name,
             isCompleted = routine.isCompleted,
             subRoutineNames = routine.subRoutineNames,
-            subRoutineIsCompleted = routine.subRoutineIsCompleted,
+            subRoutineIsCompleted = routine.subRoutineCompletionStates,
             onRoutineToggle = onRoutineToggle,
             onSubRoutineToggle = onSubRoutineToggle,
             modifier = Modifier.fillMaxWidth(),
@@ -57,10 +57,10 @@ private fun RoutineSectionPreview() {
             routineDate = "2023-10-27",
             isCompleted = false,
             subRoutineNames = listOf("Make bed", "Brush teeth", "Meditate"),
-            subRoutineIsCompleted = listOf(true, false, false),
-            recommendedRoutineType = null
+            subRoutineCompletionStates = listOf(true, false, false),
+            recommendedRoutineType = null,
         ),
         onRoutineToggle = {},
-        onSubRoutineToggle = {}
+        onSubRoutineToggle = {},
     )
 }

…ntation/home/model/DayRoutinesUiModel.kt …ation/home/model/DailyRoutinesUiModel.ktpresentation/src/main/java/com/threegap/bitnagil/presentation/home/model/DayRoutinesUiModel.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/DailyRoutinesUiModel.kt presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/DayRoutinesUiModel.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/DailyRoutinesUiModel.kt

@@ -1,17 +1,17 @@
 package com.threegap.bitnagil.presentation.home.model
 
 import android.os.Parcelable
-import com.threegap.bitnagil.domain.routine.model.DayRoutines
+import com.threegap.bitnagil.domain.routine.model.DailyRoutines
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class DayRoutinesUiModel(
+data class DailyRoutinesUiModel(
     val routines: List<RoutineUiModel> = emptyList(),
     val isAllCompleted: Boolean = false,
 ) : Parcelable
 
-fun DayRoutines.toUiModel(): DayRoutinesUiModel =
-    DayRoutinesUiModel(
+fun DailyRoutines.toUiModel(): DailyRoutinesUiModel =
+    DailyRoutinesUiModel(
         routines = routines.map { it.toUiModel() },
         isAllCompleted = isAllCompleted,
     )

presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/HomeIntent.kt

@@ -9,8 +9,8 @@ sealed class HomeIntent : MviIntent {
     data class LoadTodayEmotion(val emotion: TodayEmotionUiModel?) : HomeIntent()
     data class LoadWeeklyRoutines(val routines: RoutineScheduleUiModel) : HomeIntent()
     data class OnDateSelect(val date: LocalDate) : HomeIntent()
-    data class OnRoutineCompletionToggle(val routineId: String) : HomeIntent()
-    data class OnSubRoutineCompletionToggle(val routineId: String, val subRoutineIndex: Int) : HomeIntent()
+    data class ToggleRoutine(val routineId: String) : HomeIntent()
+    data class ToggleSubRoutine(val routineId: String, val subRoutineIndex: Int) : HomeIntent()
     data object RoutineToggleCompletionFailure : HomeIntent()
     data object OnHelpClick : HomeIntent()
     data object OnRegisterEmotionClick : HomeIntent()

presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/HomeState.kt

@@ -12,8 +12,8 @@ data class HomeState(
     val todayEmotion: TodayEmotionUiModel? = null,
     val selectedDate: LocalDate = LocalDate.now(),
     val currentWeeks: List<LocalDate> = LocalDate.now().getCurrentWeekDays(),
-    val routines: RoutineScheduleUiModel = RoutineScheduleUiModel(),
+    val routineSchedule: RoutineScheduleUiModel = RoutineScheduleUiModel(),
 ) : MviState {
     val selectedDateRoutines: List<RoutineUiModel>
-        get() = routines.dailyRoutines[selectedDate.toString()]?.routines ?: emptyList()
+        get() = routineSchedule.dailyRoutines[selectedDate.toString()]?.routines ?: emptyList()
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/RoutineScheduleUiModel.kt

@@ -6,7 +6,7 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class RoutineScheduleUiModel(
-    val dailyRoutines: Map<String, DayRoutinesUiModel> = emptyMap(),
+    val dailyRoutines: Map<String, DailyRoutinesUiModel> = emptyMap(),
 ) : Parcelable
 
 fun RoutineSchedule.toUiModel(): RoutineScheduleUiModel =