[Fix] #244 - 네이밍 변경

DO-NOTTO-DO · Mar 23, 2024 · b11005e · b11005e
1 parent d125830
commit b11005e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/iOS-NOTTODO/iOS-NOTTODO/Coordinator/Coordinator/MypageCoordinatorImpl.swift b/iOS-NOTTODO/iOS-NOTTODO/Coordinator/Coordinator/MypageCoordinatorImpl.swift
@@ -37,7 +37,7 @@ final class MypageCoordinatorImpl: MypageCoordinator {
     }
 
     func showMyInfoAccountViewController() {
-        let viewController = viewControllerFactory.makeMyInfoAccountViewController(coordinator: self)
+        let viewController = viewControllerFactory.makeMyPageAccountViewController(coordinator: self)
         viewController.hidesBottomBarWhenPushed = true
         navigationController.pushViewController(viewController, animated: true)
     }
@@ -62,7 +62,8 @@ final class MypageCoordinatorImpl: MypageCoordinator {
 
     func connectAuthCoordinator(type: ViewType) {
         navigationController.dismiss(animated: true) { [weak self] in
-            self?.finish()
+            guard let self else { return }
+            self.finish()
             switch type {
             case .quitSurvey:
                 KeychainUtil.removeUserInfo()

diff --git a/iOS-NOTTODO/iOS-NOTTODO/Coordinator/Factory/ViewControllerFactory.swift b/iOS-NOTTODO/iOS-NOTTODO/Coordinator/Factory/ViewControllerFactory.swift
@@ -7,7 +7,7 @@
 
 import UIKit
 
-protocol ViewControllerFactory: UpdateFlowcontrollerFactory, AuthFlowControllerFactory, HomeFlowControllerFactory, MyPageFlowControllerFactory, AchieveFlowControllerFactory, TabBarControllerFactory, AuthFlowControllerFactory {}
+protocol ViewControllerFactory: UpdateFlowcontrollerFactory, AuthFlowControllerFactory, HomeFlowControllerFactory, AchieveFlowControllerFactory, TabBarControllerFactory, AuthFlowControllerFactory, MyPageFlowControllerFactory {}
 
 protocol UpdateFlowcontrollerFactory {
     func makeUpdateCheckViewController(coordinator: UpdateCoordinator) -> UpdateCheckViewController
@@ -39,7 +39,7 @@ protocol HomeFlowControllerFactory {
 
 protocol MyPageFlowControllerFactory {
     func makeMyInfoViewController(coordinator: MypageCoordinator) -> MyPageViewController
-    func makeMyInfoAccountViewController(coordinator: MypageCoordinator) -> MyPageAccountViewController
+    func makeMyPageAccountViewController(coordinator: MypageCoordinator) -> MyPageAccountViewController
     func makeWithdrawViewController(coordinator: MypageCoordinator) -> NottodoModalViewController
 }
 
@@ -186,20 +186,26 @@ extension ViewControllerFactoryImpl {
 }
 // mypage
 extension ViewControllerFactoryImpl {
-    func makeMyInfoViewController(coordinator: MypageCoordinator) -> MyPageViewController {
-        let viewModel = MyPageViewModelImpl(coordinator: coordinator)
-        let viewController = MyPageViewController(viewModel: viewModel)
-        return viewController
-    }
 
-    func makeMyInfoAccountViewController(coordinator: MypageCoordinator) -> MyPageAccountViewController {
+    func makeMyPageAccountViewModel(coordinator: MypageCoordinator) -> any MyPageAccountViewModel {
         let authAPI = DefaultAuthService()
         let manager = MyPageManagerImpl(authAPI: authAPI)
         let viewModel = MyPageAccountViewModelImpl(coordinator: coordinator, manager: manager)
+        return viewModel
+    }
+
+    func makeMyPageAccountViewController(coordinator: MypageCoordinator) -> MyPageAccountViewController {
+        let viewModel = self.makeMyPageAccountViewModel(coordinator: coordinator)
         let viewController = MyPageAccountViewController(viewModel: viewModel)
         return viewController
     }
 
+    func makeMyInfoViewController(coordinator: MypageCoordinator) -> MyPageViewController {
+        let viewModel = MyPageViewModelImpl(coordinator: coordinator)
+        let viewController = MyPageViewController(viewModel: viewModel)
+        return viewController
+    }
+
     func makeWithdrawViewController(coordinator: MypageCoordinator) -> NottodoModalViewController {
         let authAPI = DefaultAuthService()
         let manager = MyPageManagerImpl(authAPI: authAPI)
@@ -232,7 +238,6 @@ extension ViewControllerFactoryImpl {
     func makeTabBarController(_: UINavigationController) -> (UITabBarController, [UINavigationController]) {
         let tabBarController = TabBarController()
         let navigationControllers = tabBarController.setTabBarItems().map(makeNavigationController)
-
         return (tabBarController, navigationControllers)
     }