[Fix] 루틴 불러오는 로직 수정

Projects/Presentation/Sources/Home/View/HomeView.swift

@@ -106,13 +106,13 @@ final class HomeView: BaseViewController<HomeViewModel> {
         configureGradientBackground()
         showIndicatorView()
         viewModel.action(input: .loadNickname)
-        viewModel.action(input: .fetchRoutines)
     }
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         configureNavigationBar(navigationStyle: .hidden)
         viewModel.action(input: .loadEmotion)
+        viewModel.action(input: .fetchRoutines)
     }
 
     override func viewDidLayoutSubviews() {

Projects/Presentation/Sources/Home/ViewModel/HomeViewModel.swift

@@ -99,7 +99,7 @@ final class HomeViewModel: ViewModel {
             updateRoutineCompletion(updatedRoutine: updatedRoutine)
 
         case .refreshSelectedDateRoutine:
-            fetchRoutines(for: selectedDateSubject.value)
+            fetchDailyRoutine(for: selectedDateSubject.value)
 
         case .selectRoutineSortType(let routineSortType):
             sortRoutine(routineSortType: routineSortType)
@@ -135,17 +135,51 @@ final class HomeViewModel: ViewModel {
     // MARK: - 루틴
     // 루틴들을 불러옵니다. (처음에는 +-1 주, 그 이후에는 1주씩)
     private func fetchRoutines() {
-        var startDate = oldestDate
-        var endDate = latestDate
-
         if routines.isEmpty {
-            startDate = calendar.date(byAdding: .weekOfYear, value: -1, to: today) ?? today
-            endDate = calendar.date(byAdding: .weekOfYear, value: 1, to: today) ?? today
+            oldestDate = calendar.date(byAdding: .weekOfYear, value: -1, to: today) ?? today
+            latestDate = calendar.date(byAdding: .weekOfYear, value: 1, to: today) ?? today
+        }
+        fetchRoutines(startDate: oldestDate, endDate: latestDate)
+    }
+
+    // 날짜를 선택하고 그 날에 해당하는 루틴을 불러옵니다.
+    private func selectDate(date: Date) {
+        selectedDateSubject.send(date)
+        fetchRoutines()
+        fetchDailyRoutine(for: date)
+    }
+
+    private func fetchDailyRoutine(for date: Date) {
+        if let dailyRoutines = routines[date.convertToString(dateType: .yearMonthDate)] {
+            routinesSubject.send(dailyRoutines)
+            return
+        }
 
+        var startDate: Date = Date()
+        var endDate: Date = Date()
+        if date < oldestDate {
+            // 캐싱된 데이터보다 이전의 날짜 조회 시,
+            startDate = calendar.date(byAdding: .weekOfYear, value: -1, to: oldestDate) ?? oldestDate
+            endDate = calendar.date(byAdding: .day, value: -1, to: oldestDate) ?? oldestDate
             oldestDate = startDate
+        } else if date > latestDate {
+            // 캐싱된 데이터보다 이후의 날짜 조회 시,
+            startDate = calendar.date(byAdding: .day, value: 1, to: latestDate) ?? latestDate
+            endDate = calendar.date(byAdding: .weekOfYear, value: 1, to: latestDate) ?? latestDate
             latestDate = endDate
         }
+        fetchRoutines(startDate: startDate, endDate: endDate)
+
+        if let dailyRoutines = routines[date.convertToString(dateType: .yearMonthDate)] {
+            routinesSubject.send(dailyRoutines)
+            return
+        } else {
+            routinesSubject.send([])
+        }
+    }
 
+    // 서버로부터 루틴들을 불러옵니다.. (루틴 조회 시작 날짜 ~ 루틴 조회 종료 날짜)
+    private func fetchRoutines(startDate: Date, endDate: Date) {
         Task {
             do {
                 let entities = try await routineUseCase.fetchRoutines(startDate: startDate, endDate: endDate)
@@ -154,35 +188,11 @@ final class HomeViewModel: ViewModel {
                 }
                 fetchRoutineResultSubject.send(true)
             } catch {
-
+                // TODO: 에러 처리
             }
         }
     }
 
-    // 날짜를 선택하고 그 날에 해당하는 루틴을 불러옵니다.
-    private func selectDate(date: Date) {
-        selectedDateSubject.send(date)
-        fetchRoutines(for: date)
-    }
-
-    // 선택한 날의 루틴을 필터링하여 보여줍니다. (oldestDate, latestDate 업데이트)
-    private func fetchRoutines(for date: Date) {
-        if date <= oldestDate {
-            oldestDate = calendar.date(byAdding: .weekOfYear, value: -1, to: date) ?? date
-            latestDate = calendar.date(byAdding: .day, value: -1, to: date) ?? date
-        } else if date >= latestDate {
-            oldestDate = calendar.date(byAdding: .day, value: 1, to: date) ?? date
-            latestDate = calendar.date(byAdding: .weekOfYear, value: 1, to: date) ?? date
-        }
-
-        let dateKey = date.convertToString(dateType: .yearMonthDate)
-        guard let dailyRoutines = routines[dateKey] else {
-            fetchRoutines()
-            return
-        }
-        routinesSubject.send(dailyRoutines)
-    }
-
     // 반복 루틴을 삭제합니다.
     private func deleteAllRoutine() {
         guard let routineId = selectedRoutineSubject.value?.id

Projects/Presentation/Sources/RecommendedRoutine/View/RecommendedRoutineView.swift

@@ -327,6 +327,7 @@ extension RecommendedRoutineView: FloatingMenuViewDelegate {
             fatalError("routineCreationViewModel 의존성이 등록되지 않았습니다.")
         }
         let routineCreationView = RoutineCreationView(viewModel: routineCreationViewModel)
+        routineCreationView.hidesBottomBarWhenPushed = true
         self.navigationController?.pushViewController(routineCreationView, animated: true)
     }
 }

Projects/Presentation/Sources/ResultRecommendedRoutine/View/ResultRecommendedRoutineView.swift

@@ -368,6 +368,7 @@ final class ResultRecommendedRoutineView: BaseViewController<ResultRecommendedRo
         guard let routineCreationViewModel = DIContainer.shared.resolve(type: RoutineCreationViewModel.self)
         else { fatalError("routineCreationViewModel 의존성이 등록되지 않았습니다.") }
         let routineCreationView = RoutineCreationView(viewModel: routineCreationViewModel, recommendRoutineId: routineId)
+        routineCreationView.hidesBottomBarWhenPushed = true
         self.navigationController?.pushViewController(routineCreationView, animated: true)
     }
 }

Projects/Presentation/Sources/RoutineCreation/View/Component/RoutineCreationInputView.swift

@@ -48,6 +48,8 @@ final class RoutineCreationInputView: UIView {
         textField.delegate = self
         textField.textColor = .black
         textField.font = BitnagilFont.init(style: .body2, weight: .semiBold).font
+        textField.returnKeyType = .done
+        textField.addTarget(self, action: #selector(textFieldEditingChanged(_:)), for: .editingChanged)
 
         deleteButton.setImage(BitnagilIcon.deleteIcon, for: .normal)
         deleteButton.addAction(
@@ -93,13 +95,15 @@ final class RoutineCreationInputView: UIView {
     func configure(title: String) {
         textField.text = title
     }
+
+    @objc private func textFieldEditingChanged(_ sender: UITextField) {
+        delegate?.routineCreationInputView(self, didChangeText: sender.text ?? "")
+    }
 }
 
 extension RoutineCreationInputView: UITextFieldDelegate {
-    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
-        if let text = textField.text {
-            delegate?.routineCreationInputView(self, didChangeText: text)
-        }
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        textField.resignFirstResponder()
         return true
     }
 }

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

@@ -621,6 +621,8 @@ final class RoutineCreationView: BaseViewController<RoutineCreationViewModel> {
             repeatInfoButton.isSelected = false
             repeatToolTipView.hideTooltip()
         }
+
+        view.endEditing(true)
     }
 }
 

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

@@ -272,12 +272,7 @@ final class RoutineCreationViewModel: ViewModel {
         guard
             let name = nameSubject.value,
             !name.isEmpty,
-            executionTimeSubject.value != .none,
-            weekDaySubject.value.count > 0,
-            subRoutinesSubject
-                .value
-                .map({$0.subRoutineName})
-                .allSatisfy({$0?.isEmpty == false })
+            executionTimeSubject.value != .none
         else {
             checkRoutinePublisher.send(false)
             return

SupportingFiles/Info.plist

@@ -62,5 +62,7 @@
 	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
+	<key>UIRequiresFullScreen</key>
+	<true/>
 </dict>
 </plist>