Skip to content

Commit a64ea30

Browse files
committed
Refactor: recommendedRoutineType 타입을 RecommendCategory로 변경
1 parent a9602ac commit a64ea30

6 files changed

Lines changed: 11 additions & 6 deletions

File tree

data/src/main/java/com/threegap/bitnagil/data/writeroutine/model/request/RegisterRoutineRequest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.threegap.bitnagil.data.writeroutine.model.request
22

3+
import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
34
import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay
45
import kotlinx.serialization.SerialName
56
import kotlinx.serialization.Serializable
@@ -19,5 +20,5 @@ data class RegisterRoutineRequest(
1920
@SerialName("subRoutineName")
2021
val subRoutineName: List<String>,
2122
@SerialName("recommendedRoutineType")
22-
val recommendedRoutineType: String?,
23+
val recommendedRoutineType: RecommendCategory?,
2324
)

data/src/main/java/com/threegap/bitnagil/data/writeroutine/repositoryImpl/WriteRoutineRepositoryImpl.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.threegap.bitnagil.data.writeroutine.repositoryImpl
33
import com.threegap.bitnagil.data.writeroutine.datasource.WriteRoutineDataSource
44
import com.threegap.bitnagil.data.writeroutine.model.request.EditRoutineRequest
55
import com.threegap.bitnagil.data.writeroutine.model.request.RegisterRoutineRequest
6+
import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
67
import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay
78
import com.threegap.bitnagil.domain.writeroutine.model.RoutineUpdateType
89
import com.threegap.bitnagil.domain.writeroutine.model.WriteRoutineEvent
@@ -24,7 +25,7 @@ class WriteRoutineRepositoryImpl @Inject constructor(
2425
startDate: LocalDate,
2526
endDate: LocalDate,
2627
subRoutines: List<String>,
27-
recommendedRoutineType: String?,
28+
recommendedRoutineType: RecommendCategory?,
2829
): Result<Unit> {
2930
val request = RegisterRoutineRequest(
3031
routineName = name,

domain/src/main/java/com/threegap/bitnagil/domain/writeroutine/repository/WriteRoutineRepository.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.threegap.bitnagil.domain.writeroutine.repository
22

3+
import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
34
import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay
45
import com.threegap.bitnagil.domain.writeroutine.model.RoutineUpdateType
56
import com.threegap.bitnagil.domain.writeroutine.model.WriteRoutineEvent
@@ -15,7 +16,7 @@ interface WriteRoutineRepository {
1516
startDate: LocalDate,
1617
endDate: LocalDate,
1718
subRoutines: List<String>,
18-
recommendedRoutineType: String?,
19+
recommendedRoutineType: RecommendCategory?,
1920
): Result<Unit>
2021

2122
suspend fun editRoutine(

domain/src/main/java/com/threegap/bitnagil/domain/writeroutine/usecase/RegisterRoutineUseCase.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.threegap.bitnagil.domain.writeroutine.usecase
22

3+
import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
34
import com.threegap.bitnagil.domain.writeroutine.model.RepeatDay
45
import com.threegap.bitnagil.domain.writeroutine.repository.WriteRoutineRepository
56
import java.time.LocalDate
@@ -16,7 +17,7 @@ class RegisterRoutineUseCase @Inject constructor(
1617
startDate: LocalDate,
1718
endDate: LocalDate,
1819
subRoutines: List<String>,
19-
recommendedRoutineType: String?,
20+
recommendedRoutineType: RecommendCategory?,
2021
): Result<Unit> {
2122
return writeRoutineRepository.registerRoutine(
2223
name = name,

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class WriteRoutineViewModel @AssistedInject constructor(
147147
oldSubRoutines.getOrNull(2)?.name ?: "",
148148
),
149149
loading = false,
150-
recommendedRoutineType = routine.category.displayTitle,
150+
recommendedRoutineType = routine.category,
151151
)
152152
}
153153
},

presentation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/contract/WriteRoutineState.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.threegap.bitnagil.presentation.writeroutine.contract
22

33
import android.os.Parcelable
4+
import com.threegap.bitnagil.domain.recommendroutine.model.RecommendCategory
45
import com.threegap.bitnagil.presentation.writeroutine.model.Date
56
import com.threegap.bitnagil.presentation.writeroutine.model.Day
67
import com.threegap.bitnagil.presentation.writeroutine.model.RepeatType
@@ -29,7 +30,7 @@ data class WriteRoutineState(
2930
val repeatDaysUiExpanded: Boolean,
3031
val periodUiExpanded: Boolean,
3132
val startTimeUiExpanded: Boolean,
32-
val recommendedRoutineType: String?,
33+
val recommendedRoutineType: RecommendCategory?,
3334
) : Parcelable {
3435
companion object {
3536
val INIT = WriteRoutineState(

0 commit comments

Comments
 (0)