Merge pull request #606 from sopt-makers/refactor/#566-attendance-flow

[Refactor] #566 - Attendance Flow에서의 Router 의존성 제거

Author: dlwogus0128

SOPT-iOS/Projects/Features/AttendanceFeature/Interface/Sources/AttendanceFeatureBuildable.swift

@@ -2,18 +2,18 @@
 //  AttendanceFeatureBuildable.swift
 //  AttendanceFeatureInterface
 //
-//  Created by Junho Lee on 2023/06/22.
-//  Copyright © 2023 SOPT-iOS. All rights reserved.
+//  Created by Jae Hyun Lee on 6/3/25.
+//  Copyright © 2025 SOPT-iOS. All rights reserved.
 //
 
 import BaseFeatureDependency
 
 import Domain
 
-public protocol AttendanceFeatureViewBuildable {
-    func makeShowAttendanceVC() -> ShowAttendanceViewControllable
+public protocol AttendanceFeatureBuildable {
+    func makeShowAttendanceVC() -> ShowAttendancePresentable
     func makeAttendanceVC(
         lectureRound: AttendanceRoundModel,
         dismissCompletion: (() -> Void)?
-    ) -> AttendanceViewControllable
+    ) -> AttendancePresentable
 }

SOPT-iOS/Projects/Features/AttendanceFeature/Interface/Sources/AttendanceFeatureViewControllable.swift

@@ -0,0 +1,18 @@
+//
+//  AttendancePresentable.swift
+//  AttendanceFeature
+//
+//  Created by 김영인 on 2023/03/18.
+//  Copyright © 2023 SOPT-iOS. All rights reserved.
+//
+
+import UIKit
+
+import BaseFeatureDependency
+import Core
+import Domain
+
+public protocol LegacyAttendanceViewControllable: LegacyViewControllable { }
+
+public typealias AttendanceViewModelType = ViewModelType
+public typealias AttendancePresentable = (vc: UIViewController, vm: any AttendanceViewModelType)

SOPT-iOS/Projects/Features/AttendanceFeature/Interface/Sources/AttendancePresentable.swift

@@ -0,0 +1,19 @@
+//
+//  LegacyAttendanceFeatureBuildable.swift
+//  AttendanceFeatureInterface
+//
+//  Created by Junho Lee on 2023/06/22.
+//  Copyright © 2023 SOPT-iOS. All rights reserved.
+//
+
+import BaseFeatureDependency
+
+import Domain
+
+public protocol LegacyAttendanceFeatureBuildable {
+    func makeShowAttendanceVC() -> LegacyShowAttendanceViewControllable
+    func makeAttendanceVC(
+        lectureRound: AttendanceRoundModel,
+        dismissCompletion: (() -> Void)?
+    ) -> LegacyAttendanceViewControllable
+}

SOPT-iOS/Projects/Features/AttendanceFeature/Interface/Sources/LegacyAttendanceFeatureBuildable.swift

@@ -0,0 +1,23 @@
+//
+//  LegacyShowAttendanceViewControllable.swift
+//  AttendanceFeature
+//
+//  Created by Jae Hyun Lee on 6/3/25.
+//  Copyright © 2025 SOPT-iOS. All rights reserved.
+//
+
+import UIKit
+
+import BaseFeatureDependency
+import Core
+import Domain
+
+public protocol LegacyShowAttendanceViewControllable: LegacyViewControllable & ShowAttendanceCoordinatable { }
+public protocol ShowAttendanceViewControllable: UIViewController & ShowAttendanceCoordinatable { }
+public protocol ShowAttendanceCoordinatable {
+    var onAttendanceButtonTap: ((AttendanceRoundModel, (() -> Void)?) -> Void)? { get set }
+    var onNaviBackTap: (() -> Void)? { get set }
+}
+public typealias ShowAttendanceViewModelType = ViewModelType & ShowAttendanceCoordinatable
+// TODO: coordinating vc -> vm 위임 시 활용
+public typealias ShowAttendancePresentable = (vc: ShowAttendanceViewControllable, vm: any ShowAttendanceViewModelType)

SOPT-iOS/Projects/Features/AttendanceFeature/Interface/Sources/ShowAttendancePresentable.swift

@@ -18,7 +18,7 @@ import Then
 import AttendanceFeatureInterface
 import BaseFeatureDependency
 
-public final class AttendanceVC: UIViewController, AttendanceViewControllable {
+public final class AttendanceVC: UIViewController, LegacyAttendanceViewControllable {
     private enum Metric {
         static let baseInset = 20.f
         static let contentInset = 16.f

SOPT-iOS/Projects/Features/AttendanceFeature/Sources/AttendanceScene/VC/AttendanceVC.swift

@@ -11,8 +11,9 @@ import Foundation
 
 import Core
 import Domain
+import AttendanceFeatureInterface
 
-public final class AttendanceViewModel: ViewModelType {
+public final class AttendanceViewModel: AttendanceViewModelType {
 
     // MARK: - Properties
 

SOPT-iOS/Projects/Features/AttendanceFeature/Sources/AttendanceScene/ViewModel/AttendanceViewModel.swift

@@ -2,8 +2,8 @@
 //  AttendanceBuilder.swift
 //  AttendanceFeatureInterface
 //
-//  Created by Junho Lee on 2023/06/22.
-//  Copyright © 2023 SOPT-iOS. All rights reserved.
+//  Created by Jae Hyun Lee on 6/3/25.
+//  Copyright © 2025 SOPT-iOS. All rights reserved.
 //
 
 import Core
@@ -18,19 +18,19 @@ final class AttendanceBuilder {
     public init() { }
 }
 
-extension AttendanceBuilder: AttendanceFeatureViewBuildable {
-    public func makeShowAttendanceVC() -> ShowAttendanceViewControllable {
+extension AttendanceBuilder: AttendanceFeatureBuildable {
+    public func makeShowAttendanceVC() -> ShowAttendancePresentable {
         let useCase = DefaultShowAttendanceUseCase(repository: showAttendanceRepository)
         let viewModel = ShowAttendanceViewModel(useCase: useCase)
         let showAttendanceVC = ShowAttendanceVC(viewModel: viewModel)
-        return showAttendanceVC
+        return (showAttendanceVC, viewModel)
     }
-
-    public func makeAttendanceVC(lectureRound: AttendanceRoundModel, dismissCompletion: (() -> Void)?) -> AttendanceViewControllable {
+    
+    public func makeAttendanceVC(lectureRound: AttendanceRoundModel, dismissCompletion: (() -> Void)?) -> AttendancePresentable {
         let useCase = DefaultAttendanceUseCase(repository: attendanceRepository)
         let viewModel = AttendanceViewModel(useCase: useCase, lectureRound: lectureRound)
         let attendanceVC = AttendanceVC(viewModel: viewModel)
         attendanceVC.dismissCompletion = dismissCompletion
-        return attendanceVC
+        return (attendanceVC, viewModel)
     }
 }

SOPT-iOS/Projects/Features/AttendanceFeature/Sources/Coordinator/AttendanceBuilder.swift

@@ -2,53 +2,67 @@
 //  AttendanceCoordinator.swift
 //  AttendanceFeatureInterface
 //
-//  Created by Junho Lee on 2023/06/22.
-//  Copyright © 2023 SOPT-iOS. All rights reserved.
+//  Created by Jae Hyun Lee on 6/3/25.
+//  Copyright © 2025 SOPT-iOS. All rights reserved.
 //
 
+import UIKit
+
 import Core
 import Domain
 import BaseFeatureDependency
 import AttendanceFeatureInterface
 
-public
-final class AttendanceCoordinator: DefaultCoordinator {
+public final class AttendanceCoordinator: DefaultCoordinator {
+    
+    // MARK: - Properties
 
     public var finishFlow: (() -> Void)?
 
-    private let factory: AttendanceFeatureViewBuildable
-    private let router: LegacyRouter
+    private let factory: AttendanceFeatureBuildable
+    private let navigationController: UINavigationController
+    
+    // MARK: - Init
 
-    public init(router: LegacyRouter, factory: AttendanceFeatureViewBuildable) {
+    public init(
+        navigationController: UINavigationController,
+        factory: AttendanceFeatureBuildable
+    ) {
+        self.navigationController = navigationController
         self.factory = factory
-        self.router = router
     }
 
+    // MARK: - Coordinator Life Cycle
+    
     public override func start() {
         showShowAttendance()
     }
 
+    // MARK: - Navigation
+    
     private func showShowAttendance() {
         var showAttendance = factory.makeShowAttendanceVC()
-        showAttendance.onNaviBackTap = { [weak self] in
-            self?.router.popModule()
+        
+        showAttendance.vc.onNaviBackTap = { [weak self] in
+            self?.navigationController.popViewController(animated: true)
             self?.finishFlow?()
         }
-        showAttendance.onAttendanceButtonTap = { [weak self] lectureRound, completion in
+        
+        showAttendance.vc.onAttendanceButtonTap = { [weak self] lectureRound, completion in
             self?.showAttendance(lectureRound, completion)
         }
-        router.push(showAttendance)
+        
+        navigationController.pushViewController(showAttendance.vc, animated: true)
     }
 
     internal func showAttendance(_ lectureRound: AttendanceRoundModel, _ dismissCompletion: (() -> Void)?) {
         let attendance = factory.makeAttendanceVC(
-            lectureRound: lectureRound, dismissCompletion: dismissCompletion
-        )
-        router.present(
-            attendance,
-            animated: true,
-            modalPresentationSytle: .overFullScreen,
-            modalTransitionStyle: .crossDissolve
+            lectureRound: lectureRound,
+            dismissCompletion: dismissCompletion
         )
+        
+        attendance.vc.modalPresentationStyle = .overFullScreen
+        attendance.vc.modalTransitionStyle = .crossDissolve
+        navigationController.present(attendance.vc, animated: true)
     }
 }

SOPT-iOS/Projects/Features/AttendanceFeature/Sources/Coordinator/AttendanceCoordinator.swift

@@ -18,7 +18,7 @@ public struct AttendanceModalDeepLink: DeepLinkExecutable {
     public init() {}
 
     public func execute(with coordinator: Coordinator, queryItems: [URLQueryItem]?) -> Coordinator? {
-        guard let coordinator = coordinator as? AttendanceCoordinator else { return nil }
+        guard let coordinator = coordinator as? LegacyAttendanceCoordinator else { return nil }
 
         guard let subLectureIdValue = queryItems?.getQueryValue(key: "subLectureId"),
               let roundValue = queryItems?.getQueryValue(key: "round"),