Skip to content

Commit 22b43bf

Browse files
wjdrjs00wjdrjs00
committed
Feat: routineCompletionId 필드 추가
1 parent 97cd2cb commit 22b43bf

File tree

11 files changed

+29
-0
lines changed

11 files changed

+29
-0
lines changed

‎data/src/main/java/com/threegap/bitnagil/data/routine/mapper/RoutineMapper.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ internal fun RoutineDto.toDomain() =
2929
executionTime = this.executionTime,
3030
subRoutines = this.subRoutines.map { it.toDomain() },
3131
isModified = this.isModified,
32+
routineCompletionId = this.routineCompletionId,
3233
isCompleted = this.isCompleted,
3334
repeatDay = this.repeatDay.map { DayOfWeek.fromString(it) },
3435
routineType = RoutineType.fromString(this.routineType),
@@ -41,6 +42,7 @@ internal fun SubRoutineDto.toDomain() =
4142
subRoutineName = this.subRoutineName,
4243
isModified = this.isModified,
4344
sortOrder = this.sortOrder,
45+
routineCompletionId = this.routineCompletionId,
4446
isCompleted = this.isCompleted,
4547
routineType = RoutineType.fromString(this.routineType),
4648
)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ data class RoutineDto(
1919
val subRoutines: List<SubRoutineDto>,
2020
@SerialName("modifiedYn")
2121
val isModified: Boolean,
22+
@SerialName("routineCompletionId")
23+
val routineCompletionId: Int?,
2224
@SerialName("completeYn")
2325
val isCompleted: Boolean,
2426
@SerialName("routineType")

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ data class SubRoutineDto(
1515
val isModified: Boolean,
1616
@SerialName("sortOrder")
1717
val sortOrder: Int,
18+
@SerialName("routineCompletionId")
19+
val routineCompletionId: Int?,
1820
@SerialName("completeYn")
1921
val isCompleted: Boolean,
2022
@SerialName("routineType")

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ data class Routine(
88
val executionTime: String,
99
val subRoutines: List<SubRoutine>,
1010
val isModified: Boolean,
11+
val routineCompletionId: Int?,
1112
val isCompleted: Boolean,
1213
val routineType: RoutineType,
1314
) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ data class SubRoutine(
66
val subRoutineName: String,
77
val isModified: Boolean,
88
val sortOrder: Int,
9+
val routineCompletionId: Int?,
910
val isCompleted: Boolean,
1011
val routineType: RoutineType,
1112
)

‎presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/block/RoutineItem.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,15 @@ private fun RoutineItemPreview() {
7878
routineName = "개운하게 일어나기",
7979
executionTime = "20:30:00",
8080
isCompleted = false,
81+
routineCompletionId = 1,
8182
isModified = false,
8283
subRoutines = listOf(
8384
SubRoutineUiModel(
8485
subRoutineId = "uuid1",
8586
historySeq = 1,
8687
subRoutineName = "물 마시기",
8788
sortOrder = 1,
89+
routineCompletionId = 1,
8890
isCompleted = false,
8991
isModified = false,
9092
routineType = RoutineType.SUB_ROUTINE,
@@ -94,6 +96,7 @@ private fun RoutineItemPreview() {
9496
historySeq = 1,
9597
subRoutineName = "스트레칭하기",
9698
sortOrder = 1,
99+
routineCompletionId = 1,
97100
isCompleted = false,
98101
isModified = false,
99102
routineType = RoutineType.SUB_ROUTINE,
@@ -103,6 +106,7 @@ private fun RoutineItemPreview() {
103106
historySeq = 1,
104107
subRoutineName = "심호흡하기",
105108
sortOrder = 1,
109+
routineCompletionId = 1,
106110
isCompleted = false,
107111
isModified = false,
108112
routineType = RoutineType.SUB_ROUTINE,

‎presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/block/SubRoutinesItem.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ private fun SubRoutinesItemPreview() {
8686
historySeq = 1,
8787
subRoutineName = "물 마시기",
8888
sortOrder = 1,
89+
routineCompletionId = 1,
8990
isCompleted = false,
9091
isModified = false,
9192
routineType = RoutineType.SUB_ROUTINE,
@@ -95,6 +96,7 @@ private fun SubRoutinesItemPreview() {
9596
historySeq = 1,
9697
subRoutineName = "스트레칭하기",
9798
sortOrder = 1,
99+
routineCompletionId = 1,
98100
isCompleted = false,
99101
isModified = false,
100102
routineType = RoutineType.SUB_ROUTINE,
@@ -104,6 +106,7 @@ private fun SubRoutinesItemPreview() {
104106
historySeq = 1,
105107
subRoutineName = "심호흡하기",
106108
sortOrder = 1,
109+
routineCompletionId = 1,
107110
isCompleted = false,
108111
isModified = false,
109112
routineType = RoutineType.SUB_ROUTINE,
@@ -112,3 +115,4 @@ private fun SubRoutinesItemPreview() {
112115
onSubRoutineToggle = { _, _ -> },
113116
)
114117
}
118+

‎presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/RoutineDetailsBottomSheet.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,15 @@ private fun RoutineInfoContentPreview() {
266266
routineName = "개운하게 일어나기",
267267
executionTime = "20:30:00",
268268
isCompleted = false,
269+
routineCompletionId = 1,
269270
isModified = false,
270271
subRoutines = listOf(
271272
SubRoutineUiModel(
272273
subRoutineId = "uuid1",
273274
historySeq = 1,
274275
subRoutineName = "물 마시기",
275276
sortOrder = 1,
277+
routineCompletionId = 1,
276278
isCompleted = false,
277279
isModified = false,
278280
routineType = RoutineType.SUB_ROUTINE,
@@ -282,6 +284,7 @@ private fun RoutineInfoContentPreview() {
282284
historySeq = 1,
283285
subRoutineName = "스트레칭하기",
284286
sortOrder = 1,
287+
routineCompletionId = 1,
285288
isCompleted = false,
286289
isModified = false,
287290
routineType = RoutineType.SUB_ROUTINE,
@@ -291,6 +294,7 @@ private fun RoutineInfoContentPreview() {
291294
historySeq = 1,
292295
subRoutineName = "심호흡하기",
293296
sortOrder = 1,
297+
routineCompletionId = 1,
294298
isCompleted = false,
295299
isModified = false,
296300
routineType = RoutineType.SUB_ROUTINE,
@@ -313,6 +317,7 @@ private fun RoutineInfoContentSinglePreview() {
313317
routineName = "개운하게 일어나기",
314318
executionTime = "20:30:00",
315319
isCompleted = false,
320+
routineCompletionId = 1,
316321
isModified = false,
317322
subRoutines = emptyList(),
318323
repeatDay = emptyList(),

‎presentation/src/main/java/com/threegap/bitnagil/presentation/home/component/template/RoutineSection.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ private fun RoutineTemplatePreview() {
107107
routineId = "uuid1",
108108
routineName = "개운하게 일어나기",
109109
executionTime = "20:30:00",
110+
routineCompletionId = 1,
110111
isCompleted = false,
111112
isModified = false,
112113
subRoutines = listOf(
@@ -115,6 +116,7 @@ private fun RoutineTemplatePreview() {
115116
historySeq = 1,
116117
subRoutineName = "물 마시기",
117118
sortOrder = 1,
119+
routineCompletionId = 1,
118120
isCompleted = false,
119121
isModified = false,
120122
routineType = RoutineType.SUB_ROUTINE,
@@ -124,6 +126,7 @@ private fun RoutineTemplatePreview() {
124126
historySeq = 1,
125127
subRoutineName = "스트레칭하기",
126128
sortOrder = 1,
129+
routineCompletionId = 1,
127130
isCompleted = false,
128131
isModified = false,
129132
routineType = RoutineType.SUB_ROUTINE,
@@ -133,6 +136,7 @@ private fun RoutineTemplatePreview() {
133136
historySeq = 1,
134137
subRoutineName = "심호흡하기",
135138
sortOrder = 1,
139+
routineCompletionId = 1,
136140
isCompleted = false,
137141
isModified = false,
138142
routineType = RoutineType.SUB_ROUTINE,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ data class RoutineUiModel(
1515
val executionTime: String,
1616
val subRoutines: List<SubRoutineUiModel>,
1717
val isModified: Boolean = false,
18+
val routineCompletionId: Int?,
1819
val isCompleted: Boolean = false,
1920
val routineType: RoutineType,
2021
) : Parcelable
@@ -28,6 +29,7 @@ fun Routine.toUiModel(): RoutineUiModel =
2829
executionTime = this.executionTime,
2930
subRoutines = this.subRoutines.map { it.toUiModel() },
3031
isModified = this.isModified,
32+
routineCompletionId = this.routineCompletionId,
3133
isCompleted = this.isCompleted,
3234
routineType = this.routineType,
3335
)

0 commit comments

Comments
 (0)