From 92df76a6adfe24fe6c2e9197bea42eb5779f3bb1 Mon Sep 17 00:00:00 2001 From: yeonee Date: Mon, 9 Mar 2026 18:16:46 +0900 Subject: [PATCH 1/8] =?UTF-8?q?chore:=20#403=20=EC=82=AC=EC=9A=A9=EB=90=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=9D=B4=EB=AF=B8=EC=A7=80,?= =?UTF-8?q?=20=EB=B7=B0=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/Onboarding/JourneyResultView.swift | 94 ------------------- .../JourneyResultViewController.swift | 84 ----------------- ...Model.swift => CardJourneyViewModel.swift} | 6 +- .../Card/faceEmotion.imageset/Contents.json | 12 --- .../Card/faceEmotion.imageset/faceEmotion.svg | 9 -- .../face_back_card.imageset/Contents.json | 12 --- .../FaceProcessBack.svg | 32 ------- .../face_front_card.imageset/Contents.json | 12 --- .../face_front_card.imageset/FaceFront.svg | 39 -------- .../processEmotion.imageset/Contents.json | 12 --- .../processEmotion.svg | 9 -- .../process_back_card.imageset/Contents.json | 12 --- .../processback.svg | 32 ------- .../process_front_card.imageset/Contents.json | 12 --- .../processBackFront.svg | 36 ------- 15 files changed, 3 insertions(+), 410 deletions(-) delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/View/Onboarding/JourneyResultView.swift delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewController/JourneyResultViewController.swift rename ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewModel/{JourneyResultViewModel.swift => CardJourneyViewModel.swift} (94%) delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/faceEmotion.imageset/Contents.json delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/faceEmotion.imageset/faceEmotion.svg delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_back_card.imageset/Contents.json delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_back_card.imageset/FaceProcessBack.svg delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_front_card.imageset/Contents.json delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_front_card.imageset/FaceFront.svg delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/processEmotion.imageset/Contents.json delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/processEmotion.imageset/processEmotion.svg delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_back_card.imageset/Contents.json delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_back_card.imageset/processback.svg delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_front_card.imageset/Contents.json delete mode 100644 ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_front_card.imageset/processBackFront.svg diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/View/Onboarding/JourneyResultView.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/View/Onboarding/JourneyResultView.swift deleted file mode 100644 index 3224f5eb..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/View/Onboarding/JourneyResultView.swift +++ /dev/null @@ -1,94 +0,0 @@ -// -// JourneyResultView.swift -// ByeBoo-iOS -// -// Created by 최주리 on 7/9/25. -// - -import UIKit - -final class JourneyResultView: BaseView { - - private let backgroundImageView = UIImageView() - private let backgroundView = UIView() - private let titleLabel = UILabel() - private let imageView = UIImageView() - private let descriptionLabel = UILabel() - private(set) var confirmLabel = UILabel() - - override func setStyle() { - backgroundImageView.do { - $0.image = .bgDark - } - backgroundView.do { - $0.backgroundColor = .black50 - } - titleLabel.applyByeBooFont(style: .body1Sb16, color: .white) - - descriptionLabel.applyByeBooFont( - style: .body6R14, - color: .secondary100, - textAlignment: .center, - numberOfLines: 0 - ) - - confirmLabel.do { - $0.applyByeBooFont( - style: .body4Sb14, - text: "확인했어요", - color: .secondary300, - textAlignment: .center - ) - $0.underLine(text: $0.text ?? "") - } - } - - override func setUI() { - addSubviews( - backgroundImageView, - backgroundView, - titleLabel, - imageView, - descriptionLabel, - confirmLabel - ) - } - - override func setLayout() { - backgroundImageView.snp.makeConstraints { - $0.edges.equalToSuperview() - } - backgroundView.snp.makeConstraints { - $0.edges.equalToSuperview() - } - titleLabel.snp.makeConstraints { - $0.top.equalToSuperview().inset(74.5.adjustedH) - $0.centerX.equalToSuperview() - } - imageView.snp.makeConstraints { - $0.top.equalTo(titleLabel.snp.bottom).offset(24.adjustedH) - $0.centerX.equalToSuperview() - } - descriptionLabel.snp.makeConstraints { - $0.top.equalTo(imageView.snp.bottom).offset(24.adjustedH) - $0.centerX.equalToSuperview() - } - confirmLabel.snp.makeConstraints { - $0.top.equalTo(descriptionLabel.snp.bottom).offset(24.adjustedH) - $0.centerX.equalToSuperview() - } - } -} - -extension JourneyResultView { - func updateName(name: String) { - titleLabel.text = "지금 \(name) 님에게 필요한 건" - } - func updateJourney( - journeyType: JourneyType, - journeyDescription: String - ) { - imageView.image = journeyType.image - descriptionLabel.text = journeyDescription - } -} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewController/JourneyResultViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewController/JourneyResultViewController.swift deleted file mode 100644 index eb00d152..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewController/JourneyResultViewController.swift +++ /dev/null @@ -1,84 +0,0 @@ -// -// JourneyResultViewController.swift -// ByeBoo-iOS -// -// Created by 최주리 on 7/9/25. -// - -import UIKit -import Combine - -final class JourneyResultViewController: BaseViewController { - - private let viewModel: JourneyResultViewModel - private var cancellables = Set() - - private let rootView = JourneyResultView() - - init(viewModel: JourneyResultViewModel) { - self.viewModel = viewModel - super.init(nibName: nil, bundle: nil) - } - - required init?(coder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - override func loadView() { - view = rootView - } - - override func viewDidLoad() { - super.viewDidLoad() - bind() - - viewModel.action(.viewDidLoad) - } - - override func setAddTarget() { - let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(confirmLabelDidTap)) - rootView.confirmLabel.addGestureRecognizer(tapRecognizer) - rootView.confirmLabel.isUserInteractionEnabled = true - } -} - -extension JourneyResultViewController { - @objc - private func confirmLabelDidTap() { - let viewController = HomeOnboardingViewController() - viewController.navigationItem.hidesBackButton = true - navigationController?.pushViewController(viewController, animated: false) - } - -} - -extension JourneyResultViewController: ToastPresentable, ToastErrorHandler { - private func bind() { - viewModel.output.journeyResult - .receive(on: DispatchQueue.main) - .sink { [weak self] result in - switch result { - case .success(let journey): - self?.rootView.updateJourney( - journeyType: JourneyType.titleToEnum(journey.title) ?? .face, - journeyDescription: journey.description ?? "" - ) - case .failure(let error): - self?.handleError(error) - } - } - .store(in: &cancellables) - - viewModel.output.userResult - .receive(on: DispatchQueue.main) - .sink { [weak self] result in - switch result { - case .success(let name): - self?.rootView.updateName(name: name) - case .failure(let failure): - ByeBooLogger.error(failure) - } - } - .store(in: &cancellables) - } -} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewModel/JourneyResultViewModel.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewModel/CardJourneyViewModel.swift similarity index 94% rename from ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewModel/JourneyResultViewModel.swift rename to ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewModel/CardJourneyViewModel.swift index d7d39aa8..0ae58e94 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewModel/JourneyResultViewModel.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewModel/CardJourneyViewModel.swift @@ -8,7 +8,7 @@ import Combine import Foundation -final class JourneyResultViewModel: ViewModelType { +final class CardJourneyViewModel: ViewModelType { private var cancellables = Set() private var journeyResultSubject: PassthroughSubject, Never> = .init() @@ -42,7 +42,7 @@ final class JourneyResultViewModel: ViewModelType { } } -extension JourneyResultViewModel { +extension CardJourneyViewModel { enum Input { case viewDidLoad } @@ -53,7 +53,7 @@ extension JourneyResultViewModel { } } -extension JourneyResultViewModel { +extension CardJourneyViewModel { private func fetchJourney() { Task { do { diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/faceEmotion.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/faceEmotion.imageset/Contents.json deleted file mode 100644 index 310f4ffe..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/faceEmotion.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "faceEmotion.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/faceEmotion.imageset/faceEmotion.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/faceEmotion.imageset/faceEmotion.svg deleted file mode 100644 index e1178ee3..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/faceEmotion.imageset/faceEmotion.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_back_card.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_back_card.imageset/Contents.json deleted file mode 100644 index dd2a23a6..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_back_card.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "FaceProcessBack.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_back_card.imageset/FaceProcessBack.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_back_card.imageset/FaceProcessBack.svg deleted file mode 100644 index 5367f0dc..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_back_card.imageset/FaceProcessBack.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_front_card.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_front_card.imageset/Contents.json deleted file mode 100644 index 57935fd9..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_front_card.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "FaceFront.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_front_card.imageset/FaceFront.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_front_card.imageset/FaceFront.svg deleted file mode 100644 index 06fbebf5..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/face_front_card.imageset/FaceFront.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/processEmotion.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/processEmotion.imageset/Contents.json deleted file mode 100644 index 471366ab..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/processEmotion.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "processEmotion.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/processEmotion.imageset/processEmotion.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/processEmotion.imageset/processEmotion.svg deleted file mode 100644 index b048f843..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/processEmotion.imageset/processEmotion.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_back_card.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_back_card.imageset/Contents.json deleted file mode 100644 index 4d2f0773..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_back_card.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "processback.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_back_card.imageset/processback.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_back_card.imageset/processback.svg deleted file mode 100644 index d68f75ac..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_back_card.imageset/processback.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_front_card.imageset/Contents.json b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_front_card.imageset/Contents.json deleted file mode 100644 index 665247b0..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_front_card.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "processBackFront.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_front_card.imageset/processBackFront.svg b/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_front_card.imageset/processBackFront.svg deleted file mode 100644 index bec7f953..00000000 --- a/ByeBoo-iOS/ByeBoo-iOS/Resource/Assets.xcassets/Card/process_front_card.imageset/processBackFront.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 83f3019f953d713cecbb3ec79f877a4531e70a13 Mon Sep 17 00:00:00 2001 From: yeonee Date: Mon, 9 Mar 2026 18:18:35 +0900 Subject: [PATCH 2/8] =?UTF-8?q?refactor:=20#403=20reunion,=20recording?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ByeBoo-iOS/Data/Enum/JourneyType+Data.swift | 8 ++++---- .../Data/Enum/SelectJourneyType+Data.swift | 4 ++-- .../Data/Repository/UsersRepository.swift | 6 +++--- .../Domain/Entity/Enum/JourneyType.swift | 14 +++++++------- .../Domain/Entity/Enum/SelectQuestType.swift | 8 ++++---- .../ByeBoo-iOS/Domain/Entity/JourneyEntity.swift | 2 +- .../ViewController/CardJourneyViewController.swift | 10 +++++----- .../Home/ViewController/HomeViewController.swift | 6 +++--- .../NewJourneySelectViewController.swift | 2 +- .../CompletedQuestsViewController.swift | 2 +- .../FinishJourneyViewController.swift | 4 ++-- .../ViewModel/CompletedQuestsViewModel.swift | 2 +- .../ViewController/QuestCheckViewController.swift | 2 +- .../ViewController/QuestStartViewController.swift | 2 +- .../Quest/ViewModel/QuestStartViewModel.swift | 2 +- .../ByeBooTests/Feature/Quest/QuestTests.swift | 4 ++-- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/ByeBoo-iOS/ByeBoo-iOS/Data/Enum/JourneyType+Data.swift b/ByeBoo-iOS/ByeBoo-iOS/Data/Enum/JourneyType+Data.swift index 1bbeaec8..92b3be8b 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Data/Enum/JourneyType+Data.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Data/Enum/JourneyType+Data.swift @@ -8,10 +8,10 @@ extension JourneyType { var key: String { switch self { - case .face: - "FACE_EMOTION" - case .process: - "PROCESS_EMOTION" + case .recording: + "RECORDING" + case .reunion: + "REUNION" } } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Data/Enum/SelectJourneyType+Data.swift b/ByeBoo-iOS/ByeBoo-iOS/Data/Enum/SelectJourneyType+Data.swift index 4e0f1098..e09d04ec 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Data/Enum/SelectJourneyType+Data.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Data/Enum/SelectJourneyType+Data.swift @@ -10,8 +10,8 @@ extension SelectQuestType { switch self { case .recording: "RECORDING" - case .active: - "ACTIVE" + case .reunion: + "REUNION" } } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Data/Repository/UsersRepository.swift b/ByeBoo-iOS/ByeBoo-iOS/Data/Repository/UsersRepository.swift index e052f48c..707147a9 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Data/Repository/UsersRepository.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Data/Repository/UsersRepository.swift @@ -42,7 +42,6 @@ struct DefaultUsersRepository: UsersInterface { let accessToken = loadAccessToken() let userRequestDTO: UserRequestDTO = .init( name: name, - feeling: "EXHAUSTED", questStyle: questStyle ) let result = try await network.request( @@ -57,6 +56,7 @@ struct DefaultUsersRepository: UsersInterface { let _ = userDefaultsService.save(false, key: .hasEnterMyPage) let _ = userDefaultsService.save(false, key: .alarmEnabled) + ByeBooLogger.debug("유저 여정 \(questStyle)") ByeBooLogger.debug("유저 정보 저장 완료") return result.toEntity() } @@ -124,7 +124,7 @@ struct DefaultUsersRepository: UsersInterface { func getLastJourneyType() -> JourneyType { let journey: String? = userDefaultsService.load(key: .journey) - return JourneyType.keyToEnum(journey ?? "") ?? .face + return JourneyType.keyToEnum(journey ?? "") ?? .recording } func updateNotificationPermission() async throws -> Bool { @@ -243,7 +243,7 @@ final class MockUserRepository: UsersInterface { } func getLastJourneyType() -> JourneyType { - .process + .reunion } func updateNotificationPermission() -> Bool { diff --git a/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/Enum/JourneyType.swift b/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/Enum/JourneyType.swift index 493b7055..97c48203 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/Enum/JourneyType.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/Enum/JourneyType.swift @@ -7,20 +7,20 @@ import Foundation -// 여정의 타입: 감정 직면형, 감정 정리형 +// 여정의 타입: 이별 극복, 재회 준비 enum JourneyType: CaseIterable { - case face - case process + case recording + case reunion } extension JourneyType { var mixpanelKey: String { switch self { - case .face: - "감정 직면" - case .process: - "감정 정리" + case .recording: + "이별 극복" + case .reunion: + "재회 준비" } } } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/Enum/SelectQuestType.swift b/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/Enum/SelectQuestType.swift index eb9a1df5..d4a14eae 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/Enum/SelectQuestType.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/Enum/SelectQuestType.swift @@ -8,17 +8,17 @@ // 온보딩 시에 퀘스트 방식 선택 enum SelectQuestType: CaseIterable { + case reunion case recording - case active } extension SelectQuestType { var mixpanelKey: String { switch self { case .recording: - "질문형" - case .active: - "행동형" + "이별극복" + case .reunion: + "재회준비" } } } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/JourneyEntity.swift b/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/JourneyEntity.swift index 413d421e..3d71482f 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/JourneyEntity.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/JourneyEntity.swift @@ -16,6 +16,6 @@ struct JourneyEntity { extension JourneyEntity: Equatable { static func stub() -> Self { - return .init(title: "감정 직면", description: "설명", style: .face, questType: .question) + return .init(title: "이별 극복", description: "설명", style: .recording, questType: .question) } } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewController/CardJourneyViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewController/CardJourneyViewController.swift index 53e253e2..377f7614 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewController/CardJourneyViewController.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewController/CardJourneyViewController.swift @@ -12,13 +12,13 @@ import Mixpanel final class CardJourneyViewController: BaseViewController { - private let viewModel: JourneyResultViewModel + private let viewModel: CardJourneyViewModel private var cancellables = Set() private let rootView = CardJourneyView() - private var journeyType: JourneyType = .face + private var journeyType: JourneyType = .recording - init(viewModel: JourneyResultViewModel) { + init(viewModel: CardJourneyViewModel) { self.viewModel = viewModel super.init(nibName: nil, bundle: nil) } @@ -79,10 +79,10 @@ extension CardJourneyViewController: ToastPresentable, ToastErrorHandler { switch result { case .success(let journey): self?.rootView.updateJourney( - journeyType: JourneyType.titleToEnum(journey.title) ?? .face, + journeyType: JourneyType.titleToEnum(journey.title) ?? .recording, journeyDescription: journey.description ?? "" ) - self?.journeyType = JourneyType.titleToEnum(journey.title) ?? .face + self?.journeyType = JourneyType.titleToEnum(journey.title) ?? .recording case .failure(let error): self?.handleError(error) } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewController/HomeViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewController/HomeViewController.swift index 9d7c6a18..0606557a 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewController/HomeViewController.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Home/ViewController/HomeViewController.swift @@ -20,7 +20,7 @@ final class HomeViewController: BaseViewController { private var state: HomeState = .beforeJourneyStart private var isFirstVisit: Bool = true - private var journeyType: JourneyType = .face + private var journeyType: JourneyType = .recording private var isAnimating: Bool = false init(viewModel: HomeViewModel) { @@ -156,11 +156,11 @@ extension HomeViewController: ToastPresentable, ToastErrorHandler { progress: state.questCount, journey: journey.title ) - self?.journeyType = JourneyType.titleToEnum(journey.title) ?? .face + self?.journeyType = JourneyType.titleToEnum(journey.title) ?? .recording case let (_, .success(journey), .failure(.notFound)): self?.rootView.updateState(.beforeJourneyStart, journey.title) self?.state = .beforeJourneyStart - self?.journeyType = JourneyType.titleToEnum(journey.title) ?? .face + self?.journeyType = JourneyType.titleToEnum(journey.title) ?? .recording case let (_, .failure(.notFound), .success(state)): self?.rootView.updateState(state.currentStatus) self?.state = state.currentStatus diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/MyPage/ViewController/NewJourneySelectViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/MyPage/ViewController/NewJourneySelectViewController.swift index 753c250e..b04b8f44 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/MyPage/ViewController/NewJourneySelectViewController.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/MyPage/ViewController/NewJourneySelectViewController.swift @@ -101,7 +101,7 @@ extension NewJourneySelectViewController { viewController.delegate = self self.present(viewController, animated: false) - let journeyType = JourneyType.titleToEnum(journeyView.title) ?? .face + let journeyType = JourneyType.titleToEnum(journeyView.title) ?? .recording let property = QuestEvents.NewJourneyProperty(newJourneyType: journeyType.mixpanelKey) Mixpanel.mainInstance().track( event: QuestEvents.Name.journeyNewClick, diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Offboarding/ViewController/CompletedQuestsViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Offboarding/ViewController/CompletedQuestsViewController.swift index 2a85ed9e..09913d09 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Offboarding/ViewController/CompletedQuestsViewController.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Offboarding/ViewController/CompletedQuestsViewController.swift @@ -49,7 +49,7 @@ final class CompletedQuestsViewController: BaseViewController { type: .close(header: .black), action: #selector(close) ) - let journeyType = JourneyType.titleToEnum(journeyTitle ?? "") ?? .face + let journeyType = JourneyType.titleToEnum(journeyTitle ?? "") ?? .recording let property = QuestEvents.QuestAllLookBackProperty(reviewJourneyType: journeyType.mixpanelKey) Mixpanel.mainInstance().track( event: QuestEvents.Name.journeyReviewAllPageView, diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Offboarding/ViewController/FinishJourneyViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Offboarding/ViewController/FinishJourneyViewController.swift index b8600113..13b3d677 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Offboarding/ViewController/FinishJourneyViewController.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Offboarding/ViewController/FinishJourneyViewController.swift @@ -16,7 +16,7 @@ final class FinishJourneyViewController: BaseViewController { private let viewModel: FinishJourneyViewModel private var cancellables = Set() - private var journeyType: JourneyType = .face + private var journeyType: JourneyType = .recording init(viewModel: FinishJourneyViewModel) { self.viewModel = viewModel @@ -91,7 +91,7 @@ extension FinishJourneyViewController { .receive(on: DispatchQueue.main) .sink { [weak self] name, journey in self?.rootView.updateText(nickname: name, journey: journey) - self?.journeyType = JourneyType.titleToEnum(journey) ?? .face + self?.journeyType = JourneyType.titleToEnum(journey) ?? .recording } .store(in: &cancellables) } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Offboarding/ViewModel/CompletedQuestsViewModel.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Offboarding/ViewModel/CompletedQuestsViewModel.swift index 3d717ee8..7749f2ef 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Offboarding/ViewModel/CompletedQuestsViewModel.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Offboarding/ViewModel/CompletedQuestsViewModel.swift @@ -43,7 +43,7 @@ final class CompletedQuestsViewModel { Task { do { let completedQuestsEntity = try await fetchCompletedQuestsUseCase.execute( - journey: JourneyType.titleToEnum(journey) ?? .face + journey: JourneyType.titleToEnum(journey) ?? .recording ) self.questsEntity = completedQuestsEntity questsSubject.send(.success(completedQuestsEntity)) diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/QuestCheckViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/QuestCheckViewController.swift index 36d67dcd..cfc8fb5d 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/QuestCheckViewController.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/QuestCheckViewController.swift @@ -20,7 +20,7 @@ final class QuestCheckViewController: BaseViewController { var coordinator: QuestCheckCoordinating? private var cancellable = Set() - private var journeyType: JourneyType = .face + private var journeyType: JourneyType = .recording private var isFirst: Bool = true init(viewModel: ProgressingQuestsViewModel) { diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/QuestStartViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/QuestStartViewController.swift index 2e776965..1eb94066 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/QuestStartViewController.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/QuestStartViewController.swift @@ -23,7 +23,7 @@ final class QuestStartViewController: BaseViewController { private var journeyTitle: String = "" private var isFirst: Bool = true - private var journeyType: JourneyType = .face + private var journeyType: JourneyType = .recording weak var delegate: StartModalDelegate? diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewModel/QuestStartViewModel.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewModel/QuestStartViewModel.swift index fb892bab..8ec6d920 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewModel/QuestStartViewModel.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewModel/QuestStartViewModel.swift @@ -86,7 +86,7 @@ extension QuestStartViewModel { private func postNewJourneys(journey: String) { Task { do { - let _ = try await postJourneyUseCase.execute(journey: JourneyType.titleToEnum(journey) ?? .face) + let _ = try await postJourneyUseCase.execute(journey: JourneyType.titleToEnum(journey) ?? .recording) startResultSubject.send(.success(true)) } catch { guard let error = error as? ByeBooError else { diff --git a/ByeBoo-iOS/ByeBooTests/Feature/Quest/QuestTests.swift b/ByeBoo-iOS/ByeBooTests/Feature/Quest/QuestTests.swift index bc88c2c4..dcbd4293 100644 --- a/ByeBoo-iOS/ByeBooTests/Feature/Quest/QuestTests.swift +++ b/ByeBoo-iOS/ByeBooTests/Feature/Quest/QuestTests.swift @@ -107,7 +107,7 @@ struct QuestTests { let questsRepository = MockQuestsRepository() let fetchNewJourneyUseCase = DefaultFetchNewJourneyUseCase(fetchNewJourneyRepository: questsRepository) - let _ = try await fetchNewJourneyUseCase.execute(journey: .face) + let _ = try await fetchNewJourneyUseCase.execute(journey: .recording) #expect(questsRepository.postNewJourneyCalled) } @@ -116,7 +116,7 @@ struct QuestTests { func fetchCompletedQuests__success() async throws { let fetchCompletedQuestsUseCase = DefaultFetchCompletedQuestsUseCase(repository: questsRepository) - let result = try await fetchCompletedQuestsUseCase.execute(journey: .face) + let result = try await fetchCompletedQuestsUseCase.execute(journey: .recording) #expect(result == CompletedQuestsEntity.stub()) } From fdc409b149bbf26944bccc89dcf266e66c69b20d Mon Sep 17 00:00:00 2001 From: yeonee Date: Mon, 9 Mar 2026 18:18:51 +0900 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20#403=20v2=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ByeBoo-iOS/Data/Model/UserRequestDTO.swift | 1 - .../Data/Network/EndPoint/UsersAPI.swift | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ByeBoo-iOS/ByeBoo-iOS/Data/Model/UserRequestDTO.swift b/ByeBoo-iOS/ByeBoo-iOS/Data/Model/UserRequestDTO.swift index 422ab1b7..c10fd3b6 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Data/Model/UserRequestDTO.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Data/Model/UserRequestDTO.swift @@ -7,6 +7,5 @@ struct UserRequestDTO: Encodable { let name: String - let feeling: String let questStyle: String } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Data/Network/EndPoint/UsersAPI.swift b/ByeBoo-iOS/ByeBoo-iOS/Data/Network/EndPoint/UsersAPI.swift index b85e8e02..eea17785 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Data/Network/EndPoint/UsersAPI.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Data/Network/EndPoint/UsersAPI.swift @@ -22,13 +22,13 @@ enum UsersAPI { extension UsersAPI: EndPoint { var basePath: String { - return "/api/v1/users" - - // switch self { - // case .journey, .character, .count, .start, .modifyName, .updateNotificationPermission: - // case .sendUser: - // return "/api/v2/users" - // } + switch self { + case .journey, .character, .count, .start, + .modifyName, .updateNotificationPermission, .fetchCommonQuestAnswers: + return "/api/v1/users" + case .sendUser: + return "/api/v2/users" + } } var path: String { From 2a31934811379782e108f2a56071a1312ce94cf9 Mon Sep 17 00:00:00 2001 From: yeonee Date: Mon, 9 Mar 2026 18:19:28 +0900 Subject: [PATCH 4/8] =?UTF-8?q?style:=20#403=20=EC=B9=B4=EB=93=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Enum/JourneyType+Presentation.swift | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift index a6ada169..f193db39 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift @@ -10,19 +10,10 @@ import UIKit extension JourneyType { var title: String { switch self { - case .face: - "재회 준비" - case .process: + case .recording: "이별 극복" - } - } - - var image: UIImage { - switch self { - case .face: - .faceEmotion - case .process: - .processEmotion + case .reunion: + "재회 준비" } } @@ -32,19 +23,19 @@ extension JourneyType { var frontImage: UIImage { switch self { - case .face: - .reunionFront - case .process: + case .recording: .overcomingFront + case .reunion: + .reunionFront } } var backImage: UIImage { switch self { - case .face: - .reunionBack - case .process: + case .recording: .overcomingBack + case .reunion: + .reunionBack } } From d7324283d6cd21eff4c356ff211b72246b99dad9 Mon Sep 17 00:00:00 2001 From: yeonee Date: Mon, 9 Mar 2026 18:19:58 +0900 Subject: [PATCH 5/8] =?UTF-8?q?chore:=20#403=20currentFeeling=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Information/ViewModel/InformationViewModel.swift | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/ViewModel/InformationViewModel.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/ViewModel/InformationViewModel.swift index 75aebac4..00f5a582 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/ViewModel/InformationViewModel.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/ViewModel/InformationViewModel.swift @@ -17,7 +17,6 @@ final class InformationViewModel { private(set) var output: Output private var currentNickname: String? - private var currentFeeling: Feeling? = .exhausted private var currentQuestStyle: SelectQuestType? private var user: UserEntity = UserEntity(id: 1, name: "") @@ -47,16 +46,14 @@ final class InformationViewModel { private func createUserInformation( nickname: String?, - feeling: Feeling?, questStyle: SelectQuestType? ) { guard let name = currentNickname, - let feeling = currentFeeling, let questStyle = currentQuestStyle else { return } Task { do { - try await sendUserUseCase.execute( + let _ = try await sendUserUseCase.execute( name: name, questStyle: questStyle.key ) @@ -78,7 +75,6 @@ extension InformationViewModel: ViewModelType { enum Input { case editingNickname(String) case nicknameButtonDidTap(String) - case feelingButtonDidTap(Feeling) case questButtonDidTap(SelectQuestType) } @@ -105,14 +101,10 @@ extension InformationViewModel: ViewModelType { currentNickname = nickname isForbiddenWordSubject.send(.success(())) - case .feelingButtonDidTap(let feeling): - currentFeeling = feeling - case .questButtonDidTap(let questStyle): currentQuestStyle = questStyle createUserInformation( nickname: currentNickname, - feeling: currentFeeling, questStyle: currentQuestStyle ) userInformationSubject.send(.success(())) @@ -123,7 +115,6 @@ extension InformationViewModel: ViewModelType { extension InformationViewModel { func resetData() { - currentFeeling = nil currentQuestStyle = nil } } From 0dfd160922d65c8e21f344f262abeda6f8ec4a38 Mon Sep 17 00:00:00 2001 From: yeonee Date: Mon, 9 Mar 2026 18:20:12 +0900 Subject: [PATCH 6/8] =?UTF-8?q?chore:=20#403=20=EB=B7=B0=EB=AA=A8=EB=8D=B8?= =?UTF-8?q?=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PresentationDependencyAssembler.swift | 19 ++++++++++--------- .../Presentation/ViewControllerFactory.swift | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/PresentationDependencyAssembler.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/PresentationDependencyAssembler.swift index ab00149e..8a149570 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/PresentationDependencyAssembler.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/PresentationDependencyAssembler.swift @@ -17,15 +17,16 @@ struct PresentationDependencyAssembler: DependencyAssembler { func assemble() { preAssembler.assemble() - DIContainer.shared.register(type: JourneyResultViewModel.self) { container in - guard let getUserNameUseCase = container.resolve(type: GetUserNameUseCase.self), - let fetchUserJourneyUseCase = container.resolve(type: FetchUserJourneyUseCase.self), - let isForbiddenWordUseCase = container.resolve(type: IsForbiddenWordUseCase.self) else { - ByeBooLogger.error(ByeBooError.DIFailedError) - return - } - - return JourneyResultViewModel( + guard let getUserNameUseCase = DIContainer.shared.resolve(type: GetUserNameUseCase.self), + let fetchUserJourneyUseCase = DIContainer.shared.resolve(type: FetchUserJourneyUseCase.self), + let isForbiddenWordUseCase = DIContainer.shared.resolve(type: IsForbiddenWordUseCase.self) + else { + ByeBooLogger.error(ByeBooError.DIFailedError) + return + } + + DIContainer.shared.register(type: CardJourneyViewModel.self) { _ in + return CardJourneyViewModel( fetchUserJourneyUseCase: fetchUserJourneyUseCase, getUserNameUseCase: getUserNameUseCase ) diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/ViewControllerFactory.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/ViewControllerFactory.swift index 5f0f513f..18083d63 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/ViewControllerFactory.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/ViewControllerFactory.swift @@ -65,7 +65,7 @@ final class ViewControllerFactory: ViewControllerFactoryProtocol { } func makeCardJourneyViewController() -> CardJourneyViewController { - guard let viewModel = DIContainer.shared.resolve(type: JourneyResultViewModel.self) else { + guard let viewModel = DIContainer.shared.resolve(type: CardJourneyViewModel.self) else { DIErrorHandle() fatalError() } From 6322f34d4fe68834ed8980ef9c35e61027507bad Mon Sep 17 00:00:00 2001 From: yeonee Date: Mon, 9 Mar 2026 18:20:24 +0900 Subject: [PATCH 7/8] =?UTF-8?q?chore:=20#403=20=EA=B7=B8=EC=99=B8=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EA=B4=80=EB=A0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ByeBoo-iOS/ByeBoo-iOS/Data/Repository/QuestsRepository.swift | 1 - .../Information/ViewController/InformationViewController.swift | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ByeBoo-iOS/ByeBoo-iOS/Data/Repository/QuestsRepository.swift b/ByeBoo-iOS/ByeBoo-iOS/Data/Repository/QuestsRepository.swift index 0f545706..8aebd63b 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Data/Repository/QuestsRepository.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Data/Repository/QuestsRepository.swift @@ -88,7 +88,6 @@ struct DefaultQuestRepository: QuestsInterface { func postNewJourney(journey: JourneyType) async throws { ByeBooLogger.debug(journey) - // TODO: 로그인 붙인 후 주석 해제 let _ = try await network.request( QuestAPI.postJourney(journey: journey) ) diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/ViewController/InformationViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/ViewController/InformationViewController.swift index b63dd098..f3ef2652 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/ViewController/InformationViewController.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Information/ViewController/InformationViewController.swift @@ -99,6 +99,7 @@ extension InformationViewController { if SelectQuestType.allCases.indices.contains(index) { let quest = SelectQuestType.allCases[index] viewModel.action(.questButtonDidTap(quest)) + ByeBooLogger.debug("선택 여정 \(quest)") let property = CommonEvents.SelectQuestTypeProperty(questType: quest.mixpanelKey) Mixpanel.mainInstance().track( event: CommonEvents.Name.questTypeComplete, From e61a1c95cfad7fbfc76dfb58d41a030f4662f888 Mon Sep 17 00:00:00 2001 From: yeonee Date: Mon, 9 Mar 2026 18:56:12 +0900 Subject: [PATCH 8/8] =?UTF-8?q?chore:=20#403=20=EC=98=A4=ED=94=84=EB=B3=B4?= =?UTF-8?q?=EB=94=A9=EC=9A=A9=20=EA=B8=B0=EC=A1=B4=20=EC=97=AC=EC=A0=95=20?= =?UTF-8?q?=EB=B3=B5=EA=B5=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Data/Enum/JourneyType+Data.swift | 6 ++++-- .../Domain/Entity/Enum/JourneyType.swift | 3 +++ .../Enum/JourneyType+Presentation.swift | 18 ++++++++++++------ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ByeBoo-iOS/ByeBoo-iOS/Data/Enum/JourneyType+Data.swift b/ByeBoo-iOS/ByeBoo-iOS/Data/Enum/JourneyType+Data.swift index 92b3be8b..849a4ace 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Data/Enum/JourneyType+Data.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Data/Enum/JourneyType+Data.swift @@ -9,9 +9,11 @@ extension JourneyType { var key: String { switch self { case .recording: - "RECORDING" + "FACE_EMOTION" + case .active: + "PROCESS_EMOTION" case .reunion: - "REUNION" + "PREPARE_REUNION" } } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/Enum/JourneyType.swift b/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/Enum/JourneyType.swift index 97c48203..1515e883 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/Enum/JourneyType.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Domain/Entity/Enum/JourneyType.swift @@ -11,6 +11,7 @@ import Foundation enum JourneyType: CaseIterable { case recording + case active case reunion } @@ -19,6 +20,8 @@ extension JourneyType { switch self { case .recording: "이별 극복" + case .active: + "감정 정리" case .reunion: "재회 준비" } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift index f193db39..cfa7dadc 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Enum/JourneyType+Presentation.swift @@ -12,6 +12,8 @@ extension JourneyType { switch self { case .recording: "이별 극복" + case .active: + "감정 정리" case .reunion: "재회 준비" } @@ -21,21 +23,25 @@ extension JourneyType { return "\(title) 여정" } - var frontImage: UIImage { + var frontImage: UIImage? { switch self { case .recording: - .overcomingFront + .overcomingFront case .reunion: - .reunionFront + .reunionFront + case .active: + nil } } - var backImage: UIImage { + var backImage: UIImage? { switch self { case .recording: - .overcomingBack + .overcomingBack case .reunion: - .reunionBack + .reunionBack + case .active: + nil } }