Refactor: 루틴 완료 api 버전 업

wjdrjs00 · wjdrjs00 · commit e61f183a1640 · 2025-08-15T04:32:52.000+09:00
- v1 -&gt; v2로 마이그레이션
- 루틴 완료 로직 인덱스 값 기반으로 수정
- 루틴 완료 requestDto 수정
diff --git a/data/src/main/java/com/threegap/bitnagil/data/routine/model/request/RoutineCompletionInfoDto.kt b/data/src/main/java/com/threegap/bitnagil/data/routine/model/request/RoutineCompletionInfoDto.kt
@@ -1,16 +1,22 @@
 package com.threegap.bitnagil.data.routine.model.request
 
+import com.threegap.bitnagil.domain.routine.model.RoutineCompletionInfo
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class RoutineCompletionInfoDto(
-    @SerialName("routineType")
-    val routineType: String,
     @SerialName("routineId")
     val routineId: String,
-    @SerialName("historySeq")
-    val historySeq: Int,
-    @SerialName("completeYn")
-    val isCompleted: Boolean,
+    @SerialName("routineCompleteYn")
+    val routineCompleteYn: Boolean,
+    @SerialName("subRoutineCompleteYn")
+    val subRoutineCompleteYn: List<Boolean>,
 )
+
+internal fun RoutineCompletionInfo.toDto() =
+    RoutineCompletionInfoDto(
+        routineId = this.routineId,
+        routineCompleteYn = this.routineCompleteYn,
+        subRoutineCompleteYn = this.subRoutineCompleteYn,
+    )
diff --git a/data/src/main/java/com/threegap/bitnagil/data/routine/model/request/RoutineCompletionRequestDto.kt b/data/src/main/java/com/threegap/bitnagil/data/routine/model/request/RoutineCompletionRequestDto.kt
@@ -1,12 +1,16 @@
 package com.threegap.bitnagil.data.routine.model.request
 
+import com.threegap.bitnagil.domain.routine.model.RoutineCompletionInfos
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class RoutineCompletionRequestDto(
-    @SerialName("performedDate")
-    val performedDate: String,
     @SerialName("routineCompletionInfos")
-    val routineCompletions: List<RoutineCompletionInfoDto>,
+    val routineCompletionInfos: List<RoutineCompletionInfoDto>,
 )
+
+internal fun RoutineCompletionInfos.toDto() =
+    RoutineCompletionRequestDto(
+        routineCompletionInfos = this.routineCompletionInfos.map { it.toDto() },
+    )
diff --git a/data/src/main/java/com/threegap/bitnagil/data/routine/repositoryImpl/RoutineRepositoryImpl.kt b/data/src/main/java/com/threegap/bitnagil/data/routine/repositoryImpl/RoutineRepositoryImpl.kt
@@ -1,12 +1,11 @@
 package com.threegap.bitnagil.data.routine.repositoryImpl
 
 import com.threegap.bitnagil.data.routine.datasource.RoutineRemoteDataSource
-import com.threegap.bitnagil.data.routine.mapper.toDomain
-import com.threegap.bitnagil.data.routine.mapper.toDto
 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.RoutineByDayDeletion
-import com.threegap.bitnagil.domain.routine.model.RoutineCompletion
+import com.threegap.bitnagil.domain.routine.model.RoutineCompletionInfos
 import com.threegap.bitnagil.domain.routine.model.Routines
 import com.threegap.bitnagil.domain.routine.repository.RoutineRepository
 import javax.inject.Inject
@@ -18,8 +17,8 @@ class RoutineRepositoryImpl @Inject constructor(
         routineRemoteDataSource.fetchWeeklyRoutines(startDate, endDate)
             .map { it.toDomain() }
 
-    override suspend fun syncRoutineCompletion(routineCompletion: RoutineCompletion): Result<Unit> =
-        routineRemoteDataSource.syncRoutineCompletion(routineCompletion.toDto())
+    override suspend fun syncRoutineCompletion(routineCompletionInfos: RoutineCompletionInfos): Result<Unit> =
+        routineRemoteDataSource.syncRoutineCompletion(routineCompletionInfos.toDto())
 
     override suspend fun deleteRoutine(routineId: String): Result<Unit> =
         routineRemoteDataSource.deleteRoutine(routineId)
diff --git a/data/src/main/java/com/threegap/bitnagil/data/routine/service/RoutineService.kt b/data/src/main/java/com/threegap/bitnagil/data/routine/service/RoutineService.kt
@@ -9,7 +9,7 @@ import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.HTTP
-import retrofit2.http.POST
+import retrofit2.http.PUT
 import retrofit2.http.Path
 import retrofit2.http.Query
 
@@ -20,7 +20,7 @@ interface RoutineService {
         @Query("endDate") endDate: String,
     ): BaseResponse<RoutinesResponseDto>
 
-    @POST("/api/v1/routines/completions")
+    @PUT("/api/v2/routines")
     suspend fun routineCompletion(
         @Body request: RoutineCompletionRequestDto,
     ): BaseResponse<Unit>
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/routine/model/RoutineCompletionInfo.kt b/domain/src/main/java/com/threegap/bitnagil/domain/routine/model/RoutineCompletionInfo.kt
@@ -1,8 +1,7 @@
 package com.threegap.bitnagil.domain.routine.model
 
 data class RoutineCompletionInfo(
-    val routineType: RoutineType,
     val routineId: String,
-    val historySeq: Int,
-    val isCompleted: Boolean,
+    val routineCompleteYn: Boolean,
+    val subRoutineCompleteYn: List<Boolean>,
 )
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/routine/model/RoutineCompletionInfos.kt b/domain/src/main/java/com/threegap/bitnagil/domain/routine/model/RoutineCompletionInfos.kt
@@ -0,0 +1,5 @@
+package com.threegap.bitnagil.domain.routine.model
+
+data class RoutineCompletionInfos(
+    val routineCompletionInfos: List<RoutineCompletionInfo>,
+)
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/routine/repository/RoutineRepository.kt b/domain/src/main/java/com/threegap/bitnagil/domain/routine/repository/RoutineRepository.kt
@@ -2,12 +2,12 @@ package com.threegap.bitnagil.domain.routine.repository
 
 import com.threegap.bitnagil.domain.routine.model.Routine
 import com.threegap.bitnagil.domain.routine.model.RoutineByDayDeletion
-import com.threegap.bitnagil.domain.routine.model.RoutineCompletion
+import com.threegap.bitnagil.domain.routine.model.RoutineCompletionInfos
 import com.threegap.bitnagil.domain.routine.model.Routines
 
 interface RoutineRepository {
     suspend fun fetchWeeklyRoutines(startDate: String, endDate: String): Result<Routines>
-    suspend fun syncRoutineCompletion(routineCompletion: RoutineCompletion): Result<Unit>
+    suspend fun syncRoutineCompletion(routineCompletionInfos: RoutineCompletionInfos): Result<Unit>
     suspend fun deleteRoutine(routineId: String): Result<Unit>
     suspend fun getRoutine(routineId: String): Result<Routine>
     suspend fun deleteRoutineByDay(routineByDayDeletion: RoutineByDayDeletion): Result<Unit>
diff --git a/domain/src/main/java/com/threegap/bitnagil/domain/routine/usecase/RoutineCompletionUseCase.kt b/domain/src/main/java/com/threegap/bitnagil/domain/routine/usecase/RoutineCompletionUseCase.kt
@@ -1,12 +1,12 @@
 package com.threegap.bitnagil.domain.routine.usecase
 
-import com.threegap.bitnagil.domain.routine.model.RoutineCompletion
+import com.threegap.bitnagil.domain.routine.model.RoutineCompletionInfos
 import com.threegap.bitnagil.domain.routine.repository.RoutineRepository
 import javax.inject.Inject
 
 class RoutineCompletionUseCase @Inject constructor(
     private val routineRepository: RoutineRepository,
 ) {
-    suspend operator fun invoke(routineCompletion: RoutineCompletion): Result<Unit> =
-        routineRepository.syncRoutineCompletion(routineCompletion)
+    suspend operator fun invoke(routineCompletionInfos: RoutineCompletionInfos): Result<Unit> =
+        routineRepository.syncRoutineCompletion(routineCompletionInfos)
 }
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeScreen.kt
@@ -78,8 +78,8 @@ fun HomeScreenContainer(
         onRoutineCompletionToggle = { routineId, isCompleted ->
             viewModel.toggleRoutineCompletion(routineId, isCompleted)
         },
-        onSubRoutineCompletionToggle = { routineId, subRoutineId, isCompleted ->
-            viewModel.toggleSubRoutineCompletion(routineId, subRoutineId, isCompleted)
+        onSubRoutineCompletionToggle = { routineId, subRoutineIndex, isCompleted ->
+            viewModel.toggleSubRoutineCompletion(routineId, subRoutineIndex, isCompleted)
         },
         onRegisterRoutineClick = {
             viewModel.sendIntent(HomeIntent.OnRegisterRoutineClick)
@@ -100,7 +100,7 @@ private fun HomeScreen(
     onPreviousWeekClick: () -> Unit,
     onNextWeekClick: () -> Unit,
     onRoutineCompletionToggle: (String, Boolean) -> Unit,
-    onSubRoutineCompletionToggle: (String, String, Boolean) -> Unit,
+    onSubRoutineCompletionToggle: (String, Int, Boolean) -> Unit,
     onRegisterRoutineClick: () -> Unit,
     onRegisterEmotionClick: () -> Unit,
     onShowMoreRoutinesClick: () -> Unit,
@@ -170,8 +170,7 @@ private fun HomeScreen(
                         .fillMaxSize()
                         .background(BitnagilTheme.colors.coolGray99)
                         .nestedScroll(collapsibleHeaderState.nestedScrollConnection)
-                        .padding(horizontal = 16.dp)
-                        .padding(bottom = 12.dp),
+                        .padding(horizontal = 16.dp),
                     state = collapsibleHeaderState.lazyListState,
                     verticalArrangement = Arrangement.spacedBy(12.dp),
                 ) {
@@ -187,10 +186,10 @@ private fun HomeScreen(
                                         isCompleted,
                                     )
                                 },
-                                onSubRoutineToggle = { subRoutineId, isCompleted ->
+                                onSubRoutineToggle = { subRoutineIndex, isCompleted ->
                                     onSubRoutineCompletionToggle(
                                         routine.routineId,
-                                        subRoutineId,
+                                        subRoutineIndex,
                                         isCompleted,
                                     )
                                 },
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeViewModel.kt
@@ -6,8 +6,8 @@ import androidx.lifecycle.viewModelScope
 import com.threegap.bitnagil.domain.emotion.usecase.FetchTodayEmotionUseCase
 import com.threegap.bitnagil.domain.emotion.usecase.GetEmotionChangeEventFlowUseCase
 import com.threegap.bitnagil.domain.onboarding.usecase.GetOnBoardingRecommendRoutineEventFlowUseCase
-import com.threegap.bitnagil.domain.routine.model.RoutineCompletion
 import com.threegap.bitnagil.domain.routine.model.RoutineCompletionInfo
+import com.threegap.bitnagil.domain.routine.model.RoutineCompletionInfos
 import com.threegap.bitnagil.domain.routine.usecase.FetchWeeklyRoutinesUseCase
 import com.threegap.bitnagil.domain.routine.usecase.RoutineCompletionUseCase
 import com.threegap.bitnagil.domain.user.usecase.FetchUserProfileUseCase
@@ -103,7 +103,7 @@ class HomeViewModel @Inject constructor(
             }
 
             is HomeIntent.OnSubRoutineCompletionToggle -> {
-                updateSubRoutine(state, intent.routineId, intent.subRoutineId, intent.isCompleted)
+                updateSubRoutine(state, intent.routineId, intent.subRoutineIndex, intent.isCompleted)
             }
 
             is HomeIntent.LoadTodayEmotion -> {
@@ -201,8 +201,7 @@ class HomeViewModel @Inject constructor(
         viewModelScope.launch {
             fetchWeeklyRoutinesUseCase(startDate, endDate).fold(
                 onSuccess = { routines ->
-                    val routinesUiModel = routines.toUiModel()
-                    sendIntent(HomeIntent.LoadWeeklyRoutines(routinesUiModel))
+                    sendIntent(HomeIntent.LoadWeeklyRoutines(routines.toUiModel()))
                     sendIntent(HomeIntent.UpdateLoading(false))
                 },
                 onFailure = { error ->
@@ -237,11 +236,11 @@ class HomeViewModel @Inject constructor(
         processRoutineToggleChanges(originalState, predictedUpdatedState)
     }
 
-    fun toggleSubRoutineCompletion(routineId: String, subRoutineId: String, isCompleted: Boolean) {
+    fun toggleSubRoutineCompletion(routineId: String, subRoutineIndex: Int, isCompleted: Boolean) {
         val originalState = container.stateFlow.value
-        sendIntent(HomeIntent.OnSubRoutineCompletionToggle(routineId, subRoutineId, isCompleted))
+        sendIntent(HomeIntent.OnSubRoutineCompletionToggle(routineId, subRoutineIndex, isCompleted))
 
-        val predictedUpdatedState = updateSubRoutine(originalState, routineId, subRoutineId, isCompleted)
+        val predictedUpdatedState = updateSubRoutine(originalState, routineId, subRoutineIndex, isCompleted)
         processRoutineToggleChanges(originalState, predictedUpdatedState)
     }
 
@@ -278,11 +277,10 @@ class HomeViewModel @Inject constructor(
             val routineIndex = routinesForDate.indexOfFirst { it.routineId == routineId }
             if (routineIndex == -1) return@updateRoutinesForDate false
 
-            val updatedRoutine = routinesForDate[routineIndex].copy(
-                isCompleted = isCompleted,
-                subRoutines = routinesForDate[routineIndex].subRoutines.map { subRoutine ->
-                    subRoutine.copy(isCompleted = isCompleted)
-                },
+            val routine = routinesForDate[routineIndex]
+            val updatedRoutine = routine.copy(
+                routineCompleteYn = isCompleted,
+                subRoutineCompleteYn = routine.subRoutineCompleteYn.map { isCompleted },
             )
 
             routinesForDate[routineIndex] = updatedRoutine
@@ -293,27 +291,34 @@ class HomeViewModel @Inject constructor(
     private fun updateSubRoutine(
         state: HomeState,
         routineId: String,
-        subRoutineId: String,
+        subRoutineIndex: Int,
         isCompleted: Boolean,
     ): HomeState {
         return updateRoutinesForDate(state) { routinesForDate ->
             val routineIndex = routinesForDate.indexOfFirst { it.routineId == routineId }
             if (routineIndex == -1) return@updateRoutinesForDate false
 
             val routine = routinesForDate[routineIndex]
-            val updatedSubRoutines = routine.subRoutines.map { subRoutine ->
-                if (subRoutine.subRoutineId == subRoutineId) {
-                    subRoutine.copy(isCompleted = isCompleted)
-                } else {
-                    subRoutine
+
+            if (subRoutineIndex < 0 || subRoutineIndex >= routine.subRoutineNames.size) {
+                return@updateRoutinesForDate false
+            }
+
+            val updatedSubRoutineCompleteYn = routine.subRoutineCompleteYn.toMutableList().apply {
+                if (subRoutineIndex < size) {
+                    this[subRoutineIndex] = isCompleted
                 }
             }
 
-            val routineCompleted = if (isCompleted) updatedSubRoutines.all { it.isCompleted } else false
+            val routineCompleted = if (isCompleted) {
+                updatedSubRoutineCompleteYn.all { it }
+            } else {
+                false
+            }
 
             val updatedRoutine = routine.copy(
-                subRoutines = updatedSubRoutines,
-                isCompleted = routineCompleted,
+                subRoutineCompleteYn = updatedSubRoutineCompleteYn,
+                routineCompleteYn = routineCompleted,
             )
 
             routinesForDate[routineIndex] = updatedRoutine
@@ -326,12 +331,13 @@ class HomeViewModel @Inject constructor(
         updateLogic: (MutableList<RoutineUiModel>) -> Boolean,
     ): HomeState {
         val dateKey = state.selectedDate.toString()
-        val routinesForDate = state.routines.routinesByDate[dateKey]?.toMutableList() ?: return state
+        val routinesForDate = state.routines.routines[dateKey]?.routineList?.toMutableList() ?: return state
 
         if (!updateLogic(routinesForDate)) return state
 
-        val updatedRoutinesByDate = state.routines.routinesByDate.toMutableMap()
-        updatedRoutinesByDate[dateKey] = routinesForDate
+        val updatedRoutinesByDate = state.routines.routines.toMutableMap()
+        val dayRoutines = updatedRoutinesByDate[dateKey] ?: return state
+        updatedRoutinesByDate[dateKey] = dayRoutines.copy(routineList = routinesForDate)
 
         return state.copy(routines = RoutinesUiModel(updatedRoutinesByDate))
     }
@@ -342,39 +348,25 @@ class HomeViewModel @Inject constructor(
         date: LocalDate,
     ): List<RoutineCompletionInfo> {
         val dateKey = date.toString()
-        val originalRoutineList = originalRoutines.routinesByDate[dateKey] ?: emptyList()
-        val updatedRoutineList = updatedRoutines.routinesByDate[dateKey] ?: emptyList()
+        val originalRoutineList = originalRoutines.routines[dateKey]?.routineList ?: emptyList()
+        val updatedRoutineList = updatedRoutines.routines[dateKey]?.routineList ?: emptyList()
 
         return buildList {
             updatedRoutineList.forEach { updatedRoutine ->
                 val originalRoutine = originalRoutineList.find { it.routineId == updatedRoutine.routineId }
 
-                if (originalRoutine?.isCompleted != updatedRoutine.isCompleted) {
+                val hasMainRoutineChanged = originalRoutine?.routineCompleteYn != updatedRoutine.routineCompleteYn
+                val hasSubRoutinesChanged = originalRoutine?.subRoutineCompleteYn != updatedRoutine.subRoutineCompleteYn
+
+                if (hasMainRoutineChanged || hasSubRoutinesChanged) {
                     add(
                         RoutineCompletionInfo(
-                            routineType = updatedRoutine.routineType,
                             routineId = updatedRoutine.routineId,
-                            historySeq = updatedRoutine.historySeq,
-                            isCompleted = updatedRoutine.isCompleted,
+                            routineCompleteYn = updatedRoutine.routineCompleteYn,
+                            subRoutineCompleteYn = updatedRoutine.subRoutineCompleteYn,
                         ),
                     )
                 }
-
-                updatedRoutine.subRoutines.forEach { updatedSubRoutine ->
-                    val originalSubRoutine = originalRoutine?.subRoutines
-                        ?.find { it.subRoutineId == updatedSubRoutine.subRoutineId }
-
-                    if (originalSubRoutine?.isCompleted != updatedSubRoutine.isCompleted) {
-                        add(
-                            RoutineCompletionInfo(
-                                routineType = updatedSubRoutine.routineType,
-                                routineId = updatedSubRoutine.subRoutineId,
-                                historySeq = updatedSubRoutine.historySeq,
-                                isCompleted = updatedSubRoutine.isCompleted,
-                            ),
-                        )
-                    }
-                }
             }
         }
     }
@@ -385,9 +377,8 @@ class HomeViewModel @Inject constructor(
 
         if (unsyncedChanges.isEmpty()) return
 
-        val syncRequest = RoutineCompletion(
-            performedDate = dateKey,
-            routineCompletions = unsyncedChanges.toList(),
+        val syncRequest = RoutineCompletionInfos(
+            routineCompletionInfos = unsyncedChanges.toList(),
         )
 
         routineCompletionUseCase(syncRequest).fold(
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/block/RoutineItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/block/RoutineItem.kt
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/block/SubRoutinesItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/block/SubRoutinesItem.kt
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/RoutineSection.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/RoutineSection.kt
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/HomeIntent.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/HomeIntent.kt
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/SubRoutine.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/model/SubRoutine.kt
