Refactor: 토끼 리뷰 반영

choijungp · choijungp · commit 0b2dfa467af4 · 2025-08-21T17:15:52.000+09:00
diff --git a/Projects/Presentation/Sources/Common/Component/RoutineCardView.swift b/Projects/Presentation/Sources/Common/Component/RoutineCardView.swift
@@ -122,20 +122,20 @@ final class RoutineCardView: UIView {
             subRoutineLabel.text = "세부 루틴"
             subRoutineLabel.font = BitnagilFont(style: .body2, weight: .medium).font
             subRoutineLabel.textColor = BitnagilColor.gray40
+            subRoutineStackView.addArrangedSubview(subRoutineLabel)
             subRoutineLabel.snp.makeConstraints { make in
                 make.height.equalTo(Layout.subLabelHeight)
             }
-            subRoutineStackView.addArrangedSubview(subRoutineLabel)
 
             routine.subRoutines.forEach {
                 let subRoutineTitleLabel = UILabel()
                 subRoutineTitleLabel.text = "• \($0)"
                 subRoutineTitleLabel.font = BitnagilFont(style: .body2, weight: .medium).font
                 subRoutineTitleLabel.textColor = BitnagilColor.gray40
+                subRoutineStackView.addArrangedSubview(subRoutineTitleLabel)
                 subRoutineTitleLabel.snp.makeConstraints { make in
                     make.height.equalTo(Layout.subLabelHeight)
                 }
-                subRoutineStackView.addArrangedSubview(subRoutineTitleLabel)
             }
         } else {
             grayLine.isHidden = true
@@ -154,11 +154,10 @@ final class RoutineCardView: UIView {
             repeatDayLabel.text = "반복: \(repeatDayText)"
             repeatDayLabel.font = BitnagilFont(style: .body2, weight: .medium).font
             repeatDayLabel.textColor = BitnagilColor.gray40
+            infoStackView.addArrangedSubview(repeatDayLabel)
             repeatDayLabel.snp.makeConstraints { make in
                 make.height.equalTo(Layout.subLabelHeight)
             }
-            infoStackView.addArrangedSubview(repeatDayLabel)
-
 
             // 기간
             let periodLabel = UILabel()
@@ -168,22 +167,21 @@ final class RoutineCardView: UIView {
             periodLabel.text = "기간: \(periodText)"
             periodLabel.font = BitnagilFont(style: .body2, weight: .medium).font
             periodLabel.textColor = BitnagilColor.gray40
+            infoStackView.addArrangedSubview(periodLabel)
             periodLabel.snp.makeConstraints { make in
                 make.height.equalTo(Layout.subLabelHeight)
             }
-            infoStackView.addArrangedSubview(periodLabel)
-
 
             // 시간
             let timeLabel = UILabel()
             let textTime = mainRoutine.startTime.convertToString(dateType: .time24hour) == "00:00" ? "하루종일" : mainRoutine.startTime.convertToString(dateType: .amPmTime)
             timeLabel.text = "시간: \(textTime)"
             timeLabel.font = BitnagilFont(style: .body2, weight: .medium).font
             timeLabel.textColor = BitnagilColor.gray40
+            infoStackView.addArrangedSubview(timeLabel)
             timeLabel.snp.makeConstraints { make in
                 make.height.equalTo(Layout.subLabelHeight)
             }
-            infoStackView.addArrangedSubview(timeLabel)
         } else {
             grayLine2.isHidden = true
             infoStackView.isHidden = true
@@ -212,7 +210,7 @@ final class RoutineCardView: UIView {
 
         plusButton.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(Layout.plusButtonTopSpacing)
-            make.trailing.equalToSuperview().inset(Layout.buttonTrailingSpacing)
+            make.trailing.equalToSuperview().offset(-Layout.buttonTrailingSpacing)
             make.size.equalTo(Layout.plusButtonSize)
         }
 
@@ -242,7 +240,7 @@ final class RoutineCardView: UIView {
 
             editButton.snp.makeConstraints { make in
                 make.top.equalToSuperview().offset(Layout.plusButtonTopSpacing)
-                make.trailing.equalTo(deleteButton).inset(Layout.editButtonTrailingSpacing)
+                make.trailing.equalTo(deleteButton).offset(-Layout.editButtonTrailingSpacing)
                 make.size.equalTo(Layout.plusButtonSize)
             }
 
diff --git a/Projects/Presentation/Sources/Home/ViewModel/HomeViewModel.swift b/Projects/Presentation/Sources/Home/ViewModel/HomeViewModel.swift
@@ -18,8 +18,6 @@ final class HomeViewModel: ViewModel {
         case selectRoutineListDate
         case fetchRoutines
         case selectRoutine(routine: Routine?)
-        case deleteDailyRoutine
-        case deleteAllRoutine
         case updateRoutineCompletion(updatedRoutine: Routine)
         case refreshSelectedDateRoutine
     }
@@ -31,7 +29,6 @@ final class HomeViewModel: ViewModel {
         let routineListDatePublisher: AnyPublisher<Date, Never>
         let fetchRoutineResultPublisher: AnyPublisher<Bool, Never>
         let routinesPublisher: AnyPublisher<[Routine], Never>
-        let deleteRoutineResultPublisher: AnyPublisher<Bool, Never>
         let updateRoutineCompletionResultPublisher: AnyPublisher<Bool, Never>
     }
 
@@ -44,7 +41,6 @@ final class HomeViewModel: ViewModel {
     private let fetchRoutineResultSubject = PassthroughSubject<Bool, Never>()
     private let routinesSubject = CurrentValueSubject<[Routine], Never>([])
     private let selectedRoutineSubject = CurrentValueSubject<Routine?, Never>(nil)
-    private let deleteRoutineResultSubject = PassthroughSubject<Bool, Never>()
     private let updateRoutineCompletionResultSubject = PassthroughSubject<Bool, Never>()
 
     private let calendar = Calendar.current
@@ -70,7 +66,6 @@ final class HomeViewModel: ViewModel {
             routineListDatePublisher: routineListDateSubject.eraseToAnyPublisher(),
             fetchRoutineResultPublisher: fetchRoutineResultSubject.eraseToAnyPublisher(),
             routinesPublisher: routinesSubject.eraseToAnyPublisher(),
-            deleteRoutineResultPublisher: deleteRoutineResultSubject.eraseToAnyPublisher(),
             updateRoutineCompletionResultPublisher: updateRoutineCompletionResultSubject.eraseToAnyPublisher()
         )
     }
@@ -99,12 +94,6 @@ final class HomeViewModel: ViewModel {
         case .selectRoutine(let routine):
             selectedRoutineSubject.send(routine)
 
-        case .deleteDailyRoutine:
-            deleteDailyRoutine()
-
-        case .deleteAllRoutine:
-            deleteAllRoutine()
-
         case .updateRoutineCompletion(let updatedRoutine):
             updateRoutineCompletion(updatedRoutine: updatedRoutine)
 
@@ -209,51 +198,6 @@ final class HomeViewModel: ViewModel {
         }
     }
 
-    // 반복 루틴을 삭제합니다.
-    private func deleteAllRoutine() {
-        guard let routineId = selectedRoutineSubject.value?.id
-        else { return }
-
-        Task {
-            do {
-                try await routineUseCase.deleteAllRoutine(routineId: routineId)
-                selectedRoutineSubject.send(nil)
-                deleteRoutineResultSubject.send(true)
-                fetchRoutines()
-            } catch {
-                deleteRoutineResultSubject.send(false)
-            }
-        }
-    }
-
-    // 당일 루틴을 삭제합니다.
-    private func deleteDailyRoutine() {
-        /*
-        guard let routine = selectedRoutineSubject.value
-        else { return }
-
-        let deleteSubRoutineEntity = routine.subRoutines.map({
-            DeleteSubRoutineEntity(subRoutineId: $0.id, routineCompletionId: $0.completionId) })
-        let deleteRoutinEntity = DeleteRoutineEntity(
-            routineId: routine.id,
-            routineCompletionId: routine.completionId,
-            historySeq: routine.historySeq,
-            performedDate: selectedDateSubject.value.convertToString(dateType: .yearMonthDate),
-            routineType: routine.routineType,
-            subRoutineInfosForDelete: deleteSubRoutineEntity)
-
-        Task {
-            do {
-                try await routineUseCase.deleteDailyRoutine(routine: deleteRoutinEntity)
-                deleteRoutineResultSubject.send(true)
-                fetchRoutines()
-            } catch {
-                deleteRoutineResultSubject.send(false)
-            }
-        }
-         */
-    }
-
     // 루틴의 완료 여부를 업데이트 합니다.
     private func updateRoutineCompletion(updatedRoutine: Routine) {
         /*
diff --git a/Projects/Presentation/Sources/Onboarding/Model/OnboardingChoiceType.swift b/Projects/Presentation/Sources/Onboarding/Model/OnboardingChoiceType.swift
@@ -8,7 +8,6 @@
 import Domain
 
 extension OnboardingChoiceType: OnboardingChoiceProtocol {
-
     var title: String {
         switch self {
         case .morningTime: "아침을 잘 시작하고 싶어요."
diff --git a/Projects/Presentation/Sources/Onboarding/Model/OnboardingType.swift b/Projects/Presentation/Sources/Onboarding/Model/OnboardingType.swift
@@ -8,7 +8,6 @@
 import Domain
 
 extension OnboardingType {
-    
     var step: Int {
         switch self {
         case .time: 1
diff --git a/Projects/Presentation/Sources/RoutineList/View/RoutineEditAlertViewController.swift b/Projects/Presentation/Sources/RoutineList/View/RoutineEditAlertViewController.swift
@@ -58,7 +58,7 @@ final class RoutineEditAlertViewController: UIViewController {
         applyTodayButton.addAction(
             UIAction { [weak self] _ in
                 self?.dismiss(animated: true) {
-                    self?.goToRoutineCreationView?(false)
+                    self?.goToRoutineCreationView?(true)
                 }
             },
             for: .touchUpInside)
diff --git a/Projects/Presentation/Sources/RoutineList/View/RoutineListViewController.swift b/Projects/Presentation/Sources/RoutineList/View/RoutineListViewController.swift
@@ -172,7 +172,7 @@ extension RoutineListViewController: RoutineCardViewDelegate {
     func routineCardView(_ sender: RoutineCardView, didTapPlusButton routine: RecommendedRoutine) { }
 
     func routineCardView(_ sender: RoutineCardView, didTapEditButton routine: Routine) {
-        viewModel.action(input: .seleteRoutine(routine: routine))
+        viewModel.action(input: .selectRoutine(routine: routine))
 
         guard !routine.repeatDay.isEmpty else {
             goToRoutineCreationView(routineId: routine.id)
@@ -212,7 +212,7 @@ extension RoutineListViewController: RoutineCardViewDelegate {
     }
     
     func routineCardView(_ sender: RoutineCardView, didTapDeleteButton routine: Routine) {
-        viewModel.action(input: .seleteRoutine(routine: routine))
+        viewModel.action(input: .selectRoutine(routine: routine))
 
         dimmedView?.removeFromSuperview()
 
diff --git a/Projects/Presentation/Sources/RoutineList/ViewModel/RoutineListViewModel.swift b/Projects/Presentation/Sources/RoutineList/ViewModel/RoutineListViewModel.swift
@@ -14,7 +14,7 @@ final class RoutineListViewModel: ViewModel {
         case fetchRoutineList
         case fetchDailyRoutine
         case selectDate(date: Date)
-        case seleteRoutine(routine: Routine?)
+        case selectRoutine(routine: Routine?)
         case deleteRoutine(isDeleteAllRoutines: Bool)
     }
 
@@ -56,7 +56,7 @@ final class RoutineListViewModel: ViewModel {
             selectedDateSubject.send(date)
             fetchDailyRoutine()
 
-        case .seleteRoutine(let routine):
+        case .selectRoutine(let routine):
             selectedRoutine.value = routine
 
         case .deleteRoutine(let isDeleteAllRoutines):

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ final class RoutineEditAlertViewController: UIViewController {`
`58`	`58`	`applyTodayButton.addAction(`
`59`	`59`	`UIAction { [weak self] _ in`
`60`	`60`	`self?.dismiss(animated: true) {`
`61`		`- self?.goToRoutineCreationView?(false)`
	`61`	`+ self?.goToRoutineCreationView?(true)`
`62`	`62`	`}`
`63`	`63`	`},`
`64`	`64`	`for: .touchUpInside)`