Merge pull request #78 from YAPP-Github/hotfix/#74-routine-delete

[Hotfix/#74] 온보딩 추천 루틴 삭제 시 오류 수정

Author: wjdrjs00

data/src/main/java/com/threegap/bitnagil/data/routine/model/request/RoutineByDayDeletionRequestDto.kt

@@ -10,6 +10,8 @@ data class RoutineByDayDeletionRequestDto(
     val routineCompletionId: Int?,
     @SerialName("routineId")
     val routineId: String,
+    @SerialName("routineType")
+    val routineType: String,
     @SerialName("subRoutineInfosForDelete")
     val subRoutineInfosForDelete: List<SubRoutineDeletionInfoDto>,
     @SerialName("performedDate")
@@ -22,6 +24,7 @@ fun RoutineByDayDeletion.toDto() =
     RoutineByDayDeletionRequestDto(
         routineCompletionId = this.routineCompletionId,
         routineId = this.routineId,
+        routineType = this.routineType.name,
         subRoutineInfosForDelete = this.subRoutineInfosForDelete.map { it.toDto() },
         performedDate = this.performedDate,
         historySeq = this.historySeq,

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

@@ -3,6 +3,7 @@ package com.threegap.bitnagil.domain.routine.model
 data class RoutineByDayDeletion(
     val routineCompletionId: Int?,
     val routineId: String,
+    val routineType: RoutineType,
     val subRoutineInfosForDelete: List<SubRoutineDeletionInfo>,
     val performedDate: String,
     val historySeq: Int,

gradle/libs.versions.toml

@@ -5,8 +5,8 @@ minSdk = "28"
 targetSdk = "35"
 
 ## App Versioning
-versionCode = "2"
-versionName = "1.0"
+versionCode = "3"
+versionName = "1.0.1"
 
 # Android Gradle Plugin
 androidGradlePlugin = "8.10.1"

presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeScreen.kt

@@ -95,7 +95,7 @@ fun HomeScreenContainer(
                 onEdit = { viewModel.sendIntent(HomeIntent.NavigateToEditRoutine(routine.routineId)) },
                 onDelete = {
                     if (routine.repeatDay.isEmpty()) {
-                        viewModel.deleteRoutine(routine.routineId)
+                        viewModel.deleteRoutineByDay(routine)
                     } else {
                         viewModel.sendIntent(HomeIntent.ShowDeleteConfirmDialog(routine))
                     }

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

@@ -39,6 +39,7 @@ fun RoutineUiModel.toRoutineByDayDeletion(performedDate: String): RoutineByDayDe
     RoutineByDayDeletion(
         routineCompletionId = this.routineCompletionId,
         routineId = this.routineId,
+        routineType = this.routineType,
         subRoutineInfosForDelete = this.subRoutines.map { it.toSubRoutineDeletionInfo() },
         performedDate = performedDate,
         historySeq = this.historySeq,