Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wjdrjs00 merged 3 commits into from
Aug 6, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0036400
Merge pull request #72 from YAPP-Github/release/1.0
l5x5l Aug 2, 2025
c0ab8f9
Fix: 루틴 삭제 시 routineType을 함께 전달하도록 수정
wjdrjs00 Aug 5, 2025
c5d0224
Chore: 앱 버전 업
wjdrjs00 Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...n/java/com/threegap/bitnagil/data/routine/model/request/RoutineByDayDeletionRequestDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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,
Expand Down
1 change: 1 addition & 0 deletions domain/src/main/java/com/threegap/bitnagil/domain/routine/model/RoutineByDayDeletion.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion presentation/src/main/java/com/threegap/bitnagil/presentation/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
1 change: 1 addition & 0 deletions presentation/src/main/java/com/threegap/bitnagil/presentation/home/model/RoutineUiModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down