Skip to content

[Fix] 루틴 등록 및 수정 QA 대응 #83

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
taipaise merged 1 commit into from
Feb 16, 2026
Merged

[Fix] 루틴 등록 및 수정 QA 대응 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Projects/Presentation/Sources/RoutineCreation/View/RoutineCreationViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ final class RoutineCreationViewController: BaseViewController<RoutineCreationVie
title: "세부루틴",
placeHolder: "ex) 일어나자마자 이불 개기",
titleImage: BitnagilIcon.routineListIcon,
withInfoImage: true,
withInfoImage: false,
withAsteriskImage: false)
private let repeatView = RoutineCreationCardView<RoutineRepeatContentView>(
title: "반복 요일",
Expand Down
13 changes: 11 additions & 2 deletions Projects/Presentation/Sources/RoutineCreation/ViewModel/RoutineCreationViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ final class RoutineCreationViewModel: ViewModel {
private let checkRoutinePublisher = CurrentValueSubject<Bool, Never>(false)
private let routineUseCase: RoutineUseCaseProtocol
private let recommenededRoutineUseCase: RecommendedRoutineUseCaseProtocol
private let maxSubRoutineCount: Int = 3
private var deletedSubroutines = Set<SubRoutineSummaryEntity>()
private var routineId: String?
private var routineType: RoutineCategoryType?
Expand Down Expand Up @@ -143,7 +144,11 @@ final class RoutineCreationViewModel: ViewModel {
executionType = .init(startAt: time ?? Date())

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

periodStartSubject.send(periodStart)
periodEndSubject.send(periodEnd)
nameSubject.send(routine.routineName)
subRoutinesSubject.send(subRoutines)
repeatTypeSubject.send(repeatType)
Expand Down Expand Up @@ -182,9 +187,11 @@ final class RoutineCreationViewModel: ViewModel {
var subRoutines = subRoutinesSubject.value
guard
index >= 0,
index < subRoutines.count
index < maxSubRoutineCount
else { return }

while subRoutines.count <= index { subRoutines.append("") }

subRoutines[index] = name
subRoutinesSubject.send(subRoutines)
}
Expand Down Expand Up @@ -268,14 +275,16 @@ final class RoutineCreationViewModel: ViewModel {
repeatDay = []
}

let subroutines = subRoutinesSubject.value.filter { !$0.isEmpty }

let routine = RoutineCreationEntity(
id: routineId,
name: name,
repeatDay: repeatDay,
startDate: startDateString,
endDate: endDateString,
executionTime: executionTimeString,
subroutines: subRoutinesSubject.value,
subroutines: subroutines,
recommendedRoutineType: routineType,
applyDateType: updateType)

Expand Down