Feat: 온보딩 선택 결과 바탕으로 추천 받은 루틴 등록 구현 (#T3-102)

choijungp · choijungp · commit 032a2edb2c5f · 2025-07-16T02:08:50.000+09:00
diff --git a/Projects/DataSource/Sources/Endpoint/OnboardingEndpoint.swift b/Projects/DataSource/Sources/Endpoint/OnboardingEndpoint.swift
@@ -9,6 +9,7 @@ import Foundation
 
 enum OnboardingEndpoint {
     case registerOnboarding(accessToken: String, choices: [String: String])
+    case registerRecommendedRoutine(accessToken: String, selectedRoutines: [Int])
 }
 
 extension OnboardingEndpoint: Endpoint {
@@ -19,6 +20,7 @@ extension OnboardingEndpoint: Endpoint {
     var path: String {
         switch self {
         case .registerOnboarding: baseURL
+        case .registerRecommendedRoutine: baseURL + "/routines"
         }
     }
     
@@ -35,6 +37,8 @@ extension OnboardingEndpoint: Endpoint {
         switch self {
         case .registerOnboarding(let accessToken, _):
             headers["Authorization"] = "Bearer \(accessToken)"
+        case .registerRecommendedRoutine(let accessToken, _):
+            headers["Authorization"] = "Bearer \(accessToken)"
         }
 
         return headers
@@ -48,6 +52,8 @@ extension OnboardingEndpoint: Endpoint {
         switch self {
         case .registerOnboarding(_, let choices):
             return choices
+        case .registerRecommendedRoutine(_, let selectedRoutines):
+            return ["recommendedRoutineIds": selectedRoutines]
         }
     }
 }
diff --git a/Projects/DataSource/Sources/Repository/OnboardingRepository.swift b/Projects/DataSource/Sources/Repository/OnboardingRepository.swift
@@ -27,6 +27,12 @@ final class OnboardingRepository: OnboardingRepositoryProtocol {
         return recommendedRoutineEntity
     }
 
+    func registerRecommendedRoutines(selectedRoutines: [Int]) async throws {
+        let accessToken = try loadToken(tokenType: .accessToken)
+        let endpoint = OnboardingEndpoint.registerRecommendedRoutine(accessToken: accessToken, selectedRoutines: selectedRoutines)
+        _ = try await networkService.request(endpoint: endpoint, type: EmptyResponseDTO.self)
+    }
+
     private func loadToken(tokenType: TokenType) throws -> String {
         guard let token = keychainStorage.load(forKey: tokenType.rawValue) else {
             throw AuthError.tokenLoadFailed
diff --git a/Projects/Domain/Sources/Protocol/Repository/OnboardingRepositoryProtocol.swift b/Projects/Domain/Sources/Protocol/Repository/OnboardingRepositoryProtocol.swift
@@ -10,4 +10,8 @@ public protocol OnboardingRepositoryProtocol {
     /// - Parameter onboardingChoices: 선택한 온보딩 항목 Dictionary
     /// - Returns: 온보딩 결과를 바탕으로 받은 추천루틴 목록
     func registerOnboarding(onboardingChoices: [String: String]) async throws -> [RecommendedRoutineEntity]
+
+    /// 선택한 추천 루틴을 등록합니다.
+    /// - Parameter selectedRoutines: 선택한 추천 루틴 ID 목록
+    func registerRecommendedRoutines(selectedRoutines: [Int]) async throws
 }
diff --git a/Projects/Domain/Sources/Protocol/UseCase/OnboardingUseCaseProtocol.swift b/Projects/Domain/Sources/Protocol/UseCase/OnboardingUseCaseProtocol.swift
@@ -10,4 +10,8 @@ public protocol OnboardingUseCaseProtocol {
     /// - Parameter onboardingChoices: 선택한 온보딩 항목
     /// - Returns: 온보딩 결과를 바탕으로 받은 추천루틴 목록
     func registerOnboarding(onboardingChoices: [OnboardingChoiceType]) async throws -> [RecommendedRoutineEntity]
+
+    /// 선택한 추천 루틴을 등록합니다.
+    /// - Parameter selectedRoutines: 선택한 추천 루틴 ID 목록
+    func registerRecommendedRoutines(selectedRoutines: [Int]) async throws
 }
diff --git a/Projects/Domain/Sources/UseCase/Onboarding/OnboardingUseCase.swift b/Projects/Domain/Sources/UseCase/Onboarding/OnboardingUseCase.swift
@@ -20,6 +20,10 @@ public final class OnboardingUseCase: OnboardingUseCaseProtocol {
         return recommendedRoutines
     }
 
+    public func registerRecommendedRoutines(selectedRoutines: [Int]) async throws {
+        try await onboardingRepository.registerRecommendedRoutines(selectedRoutines: selectedRoutines)
+    }
+
     private func convertToDictionary(onboardingChoices: [OnboardingChoiceType]) -> [String: String] {
         guard
             let timeSlot = onboardingChoices.filter({ $0.onboardingType == .time }).first,
@@ -35,7 +39,4 @@ public final class OnboardingUseCase: OnboardingUseCaseProtocol {
         }
         return result
     }
-
-    private func convertTo() {
-    }
 }
diff --git a/Projects/Presentation/Sources/Onboarding/View/OnboardingRecommendedRoutineView.swift b/Projects/Presentation/Sources/Onboarding/View/OnboardingRecommendedRoutineView.swift
@@ -8,6 +8,7 @@
 import UIKit
 import Combine
 import Domain
+import Shared
 
 final class OnboardingRecommendedRoutineView: BaseViewController<OnboardingViewModel> {
 
@@ -20,7 +21,9 @@ final class OnboardingRecommendedRoutineView: BaseViewController<OnboardingViewM
         static let routineStackViewTopSpacing: CGFloat = 28
         static let routineButtonHeight: CGFloat = 84
         static let registerButtonHeight: CGFloat = 54
-        static let registerButtonBottomSpacing: CGFloat = 20
+        static let registerButtonBottomSpacing: CGFloat = 10
+        static let skipButtonHeight: CGFloat = 54
+        static let skipButtonBottomSpacing: CGFloat = 20
 
         static var mainLabelTopSpacing: CGFloat {
             let height = UIScreen.main.bounds.height
@@ -34,6 +37,8 @@ final class OnboardingRecommendedRoutineView: BaseViewController<OnboardingViewM
     private let recommendedRoutineStackView = UIStackView()
     private var recommendedRoutines: [Int: OnboardingChoiceButton] = [:]
     private let registerButton = PrimaryButton(buttonState: .disabled, buttonTitle: "등록하기")
+    private let skipButtonLabel = UILabel()
+    private let skipButton = UIButton()
     private var cancellables: Set<AnyCancellable>
 
     override init(viewModel: OnboardingViewModel) {
@@ -82,6 +87,20 @@ final class OnboardingRecommendedRoutineView: BaseViewController<OnboardingViewM
         registerButton.addAction(UIAction { [weak self] _ in
             self?.viewModel.action(input: .registerRecommendedRoutine)
         }, for: .touchUpInside)
+
+        skipButtonLabel.do {
+            $0.attributedText = BitnagilFont(
+                fontSize: 14,
+                lineHeight: 20,
+                underline: true,
+                weight: .regular
+            ).attributedString(text: "건너뛰기")
+            $0.textColor = BitnagilColor.navy500
+        }
+
+        skipButton.addAction(UIAction { [weak self] _ in
+            self?.goToHomeView()
+        }, for: .touchUpInside)
     }
 
     override func configureLayout() {
@@ -92,6 +111,8 @@ final class OnboardingRecommendedRoutineView: BaseViewController<OnboardingViewM
         view.addSubview(subLabel)
         view.addSubview(recommendedRoutineStackView)
         view.addSubview(registerButton)
+        skipButton.addSubview(skipButtonLabel)
+        view.addSubview(skipButton)
 
         mainLabel.snp.makeConstraints { make in
             make.leading.equalTo(safeArea).offset(Layout.horizontalMargin)
@@ -116,9 +137,20 @@ final class OnboardingRecommendedRoutineView: BaseViewController<OnboardingViewM
         registerButton.snp.makeConstraints { make in
             make.leading.equalTo(safeArea).offset(Layout.horizontalMargin)
             make.trailing.equalTo(safeArea).inset(Layout.horizontalMargin)
-            make.bottom.equalTo(safeArea).inset(Layout.registerButtonBottomSpacing)
+            make.bottom.equalTo(skipButton.snp.top).offset(-Layout.registerButtonBottomSpacing)
             make.height.equalTo(Layout.registerButtonHeight)
         }
+
+        skipButtonLabel.snp.makeConstraints { make in
+            make.center.equalToSuperview()
+        }
+
+        skipButton.snp.makeConstraints { make in
+            make.leading.equalTo(safeArea).offset(Layout.horizontalMargin)
+            make.trailing.equalTo(safeArea).inset(Layout.horizontalMargin)
+            make.bottom.equalTo(safeArea).inset(Layout.skipButtonBottomSpacing)
+            make.height.equalTo(Layout.skipButtonHeight)
+        }
     }
 
     override func bind() {
@@ -142,6 +174,18 @@ final class OnboardingRecommendedRoutineView: BaseViewController<OnboardingViewM
                 self?.registerButton.updateButtonState(buttonState: canRegister ? .default : .disabled)
             }
             .store(in: &cancellables)
+
+        viewModel.output.registerRoutineResultPublisher
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] registerResult in
+                if registerResult {
+                    BitnagilLogger.log(logType: .debug, message: "추천 루틴 등록 완료")
+                    self?.goToHomeView()
+                } else {
+                    BitnagilLogger.log(logType: .error, message: "추천 루틴 등록 실패")
+                }
+            }
+            .store(in: &cancellables)
     }
 
     private func updateRecommendedRoutines(routines: Set<RecommendedRoutine>) {
@@ -176,4 +220,12 @@ final class OnboardingRecommendedRoutineView: BaseViewController<OnboardingViewM
             }
         }
     }
+
+    private func goToHomeView() {
+        guard let homeViewModel = DIContainer.shared.resolve(type: HomeViewModel.self) else {
+            fatalError("homeViewModel 의존성이 등록되지 않았습니다.")
+        }
+        let homeView = HomeViewController(viewModel: homeViewModel)
+        self.navigationController?.pushViewController(homeView, animated: true)
+    }
 }
diff --git a/Projects/Presentation/Sources/Onboarding/ViewModel/OnboardingViewModel.swift b/Projects/Presentation/Sources/Onboarding/ViewModel/OnboardingViewModel.swift
@@ -27,6 +27,7 @@ final class OnboardingViewModel: ViewModel {
         let onboardingResultPublisher: AnyPublisher<[String], Never>
         let recommendedRoutinePublisher: AnyPublisher<Set<RecommendedRoutine>, Never>
         let selectedRoutinePublisher: AnyPublisher<Set<RecommendedRoutine>, Never>
+        let registerRoutineResultPublisher: AnyPublisher<Bool, Never>
         let nextButtonPublisher: AnyPublisher<Bool, Never>
     }
 
@@ -38,6 +39,7 @@ final class OnboardingViewModel: ViewModel {
     private let onboardingResultSubject = CurrentValueSubject<[String], Never>([])
     private let recommendedRoutineSubject = CurrentValueSubject<Set<RecommendedRoutine>, Never>([])
     private let selectedRoutineSubject = CurrentValueSubject<Set<RecommendedRoutine>, Never>([])
+    private let registerRoutineResultSubject = PassthroughSubject<Bool, Never>()
     private let nextButtonSubject = PassthroughSubject<Bool, Never>()
 
     private let onboardingUseCase: OnboardingUseCaseProtocol
@@ -51,6 +53,7 @@ final class OnboardingViewModel: ViewModel {
             onboardingResultPublisher: onboardingResultSubject.eraseToAnyPublisher(),
             recommendedRoutinePublisher: recommendedRoutineSubject.eraseToAnyPublisher(),
             selectedRoutinePublisher: selectedRoutineSubject.eraseToAnyPublisher(),
+            registerRoutineResultPublisher: registerRoutineResultSubject.eraseToAnyPublisher(),
             nextButtonPublisher: nextButtonSubject.eraseToAnyPublisher()
         )
     }
@@ -225,6 +228,16 @@ final class OnboardingViewModel: ViewModel {
 
     // 추천 루틴을 등록합니다.
     private func registerRecommendedRoutine() {
-        // TODO: 서버 API 만들어진 후 UseCase와 연동하는 작업이 필요합니다.
+        let selectedRoutinesId = selectedRoutineSubject.value.map({ $0.id })
+
+        Task {
+            do {
+                try await onboardingUseCase.registerRecommendedRoutines(selectedRoutines: selectedRoutinesId)
+                registerRoutineResultSubject.send(true)
+            } catch {
+                BitnagilLogger.log(logType: .error, message: "\(error.localizedDescription)")
+                registerRoutineResultSubject.send(false)
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import Foundation`
`9`	`9`
`10`	`10`	`enum OnboardingEndpoint {`
`11`	`11`	`case registerOnboarding(accessToken: String, choices: [String: String])`
	`12`	`+ case registerRecommendedRoutine(accessToken: String, selectedRoutines: [Int])`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`extension OnboardingEndpoint: Endpoint {`
`@@ -19,6 +20,7 @@ extension OnboardingEndpoint: Endpoint {`
`19`	`20`	`var path: String {`
`20`	`21`	`switch self {`
`21`	`22`	`case .registerOnboarding: baseURL`
	`23`	`+ case .registerRecommendedRoutine: baseURL + "/routines"`
`22`	`24`	`}`
`23`	`25`	`}`
`24`	`26`
`@@ -35,6 +37,8 @@ extension OnboardingEndpoint: Endpoint {`
`35`	`37`	`switch self {`
`36`	`38`	`case .registerOnboarding(let accessToken, _):`
`37`	`39`	`headers["Authorization"] = "Bearer \(accessToken)"`
	`40`	`+ case .registerRecommendedRoutine(let accessToken, _):`
	`41`	`+ headers["Authorization"] = "Bearer \(accessToken)"`
`38`	`42`	`}`
`39`	`43`
`40`	`44`	`return headers`
`@@ -48,6 +52,8 @@ extension OnboardingEndpoint: Endpoint {`
`48`	`52`	`switch self {`
`49`	`53`	`case .registerOnboarding(_, let choices):`
`50`	`54`	`return choices`
	`55`	`+ case .registerRecommendedRoutine(_, let selectedRoutines):`
	`56`	`+ return ["recommendedRoutineIds": selectedRoutines]`
`51`	`57`	`}`
`52`	`58`	`}`
`53`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,8 @@ public protocol OnboardingRepositoryProtocol {`
`10`	`10`	`/// - Parameter onboardingChoices: 선택한 온보딩 항목 Dictionary`
`11`	`11`	`/// - Returns: 온보딩 결과를 바탕으로 받은 추천루틴 목록`
`12`	`12`	`func registerOnboarding(onboardingChoices: [String: String]) async throws -> [RecommendedRoutineEntity]`
	`13`	`+`
	`14`	`+ /// 선택한 추천 루틴을 등록합니다.`
	`15`	`+ /// - Parameter selectedRoutines: 선택한 추천 루틴 ID 목록`
	`16`	`+ func registerRecommendedRoutines(selectedRoutines: [Int]) async throws`
`13`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,10 @@ public final class OnboardingUseCase: OnboardingUseCaseProtocol {`
`20`	`20`	`return recommendedRoutines`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ public func registerRecommendedRoutines(selectedRoutines: [Int]) async throws {`
	`24`	`+ try await onboardingRepository.registerRecommendedRoutines(selectedRoutines: selectedRoutines)`
	`25`	`+ }`
	`26`	`+`
`23`	`27`	`private func convertToDictionary(onboardingChoices: [OnboardingChoiceType]) -> [String: String] {`
`24`	`28`	`guard`
`25`	`29`	`let timeSlot = onboardingChoices.filter({ $0.onboardingType == .time }).first,`
`@@ -35,7 +39,4 @@ public final class OnboardingUseCase: OnboardingUseCaseProtocol {`
`35`	`39`	`}`
`36`	`40`	`return result`
`37`	`41`	`}`
`38`		`-`
`39`		`- private func convertTo() {`
`40`		`- }`
`41`	`42`	`}`