Refactor/#341 2차 스프린트 3차 QA 반영

ByeBoo-iOS/ByeBoo-iOS/Domain/UseCase/isValidQuestAnswerUseCase.swift

@@ -8,23 +8,29 @@
 import Foundation
 
 protocol IsValidQuestAnswerUseCase {
-    func execute(previousText: String, changingText: String) -> Bool
+    func executeWhenQuestionType(previousText: String, changingText: String) -> Bool
+    func executeWhenActiceType(previousText: String, changingText: String, imgCount: Int) -> Bool
 }
 
 struct DefaultIsValidQuestAnswerUseCase: IsValidQuestAnswerUseCase {
-    func execute(previousText: String, changingText: String) -> Bool {
-        if previousText.isEmpty {
-            if isValidAnswerText(text: changingText) {
-                return true
-            } else {
-                return false
-            }
+    func executeWhenQuestionType(previousText: String, changingText: String) -> Bool {
+        switch previousText.isEmpty {
+        case true:
+            let isValidAnswer: Bool = isValidAnswerText(text: changingText)
+            return isValidAnswer
+        case false:
+            let isValidAnswer: Bool = previousText != changingText && isValidAnswerText(text: changingText)
+            return isValidAnswer
+        }
+    }
+
+    func executeWhenActiceType(previousText: String, changingText: String, imgCount: Int) -> Bool {
+        if !previousText.isEmpty {
+            let isValidAnswer: Bool = previousText != changingText && imgCount == 1
+            return isValidAnswer
         } else {
-            if previousText != changingText && isValidAnswerText(text: changingText) {
-                return true
-            } else {
-                return false
-            }
+            if imgCount == 1 { return true }
+            return false
         }
     }
 

ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Offboarding/ViewController/CompletedQuestsViewController.swift

@@ -142,6 +142,7 @@ extension CompletedQuestsViewController: UICollectionViewDelegate {
         let quest = viewModel.getQuest(section: indexPath.section, item: indexPath.item)
 
         let archiveQuestController = ViewControllerFactory.shared.makeArchiveQuestViewController()
+        archiveQuestController.entryViewController = .mypage
         archiveQuestController.configure(questID: quest?.questId ?? 1, questType: quest?.questStyle ?? .activation)
         archiveQuestController.hidesBottomBarWhenPushed = true
         self.navigationController?.pushViewController(archiveQuestController, animated: false)

ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/Coordinator/QuestCheckCoordinator.swift

@@ -29,6 +29,7 @@ final class QuestCheckCoordinator: QuestCheckCoordinating {
 
     func moveArchive(quest: QuestEntity?) {
         let archiveQuestViewController = ViewControllerFactory.shared.makeArchiveQuestViewController()
+        archiveQuestViewController.entryViewController = .questMain
         archiveQuestViewController.configure(questID: quest?.questId ?? 1, questType: quest?.questStyle ?? .activation)
         archiveQuestViewController.hidesBottomBarWhenPushed = true
         rootViewController?.navigationController?.pushViewController(archiveQuestViewController, animated: false)

ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/ArchiveQuestViewController.swift

@@ -8,6 +8,12 @@
 import Combine
 import UIKit
 
+enum ArchiveViewControllerEntryPoint {
+    case mypage
+    case questMain
+    case edit
+}
+
 final class ArchiveQuestViewController: BaseViewController {
 
     private var rootView = ArchiveQuestView(type: .activation)
@@ -16,6 +22,7 @@ final class ArchiveQuestViewController: BaseViewController {
 
     private var questID: Int = 1
     private var questType: QuestType = .activation
+    var entryViewController: ArchiveViewControllerEntryPoint?
 
     init(viewModel: CompleteQuestViewModel
     ) {
@@ -85,17 +92,23 @@ extension ArchiveQuestViewController: ToastPresentable, ToastErrorHandler {
 
 extension ArchiveQuestViewController: Dismissible {
     func close() {
-        let viewController = ByeBooTabBar()
-        viewController.selectedIndex = 1
-
-        if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
-           let window = windowScene.windows.first(where: { $0.isKeyWindow }) {
+        guard let entryViewController else { return }
+        switch entryViewController {
+        case .mypage, .questMain:
+            self.navigationController?.popViewController(animated: true)
+        case .edit:
+            let viewController = ByeBooTabBar()
+            viewController.selectedIndex = 1
 
-            ViewControllerUtils.setRootViewController(
-                window: window,
-                viewController: viewController,
-                withAnimation: true
-            )
+            if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+               let window = windowScene.windows.first(where: { $0.isKeyWindow }) {
+
+                ViewControllerUtils.setRootViewController(
+                    window: window,
+                    viewController: viewController,
+                    withAnimation: true
+                )
+            }
         }
     }
 }

ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/WriteQuest/ViewController/WriteActiveTypeQuestViewController.swift

@@ -267,13 +267,26 @@ extension WriteActiveTypeQuestViewController: ToastPresentable, ToastErrorHandle
                     guard let self else { return }
                     ByeBooLogger.debug("퀘스트 아이디 \(self.questID)")
                     let viewController = ViewControllerFactory.shared.makeArchiveQuestViewController()
+                    viewController.entryViewController = .edit
                     viewController.configure(questID: self.questID, questType: .activation)
                     self.navigationController?.pushFromLeftToRight(viewController)
                 case .failure(let error):
                     self?.handleError(error)
                 }
             }
             .store(in: &cancellables)
+
+        viewModel.output.isValidTextPublisher
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] result in
+                switch result {
+                case true:
+                    self?.rootView.confirmButton.updateType(.enabled)
+                case false:
+                    self?.rootView.confirmButton.updateType(.disabled)
+                }
+            }
+            .store(in: &cancellables)
     }
 }
 
@@ -383,6 +396,7 @@ extension WriteActiveTypeQuestViewController: EditQuestProtocol {
             }
         }
 
+        rootView.imgCount = 1
         rootView.updateImageCountLabel(count: 1)
         rootView.imageContainer.changeIconHidden()
         rootView.confirmButton.updateType(.disabled)
@@ -402,14 +416,12 @@ extension WriteActiveTypeQuestViewController: QuestCompleteProtocol {
     func changeCount(count: Int) {
         if count == 1 {
             rootView.confirmButton.updateType(.enabled)
+        } else {
+            rootView.confirmButton.updateType(.disabled)
         }
     }
 
     func updateButtonWhenWriting(text: String) {
-        if rootView.imgCount == 1 && answerText != text {
-            rootView.confirmButton.updateType(.enabled)
-        } else {
-            rootView.confirmButton.updateType(.disabled)
-        }
+        viewModel.action(.textFieldEditing(answerText: self.answerText, text: text, imgCount: rootView.imgCount))
     }
 }

ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/WriteQuest/ViewController/WriteQuestionTypeQuestViewController.swift

@@ -214,6 +214,7 @@ extension WriteQuestionTypeQuestViewController: ToastPresentable, ToastErrorHand
                 case .success(()):
                     guard let self else { return }
                     let viewController = ViewControllerFactory.shared.makeArchiveQuestViewController()
+                    viewController.entryViewController = .edit
                     viewController.configure(questID: self.questID, questType: .question)
                     self.navigationController?.pushFromLeftToRight(viewController)
                 case .failure(let error):

ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/WriteQuest/ViewModel/WriteActiveTypeViewModel.swift

@@ -19,28 +19,33 @@ struct WriteActiveTypeViewModel: ViewModelType {
     private let saveActiveQuestUseCase: SaveQuestActiveUseCase
     private let getQuestInfoUseCase: GetQuestInfoUseCase
     private let editActiveQuestUseCase: EditQuestActiveUseCase
+    private let isValidQuestAnswerUseCase: IsValidQuestAnswerUseCase
 
     private let questInfoResultSubject: PassthroughSubject<Result<QuestInfoEntity, ByeBooError>, Never> = .init()
     private let questActiveResultSubject: PassthroughSubject<Result<Void, ByeBooError>, Never> = .init()
     private let didSuccessPostSubject: PassthroughSubject<Result<Void, ByeBooError>, Never> = .init()
     private let didSuccessEditSubject: PassthroughSubject<Result<Void, ByeBooError>, Never> = .init()
+    private let isValidTextSubject: PassthroughSubject<Bool, Never> = .init()
 
     init(
         saveQuestTypeUseCase:  SaveQuestTypeUseCase,
         saveActiveTypeUseCase: SaveQuestActiveUseCase,
         getQuestInfoUseCase: GetQuestInfoUseCase,
-        editActiveQuestUseCase: EditQuestActiveUseCase
+        editActiveQuestUseCase: EditQuestActiveUseCase,
+        isValidQuestAnswerUseCase: IsValidQuestAnswerUseCase
     ){
         self.saveQuestTypeUseCase = saveQuestTypeUseCase
         self.saveActiveQuestUseCase = saveActiveTypeUseCase
         self.getQuestInfoUseCase = getQuestInfoUseCase
         self.editActiveQuestUseCase = editActiveQuestUseCase
+        self.isValidQuestAnswerUseCase = isValidQuestAnswerUseCase
 
         output = Output(
             questInfoResultPublisher: questInfoResultSubject.eraseToAnyPublisher(),
             didSuccessPostPublisher: didSuccessPostSubject.eraseToAnyPublisher(),
             questInfoWhenEditModeResultPublisher: questInfoResultSubject.eraseToAnyPublisher(),
-            didSuccessEditPublisher: didSuccessEditSubject.eraseToAnyPublisher()
+            didSuccessEditPublisher: didSuccessEditSubject.eraseToAnyPublisher(),
+            isValidTextPublisher: isValidTextSubject.eraseToAnyPublisher()
         )
     }
 
@@ -70,6 +75,8 @@ struct WriteActiveTypeViewModel: ViewModelType {
                     imageKey: imageKey
                 )
             }
+        case .textFieldEditing(let answerText, let text, let imgCount):
+            isValidText(previousText: answerText, changingText: text, imgCount: imgCount)
         }
     }
 }
@@ -87,13 +94,15 @@ extension WriteActiveTypeViewModel {
             isImageChanged: Bool
         )
         case navigateFromArchiveViewController(questID: Int)
+        case textFieldEditing(answerText: String, text: String, imgCount: Int)
     }
 
     struct Output {
         let questInfoResultPublisher: AnyPublisher<Result<QuestInfoEntity, ByeBooError>, Never>
         let didSuccessPostPublisher:  AnyPublisher<Result<Void, ByeBooError>, Never>
         let questInfoWhenEditModeResultPublisher: AnyPublisher<Result<QuestInfoEntity, ByeBooError>, Never>
         let didSuccessEditPublisher: AnyPublisher<Result<Void, ByeBooError>, Never>
+        let isValidTextPublisher: AnyPublisher<Bool, Never>
     }
 }
 
@@ -170,5 +179,14 @@ extension WriteActiveTypeViewModel {
 
         }
     }
+
+    private func isValidText(previousText: String, changingText: String, imgCount: Int) {
+        let isValidText: Bool = isValidQuestAnswerUseCase.executeWhenActiceType(
+            previousText: previousText,
+            changingText: changingText,
+            imgCount: imgCount
+        )
+        isValidTextSubject.send(isValidText)
+    }
 }
 

ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/WriteQuest/ViewModel/WriteQuestTypeViewModel.swift

@@ -131,7 +131,7 @@ extension WriteQuestionTypeViewModel {
     }
 
     private func isValidText(previousText: String, changingText: String) {
-        let isValidText: Bool = isValidQuestAnswerUseCase.execute(previousText: previousText, changingText: changingText)
+        let isValidText: Bool = isValidQuestAnswerUseCase.executeWhenQuestionType(previousText: previousText, changingText: changingText)
         isValidTextSubject.send(isValidText)
     }
 }

ByeBoo-iOS/ByeBoo-iOS/Presentation/PresentationDependencyAssembler.swift

@@ -50,15 +50,17 @@ struct PresentationDependencyAssembler: DependencyAssembler {
             guard let getQuestInfoUseCase = container.resolve(type: GetQuestInfoUseCase.self),
                   let saveActiveTypeUseCase = container.resolve(type: SaveQuestActiveUseCase.self),
                   let saveQuestTypeUseCase = container.resolve(type: SaveQuestTypeUseCase.self),
-                  let editActiveQuestType = container.resolve(type: EditQuestActiveUseCase.self) else {
+                  let editActiveQuestType = container.resolve(type: EditQuestActiveUseCase.self),
+            let isValidTextUseCase = container.resolve(type: IsValidQuestAnswerUseCase.self) else  {
                 ByeBooLogger.error(ByeBooError.DIFailedError)
                 return
             }
             return WriteActiveTypeViewModel(
                 saveQuestTypeUseCase: saveQuestTypeUseCase,
                 saveActiveTypeUseCase: saveActiveTypeUseCase,
                 getQuestInfoUseCase: getQuestInfoUseCase,
-                editActiveQuestUseCase: editActiveQuestType
+                editActiveQuestUseCase: editActiveQuestType,
+                isValidQuestAnswerUseCase: isValidTextUseCase
             )
         }