Skip to content

Commit 7fd4e4f

Browse files
authored
fix: 루틴 등록 및 수정 QA 대응 (#83)
- 세부루틴 옆 i 버튼 삭제 - 수정하기에서 세부 루틴 수정 안되는 문제 해결
1 parent 3965182 commit 7fd4e4f

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

Projects/Presentation/Sources/RoutineCreation/View/RoutineCreationViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ final class RoutineCreationViewController: BaseViewController<RoutineCreationVie
4343
title: "세부루틴",
4444
placeHolder: "ex) 일어나자마자 이불 개기",
4545
titleImage: BitnagilIcon.routineListIcon,
46-
withInfoImage: true,
46+
withInfoImage: false,
4747
withAsteriskImage: false)
4848
private let repeatView = RoutineCreationCardView<RoutineRepeatContentView>(
4949
title: "반복 요일",

Projects/Presentation/Sources/RoutineCreation/ViewModel/RoutineCreationViewModel.swift

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ final class RoutineCreationViewModel: ViewModel {
5656
private let checkRoutinePublisher = CurrentValueSubject<Bool, Never>(false)
5757
private let routineUseCase: RoutineUseCaseProtocol
5858
private let recommenededRoutineUseCase: RecommendedRoutineUseCaseProtocol
59+
private let maxSubRoutineCount: Int = 3
5960
private var deletedSubroutines = Set<SubRoutineSummaryEntity>()
6061
private var routineId: String?
6162
private var routineType: RoutineCategoryType?
@@ -143,7 +144,11 @@ final class RoutineCreationViewModel: ViewModel {
143144
executionType = .init(startAt: time ?? Date())
144145

145146
// TODO: - routine 엔티티 변경 이후 시작일자, 종료 일자 설정 필요 + 추천 타입 있으면 추천 타입도 설정 필요
147+
let periodStart = Date.convertToDate(from: routine.routineStartDate, dateType: .yearMonthDate)
148+
let periodEnd = Date.convertToDate(from: routine.routineEndDate, dateType: .yearMonthDate)
146149

150+
periodStartSubject.send(periodStart)
151+
periodEndSubject.send(periodEnd)
147152
nameSubject.send(routine.routineName)
148153
subRoutinesSubject.send(subRoutines)
149154
repeatTypeSubject.send(repeatType)
@@ -182,9 +187,11 @@ final class RoutineCreationViewModel: ViewModel {
182187
var subRoutines = subRoutinesSubject.value
183188
guard
184189
index >= 0,
185-
index < subRoutines.count
190+
index < maxSubRoutineCount
186191
else { return }
187192

193+
while subRoutines.count <= index { subRoutines.append("") }
194+
188195
subRoutines[index] = name
189196
subRoutinesSubject.send(subRoutines)
190197
}
@@ -268,14 +275,16 @@ final class RoutineCreationViewModel: ViewModel {
268275
repeatDay = []
269276
}
270277

278+
let subroutines = subRoutinesSubject.value.filter { !$0.isEmpty }
279+
271280
let routine = RoutineCreationEntity(
272281
id: routineId,
273282
name: name,
274283
repeatDay: repeatDay,
275284
startDate: startDateString,
276285
endDate: endDateString,
277286
executionTime: executionTimeString,
278-
subroutines: subRoutinesSubject.value,
287+
subroutines: subroutines,
279288
recommendedRoutineType: routineType,
280289
applyDateType: updateType)
281290

0 commit comments

Comments
 (0)