Merge pull request #137 from YAPP-Github/refactor/#136-routine-logic

[Refactor/#136] 홈화면 루틴 완료 로직을 리펙토링 합니다.

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(
-        routineList = routineList.map { it.toDomain() },
-        allCompleted = allCompleted,
+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

@@ -36,16 +36,16 @@ data class RoutineDto(
 
 fun RoutineDto.toDomain(): Routine =
     Routine(
-        routineId = this.routineId,
-        routineName = this.routineName,
-        repeatDay = this.repeatDay.map { DayOfWeek.fromString(it) },
+        id = this.routineId,
+        name = this.routineName,
+        repeatDays = this.repeatDay.map { DayOfWeek.fromString(it) },
         executionTime = this.executionTime,
         routineDate = this.routineDate,
-        routineCompleteYn = this.routineCompleteYn,
+        isCompleted = this.routineCompleteYn,
         subRoutineNames = this.subRoutineNames,
-        subRoutineCompleteYn = this.subRoutineCompleteYn,
+        subRoutineCompletionStates = this.subRoutineCompleteYn,
         recommendedRoutineType = RecommendedRoutineType.fromString(this.recommendedRoutineType),
-        routineDeletedYn = routineDeletedYn,
+        isDeleted = routineDeletedYn,
         startDate = this.routineStartDate,
         endDate = this.routineEndDate,
     )

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

@@ -1,6 +1,6 @@
 package com.threegap.bitnagil.data.routine.model.response
 
-import com.threegap.bitnagil.domain.routine.model.Routines
+import com.threegap.bitnagil.domain.routine.model.RoutineSchedule
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -11,8 +11,8 @@ data class RoutinesResponseDto(
 )
 
 fun RoutinesResponseDto.toDomain() =
-    Routines(
-        routines = this.routines.mapValues { (_, dayRoutinesDto) ->
+    RoutineSchedule(
+        dailyRoutines = this.routines.mapValues { (_, dayRoutinesDto) ->
             dayRoutinesDto.toDomain()
         },
     )

data/src/main/java/com/threegap/bitnagil/data/routine/repositoryImpl/RoutineRepositoryImpl.kt

@@ -5,14 +5,14 @@ import com.threegap.bitnagil.data.routine.model.request.toDto
 import com.threegap.bitnagil.data.routine.model.response.toDomain
 import com.threegap.bitnagil.domain.routine.model.Routine
 import com.threegap.bitnagil.domain.routine.model.RoutineCompletionInfos
-import com.threegap.bitnagil.domain.routine.model.Routines
+import com.threegap.bitnagil.domain.routine.model.RoutineSchedule
 import com.threegap.bitnagil.domain.routine.repository.RoutineRepository
 import javax.inject.Inject
 
 class RoutineRepositoryImpl @Inject constructor(
     private val routineRemoteDataSource: RoutineRemoteDataSource,
 ) : RoutineRepository {
-    override suspend fun fetchWeeklyRoutines(startDate: String, endDate: String): Result<Routines> =
+    override suspend fun fetchWeeklyRoutines(startDate: String, endDate: String): Result<RoutineSchedule> =
         routineRemoteDataSource.fetchWeeklyRoutines(startDate, endDate)
             .map { it.toDomain() }
 

domain/src/main/java/com/threegap/bitnagil/domain/emotion/usecase/FetchTodayEmotionUseCase.kt

@@ -2,11 +2,14 @@ package com.threegap.bitnagil.domain.emotion.usecase
 
 import com.threegap.bitnagil.domain.emotion.model.TodayEmotion
 import com.threegap.bitnagil.domain.emotion.repository.EmotionRepository
+import java.time.LocalDate
 import javax.inject.Inject
 
 class FetchTodayEmotionUseCase @Inject constructor(
     private val emotionRepository: EmotionRepository,
 ) {
-    suspend operator fun invoke(currentDate: String): Result<TodayEmotion?> =
-        emotionRepository.fetchTodayEmotion(currentDate)
+    suspend operator fun invoke(): Result<TodayEmotion?> {
+        val currentDate = LocalDate.now().toString()
+        return emotionRepository.fetchTodayEmotion(currentDate)
+    }
 }

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

@@ -0,0 +1,13 @@
+package com.threegap.bitnagil.domain.routine.model
+
+/**
+ * 특정 하루("일간")의 루틴 정보.
+ * [RoutineSchedule] Map의 '값(value)'으로 사용됩니다.
+ *
+ * @property routines 해당 날짜에 포함된 [Routine](개별 루틴)의 목록.
+ * @property isAllCompleted 해당 날짜의 모든 루틴이 완료되었는지 여부.
+ */
+data class DailyRoutines(
+    val routines: List<Routine>,
+    val isAllCompleted: Boolean,
+)

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

@@ -1,16 +1,16 @@
 package com.threegap.bitnagil.domain.routine.model
 
 data class Routine(
-    val routineId: String,
-    val routineName: String,
-    val repeatDay: List<DayOfWeek>,
+    val id: String,
+    val name: String,
+    val repeatDays: List<DayOfWeek>,
     val executionTime: String,
     val startDate: String,
     val endDate: String,
     val routineDate: String,
-    val routineCompleteYn: Boolean,
-    val routineDeletedYn: Boolean,
+    val isCompleted: Boolean,
+    val isDeleted: Boolean,
     val subRoutineNames: List<String>,
-    val subRoutineCompleteYn: List<Boolean>,
+    val subRoutineCompletionStates: List<Boolean>,
     val recommendedRoutineType: RecommendedRoutineType?,
 )

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

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

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

@@ -0,0 +1,6 @@
+package com.threegap.bitnagil.domain.routine.model
+
+data class RoutineToggleState(
+    val isCompleted: Boolean,
+    val subRoutinesIsCompleted: List<Boolean>,
+)