Refactor: 루틴 삭제 api 버전업 및 네이밍 수정

Author: wjdrjs00

data/src/main/java/com/threegap/bitnagil/data/routine/datasource/RoutineRemoteDataSource.kt

@@ -1,14 +1,13 @@
 package com.threegap.bitnagil.data.routine.datasource
 
-import com.threegap.bitnagil.data.routine.model.request.RoutineByDayDeletionRequestDto
 import com.threegap.bitnagil.data.routine.model.request.RoutineCompletionRequestDto
 import com.threegap.bitnagil.data.routine.model.response.RoutineDto
 import com.threegap.bitnagil.data.routine.model.response.RoutinesResponseDto
 
 interface RoutineRemoteDataSource {
     suspend fun fetchWeeklyRoutines(startDate: String, endDate: String): Result<RoutinesResponseDto>
     suspend fun syncRoutineCompletion(routineCompletionRequestDto: RoutineCompletionRequestDto): Result<Unit>
-    suspend fun deleteRoutine(routineId: String): Result<Unit>
-    suspend fun deleteRoutineByDay(routineByDayDeletionRequestDto: RoutineByDayDeletionRequestDto): Result<Unit>
     suspend fun getRoutine(routineId: String): Result<RoutineDto>
+    suspend fun deleteRoutine(routineId: String): Result<Unit>
+    suspend fun deleteRoutineForDay(routineId: String): Result<Unit>
 }

data/src/main/java/com/threegap/bitnagil/data/routine/datasourceImpl/RoutineRemoteDataSourceImpl.kt

@@ -3,7 +3,6 @@ package com.threegap.bitnagil.data.routine.datasourceImpl
 import com.threegap.bitnagil.data.common.safeApiCall
 import com.threegap.bitnagil.data.common.safeUnitApiCall
 import com.threegap.bitnagil.data.routine.datasource.RoutineRemoteDataSource
-import com.threegap.bitnagil.data.routine.model.request.RoutineByDayDeletionRequestDto
 import com.threegap.bitnagil.data.routine.model.request.RoutineCompletionRequestDto
 import com.threegap.bitnagil.data.routine.model.response.RoutineDto
 import com.threegap.bitnagil.data.routine.model.response.RoutinesResponseDto
@@ -23,18 +22,18 @@ class RoutineRemoteDataSourceImpl @Inject constructor(
             routineService.routineCompletion(routineCompletionRequestDto)
         }
 
+    override suspend fun getRoutine(routineId: String): Result<RoutineDto> =
+        safeApiCall {
+            routineService.getRoutine(routineId)
+        }
+
     override suspend fun deleteRoutine(routineId: String): Result<Unit> =
         safeUnitApiCall {
             routineService.deleteRoutine(routineId)
         }
 
-    override suspend fun deleteRoutineByDay(routineByDayDeletionRequestDto: RoutineByDayDeletionRequestDto): Result<Unit> =
+    override suspend fun deleteRoutineForDay(routineId: String): Result<Unit> =
         safeUnitApiCall {
-            routineService.deleteRoutineByDay(routineByDayDeletionRequestDto)
-        }
-
-    override suspend fun getRoutine(routineId: String): Result<RoutineDto> =
-        safeApiCall {
-            routineService.getRoutine(routineId)
+            routineService.deleteRoutineForDay(routineId)
         }
 }

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

@@ -4,7 +4,6 @@ import com.threegap.bitnagil.data.routine.datasource.RoutineRemoteDataSource
 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.RoutineCompletionInfos
 import com.threegap.bitnagil.domain.routine.model.Routines
 import com.threegap.bitnagil.domain.routine.repository.RoutineRepository
@@ -20,12 +19,12 @@ class RoutineRepositoryImpl @Inject constructor(
     override suspend fun syncRoutineCompletion(routineCompletionInfos: RoutineCompletionInfos): Result<Unit> =
         routineRemoteDataSource.syncRoutineCompletion(routineCompletionInfos.toDto())
 
-    override suspend fun deleteRoutine(routineId: String): Result<Unit> =
-        routineRemoteDataSource.deleteRoutine(routineId)
-
     override suspend fun getRoutine(routineId: String): Result<Routine> =
         routineRemoteDataSource.getRoutine(routineId).map { it.toDomain() }
 
-    override suspend fun deleteRoutineByDay(routineByDayDeletion: RoutineByDayDeletion): Result<Unit> =
-        routineRemoteDataSource.deleteRoutineByDay(routineByDayDeletion.toDto())
+    override suspend fun deleteRoutine(routineId: String): Result<Unit> =
+        routineRemoteDataSource.deleteRoutine(routineId)
+
+    override suspend fun deleteRoutineForDay(routineId: String): Result<Unit> =
+        routineRemoteDataSource.deleteRoutineForDay(routineId)
 }

data/src/main/java/com/threegap/bitnagil/data/routine/service/RoutineService.kt

@@ -1,14 +1,12 @@
 package com.threegap.bitnagil.data.routine.service
 
-import com.threegap.bitnagil.data.routine.model.request.RoutineByDayDeletionRequestDto
 import com.threegap.bitnagil.data.routine.model.request.RoutineCompletionRequestDto
 import com.threegap.bitnagil.data.routine.model.response.RoutineDto
 import com.threegap.bitnagil.data.routine.model.response.RoutinesResponseDto
 import com.threegap.bitnagil.network.model.BaseResponse
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
-import retrofit2.http.HTTP
 import retrofit2.http.PUT
 import retrofit2.http.Path
 import retrofit2.http.Query
@@ -20,7 +18,12 @@ interface RoutineService {
         @Query("endDate") endDate: String,
     ): BaseResponse<RoutinesResponseDto>
 
-    @PUT("/api/v2/routines")
+    @GET("/api/v1/routines/{routineId}")
+    suspend fun getRoutine(
+        @Path("routineId") routineId: String,
+    ): BaseResponse<RoutineDto>
+
+    @PUT("/api/v2/routines/completions")
     suspend fun routineCompletion(
         @Body request: RoutineCompletionRequestDto,
     ): BaseResponse<Unit>
@@ -30,13 +33,8 @@ interface RoutineService {
         @Path("routineId") routineId: String,
     ): BaseResponse<Unit>
 
-    @GET("/api/v1/routines/{routineId}")
-    suspend fun getRoutine(
+    @DELETE("/api/v2/routines/day/{routineId}")
+    suspend fun deleteRoutineForDay(
         @Path("routineId") routineId: String,
-    ): BaseResponse<RoutineDto>
-
-    @HTTP(method = "DELETE", path = "/api/v1/routines/day", hasBody = true)
-    suspend fun deleteRoutineByDay(
-        @Body request: RoutineByDayDeletionRequestDto,
     ): BaseResponse<Unit>
 }

domain/src/main/java/com/threegap/bitnagil/domain/routine/repository/RoutineRepository.kt

@@ -1,14 +1,13 @@
 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.RoutineCompletionInfos
 import com.threegap.bitnagil.domain.routine.model.Routines
 
 interface RoutineRepository {
     suspend fun fetchWeeklyRoutines(startDate: String, endDate: String): Result<Routines>
     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>
+    suspend fun deleteRoutine(routineId: String): Result<Unit>
+    suspend fun deleteRoutineForDay(routineId: String): Result<Unit>
 }

domain/src/main/java/com/threegap/bitnagil/domain/routine/usecase/DeleteRoutineByDayUseCase.kt

@@ -0,0 +1,11 @@
+package com.threegap.bitnagil.domain.routine.usecase
+
+import com.threegap.bitnagil.domain.routine.repository.RoutineRepository
+import javax.inject.Inject
+
+class DeleteRoutineForDayUseCase @Inject constructor(
+    private val routineRepository: RoutineRepository,
+) {
+    suspend operator fun invoke(routineId: String): Result<Unit> =
+        routineRepository.deleteRoutineForDay(routineId)
+}

domain/src/main/java/com/threegap/bitnagil/domain/routine/usecase/DeleteRoutineForDayUseCase.kt

@@ -3,6 +3,8 @@ package com.threegap.bitnagil.presentation.routinelist
 import android.util.Log
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
+import com.threegap.bitnagil.domain.routine.usecase.DeleteRoutineForDayUseCase
+import com.threegap.bitnagil.domain.routine.usecase.DeleteRoutineUseCase
 import com.threegap.bitnagil.domain.routine.usecase.FetchWeeklyRoutinesUseCase
 import com.threegap.bitnagil.presentation.common.mviviewmodel.MviViewModel
 import com.threegap.bitnagil.presentation.home.util.getCurrentWeekDays
@@ -20,6 +22,8 @@ import javax.inject.Inject
 class RoutineListViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val fetchWeeklyRoutinesUseCase: FetchWeeklyRoutinesUseCase,
+    private val deleteRoutineUseCase: DeleteRoutineUseCase,
+    private val deleteRoutineForDayUseCase: DeleteRoutineForDayUseCase,
 ) : MviViewModel<RoutineListState, RoutineListSideEffect, RoutineListIntent>(
     savedStateHandle = savedStateHandle,
     initState = RoutineListState(
@@ -67,7 +71,7 @@ class RoutineListViewModel @Inject constructor(
 
     private fun fetchRoutines() {
         sendIntent(RoutineListIntent.UpdateLoading(true))
-        val currentWeek = LocalDate.now().getCurrentWeekDays()
+        val currentWeek = container.stateFlow.value.selectedDate.getCurrentWeekDays()
         val startDate = currentWeek.first().toString()
         val endDate = currentWeek.last().toString()
         viewModelScope.launch {
@@ -85,10 +89,36 @@ class RoutineListViewModel @Inject constructor(
     }
 
     fun deleteRoutineCompletely() {
-        viewModelScope.launch {}
+        sendIntent(RoutineListIntent.UpdateLoading(true))
+        val selectedRoutine = stateFlow.value.selectedRoutine!!
+        viewModelScope.launch {
+            deleteRoutineUseCase(selectedRoutine.routineId).fold(
+                onSuccess = {
+                    sendIntent(RoutineListIntent.HideDeleteConfirmBottomSheet)
+                    sendIntent(RoutineListIntent.UpdateLoading(false))
+                },
+                onFailure = {
+                    Log.e("RoutineListViewModel", "루틴 삭제 실패: ${it.message}")
+                    sendIntent(RoutineListIntent.UpdateLoading(false))
+                },
+            )
+        }
     }
 
     fun deleteRoutineForToday() {
-        viewModelScope.launch { }
+        sendIntent(RoutineListIntent.UpdateLoading(true))
+        val selectedRoutine = stateFlow.value.selectedRoutine!!
+        viewModelScope.launch {
+            deleteRoutineForDayUseCase(selectedRoutine.routineId).fold(
+                onSuccess = {
+                    sendIntent(RoutineListIntent.HideDeleteConfirmBottomSheet)
+                    sendIntent(RoutineListIntent.UpdateLoading(false))
+                },
+                onFailure = {
+                    Log.e("RoutineListViewModel", "루틴 삭제 실패: ${it.message}")
+                    sendIntent(RoutineListIntent.UpdateLoading(false))
+                },
+            )
+        }
     }
 }