Merge pull request #259 from Team-return/feature/(#258)-winter_season

cyj513 · web-flow · commit c316de1e44b2 · 2024-09-25T16:55:34.000+09:00
🔗 :: (#258) 겨울인턴 개발
diff --git a/Projects/Core/Sources/Steps/HomeStep.swift b/Projects/Core/Sources/Steps/HomeStep.swift
@@ -4,6 +4,7 @@ public enum HomeStep: Step {
     case homeIsRequired
     case alarmIsRequired
     case companyIsRequired
+    case winterInternIsRequired
     case easterEggIsRequired
     case rejectReasonIsRequired(
         recruitmentID: Int,
diff --git a/Projects/Data/Sources/DataSource/API/RecruitmentsAPI.swift b/Projects/Data/Sources/DataSource/API/RecruitmentsAPI.swift
@@ -4,7 +4,7 @@ import AppNetwork
 
 enum RecruitmentsAPI {
     case fetchRecruitmentDetail(id: Int)
-    case fetchRecruitmentList(page: Int, jobCode: String?, techCode: [String]?, name: String?)
+    case fetchRecruitmentList(page: Int, jobCode: String?, techCode: [String]?, name: String?, winterIntern: Bool?)
 }
 
 extension RecruitmentsAPI: JobisAPI {
@@ -33,13 +33,13 @@ extension RecruitmentsAPI: JobisAPI {
 
     var task: Moya.Task {
         switch self {
-        case let .fetchRecruitmentList(page, jobCode, techCode, name):
+        case let .fetchRecruitmentList(page, jobCode, techCode, name, winterIntern):
             return .requestParameters(parameters: [
                 "page": page,
                 "job_code": jobCode ?? "",
                 "tech_code": techCode?.joined(separator: ",") ?? "",
                 "name": name ?? "",
-                "winter_intern": false
+                "winter_intern": winterIntern ?? false
             ], encoding: URLEncoding.queryString)
 
         default:
diff --git a/Projects/Data/Sources/DataSource/Remote/RemoteRecruitmentsDataSource.swift b/Projects/Data/Sources/DataSource/Remote/RemoteRecruitmentsDataSource.swift
@@ -4,7 +4,7 @@ import Domain
 protocol RemoteRecruitmentsDataSource {
     func fetchRecruitmentDetail(id: Int) -> Single<RecruitmentDetailEntity>
     func fetchRecruitmentList(
-        page: Int, jobCode: String?, techCode: [String]?, name: String?
+        page: Int, jobCode: String?, techCode: [String]?, name: String?, winterIntern: Bool?
     ) -> Single<[RecruitmentEntity]>
 }
 
@@ -16,10 +16,20 @@ final class RemoteRecruitmentsDataSourceImpl: RemoteBaseDataSource<RecruitmentsA
     }
 
     func fetchRecruitmentList(
-        page: Int, jobCode: String?, techCode: [String]?, name: String?
+        page: Int,
+        jobCode: String?,
+        techCode: [String]?,
+        name: String?,
+        winterIntern: Bool?
     ) -> Single<[RecruitmentEntity]> {
-        request(.fetchRecruitmentList(page: page, jobCode: jobCode, techCode: techCode, name: name))
-            .map(RecruitmentListResponseDTO.self)
-            .map { $0.toDomain() }
+        request(.fetchRecruitmentList(
+            page: page,
+            jobCode: jobCode,
+            techCode: techCode,
+            name: name,
+            winterIntern: winterIntern
+        ))
+        .map(RecruitmentListResponseDTO.self)
+        .map { $0.toDomain() }
     }
 }
diff --git a/Projects/Data/Sources/Repositories/RecruitmentsRepositoryImpl.swift b/Projects/Data/Sources/Repositories/RecruitmentsRepositoryImpl.swift
@@ -13,8 +13,17 @@ struct RecruitmentsRepositoryImpl: RecruitmentsRepository {
     }
 
     func fetchRecruitmentList(
-        page: Int, jobCode: String?, techCode: [String]?, name: String?
+        page: Int,
+        jobCode: String?,
+        techCode: [String]?,
+        name: String?, winterIntern: Bool?
     ) -> Single<[RecruitmentEntity]> {
-        remoteRecruitmentsDataSource.fetchRecruitmentList(page: page, jobCode: jobCode, techCode: techCode, name: name)
+        remoteRecruitmentsDataSource.fetchRecruitmentList(
+            page: page,
+            jobCode: jobCode,
+            techCode: techCode,
+            name: name,
+            winterIntern: winterIntern
+        )
     }
 }
diff --git a/Projects/Domain/Sources/Repositories/RecruitmentsRepository.swift b/Projects/Domain/Sources/Repositories/RecruitmentsRepository.swift
@@ -3,6 +3,6 @@ import RxSwift
 public protocol RecruitmentsRepository {
     func fetchRecruitmentDetail(id: Int) -> Single<RecruitmentDetailEntity>
     func fetchRecruitmentList(
-        page: Int, jobCode: String?, techCode: [String]?, name: String?
+        page: Int, jobCode: String?, techCode: [String]?, name: String?, winterIntern: Bool?
     ) -> Single<[RecruitmentEntity]>
 }
diff --git a/Projects/Domain/Sources/UseCases/Recruitments/FetchRecruitmentListUseCase.swift b/Projects/Domain/Sources/UseCases/Recruitments/FetchRecruitmentListUseCase.swift
@@ -8,8 +8,18 @@ public struct FetchRecruitmentListUseCase {
     private let recruitmentsRepository: RecruitmentsRepository
 
     public func execute(
-        page: Int, jobCode: String? = nil, techCode: [String]? = nil, name: String? = nil
+        page: Int,
+        jobCode: String? = nil,
+        techCode: [String]? = nil,
+        name: String? = nil,
+        winterIntern: Bool? = nil
     ) -> Single<[RecruitmentEntity]> {
-        recruitmentsRepository.fetchRecruitmentList(page: page, jobCode: jobCode, techCode: techCode, name: name)
+        recruitmentsRepository.fetchRecruitmentList(
+            page: page,
+            jobCode: jobCode,
+            techCode: techCode,
+            name: name,
+            winterIntern: winterIntern
+        )
     }
 }
diff --git a/Projects/Flow/Sources/Home/HomeFlow.swift b/Projects/Flow/Sources/Home/HomeFlow.swift
@@ -28,6 +28,9 @@ public final class HomeFlow: Flow {
         case .companyIsRequired:
             return navigateToCompany()
 
+        case .winterInternIsRequired:
+            return navigateToWinterIntern()
+
         case .easterEggIsRequired:
             return navigateToEasterEgg()
 
@@ -108,6 +111,23 @@ private extension HomeFlow {
         ))
     }
 
+    func navigateToWinterIntern() -> FlowContributors {
+        let winterInternFlow = WinterInternFlow(container: container)
+        Flows.use(winterInternFlow, when: .created) { root in
+            self.rootViewController.pushViewController(
+                root,
+                animated: true
+            )
+        }
+
+        return .one(flowContributor: .contribute(
+            withNextPresentable: winterInternFlow,
+            withNextStepper: OneStepper(
+                withSingleStep: RecruitmentStep.recruitmentIsRequired
+            )
+        ))
+    }
+
     func navigateToRejectReason(
         _ recruitmentID: Int,
         _ applicationID: Int,
diff --git a/Projects/Flow/Sources/WinterIntern/WinterInternFlow.swift b/Projects/Flow/Sources/WinterIntern/WinterInternFlow.swift
@@ -0,0 +1,104 @@
+import UIKit
+import Presentation
+import Swinject
+import RxFlow
+import Core
+
+public final class WinterInternFlow: Flow {
+    public let container: Container
+    private let rootViewController: WinterInternViewController
+    public var root: Presentable {
+        return rootViewController
+    }
+
+    public init(container: Container) {
+        self.container = container
+        self.rootViewController = container.resolve(WinterInternViewController.self)!
+    }
+
+    public func navigate(to step: Step) -> FlowContributors {
+        guard let step = step as? RecruitmentStep else { return .none }
+
+        switch step {
+        case .recruitmentIsRequired:
+            return navigateToRecruitment()
+
+        case let .recruitmentDetailIsRequired(id):
+            return navigateToRecruitmentDetail(recruitmentID: id)
+
+        case .recruitmentFilterIsRequired:
+            return navigateToRecruitmentFilter()
+
+        case .searchRecruitmentIsRequired:
+            return navigateToSearchRecruitment()
+        }
+    }
+}
+
+private extension WinterInternFlow {
+    func navigateToRecruitment() -> FlowContributors {
+        return .one(flowContributor: .contribute(
+            withNextPresentable: rootViewController,
+            withNextStepper: rootViewController.viewModel
+        ))
+    }
+
+    func navigateToRecruitmentDetail(recruitmentID: Int) -> FlowContributors {
+        let recruitmentDetailFlow = RecruitmentDetailFlow(container: container)
+
+        Flows.use(recruitmentDetailFlow, when: .created) { (root) in
+            let view = root as? RecruitmentDetailViewController
+            view?.viewModel.recruitmentID = recruitmentID
+            view?.isPopViewController = { id, bookmark in
+                let popView = self.rootViewController
+                var oldData = popView.viewModel.recruitmentData.value
+                oldData.enumerated().forEach {
+                    if $0.element.recruitID == id {
+                        oldData[$0.offset].bookmarked = bookmark
+                    }
+                }
+                popView.viewModel.recruitmentData.accept(oldData)
+                popView.isTabNavigation = false
+            }
+            self.rootViewController.navigationController?.pushViewController(
+                view!, animated: true
+            )
+        }
+
+        return .one(flowContributor: .contribute(
+            withNextPresentable: recruitmentDetailFlow,
+            withNextStepper: OneStepper(withSingleStep: RecruitmentDetailStep.recruitmentDetailIsRequired)
+        ))
+    }
+
+    func navigateToSearchRecruitment() -> FlowContributors {
+        let searchRecruitmentFlow = SearchRecruitmentFlow(container: container)
+
+        Flows.use(searchRecruitmentFlow, when: .created) { (root) in
+            let view = root as? SearchRecruitmentViewController
+            self.rootViewController.navigationController?.pushViewController(
+                view!, animated: true
+            )
+        }
+
+        return .one(flowContributor: .contribute(
+            withNextPresentable: searchRecruitmentFlow,
+            withNextStepper: OneStepper(withSingleStep: SearchRecruitmentStep.searchRecruitmentIsRequired)
+        ))
+    }
+
+    func navigateToRecruitmentFilter() -> FlowContributors {
+        let recruitmentFilterFlow = RecruitmentFilterFlow(container: container)
+
+        Flows.use(recruitmentFilterFlow, when: .created) { (root) in
+            self.rootViewController.navigationController?.pushViewController(
+                root, animated: true
+            )
+        }
+
+        return .one(flowContributor: .contribute(
+            withNextPresentable: recruitmentFilterFlow,
+            withNextStepper: OneStepper(withSingleStep: RecruitmentFilterStep.recruitmentFilterIsRequired)
+        ))
+    }
+}
diff --git a/Projects/Presentation/Sources/DI/PresentationAssembly.swift b/Projects/Presentation/Sources/DI/PresentationAssembly.swift
@@ -327,6 +327,18 @@ public final class PresentationAssembly: Assembly {
             MajorBottomSheetViewModel()
         }
 
+        container.register(WinterInternViewController.self) { resolver in
+            WinterInternViewController(
+                resolver.resolve(WinterInternVieModel.self)!
+            )
+        }
+        container.register(WinterInternVieModel.self) { resolver in
+            WinterInternVieModel(
+                fetchRecruitmentListUseCase: resolver.resolve(FetchRecruitmentListUseCase.self)!,
+                bookmarkUseCase: resolver.resolve(BookmarkUseCase.self)!
+            )
+        }
+
         container.register(EasterEggViewController.self) { resolver in
             EasterEggViewController()
         }
diff --git a/Projects/Presentation/Sources/Home/HomeViewController.swift b/Projects/Presentation/Sources/Home/HomeViewController.swift
@@ -112,6 +112,7 @@ public final class HomeViewController: BaseViewController<HomeViewModel> {
             navigateToAlarmButtonDidTap: navigateToAlarmButton.rx.tap.asSignal(),
             navigateToEasterEggDidTap: navigateToEasterEggDidTap,
             navigateToCompanyButtonDidTap: findCompanysCard.rx.tap.asSignal(),
+            navigateToWinterInternButtonDidTap: findWinterRecruitmentsCard.rx.tap.asSignal(),
             rejectButtonDidTap: rejectButtonDidTap,
             reApplyButtonDidTap: reApplyButtonDidTap,
             applicationStatusTableViewDidTap: applicationStatusTableView.rx
@@ -196,11 +197,6 @@ public final class HomeViewController: BaseViewController<HomeViewModel> {
             .bind {
                 self.showTabbar()
             }.disposed(by: disposeBag)
-
-        findWinterRecruitmentsCard.rx.tap.subscribe(onNext: {
-            print("findWinterRecruitment!!")
-        })
-        .disposed(by: disposeBag)
     }
 
     public override func configureNavigation() {
diff --git a/Projects/Presentation/Sources/Home/HomeViewModel.swift b/Projects/Presentation/Sources/Home/HomeViewModel.swift
@@ -30,6 +30,7 @@ public final class HomeViewModel: BaseViewModel, Stepper {
         let navigateToAlarmButtonDidTap: Signal<Void>
         let navigateToEasterEggDidTap: PublishRelay<Void>
         let navigateToCompanyButtonDidTap: Signal<Void>
+        let navigateToWinterInternButtonDidTap: Signal<Void>
         let rejectButtonDidTap: PublishRelay<ApplicationEntity>
         let reApplyButtonDidTap: PublishRelay<ApplicationEntity>
         let applicationStatusTableViewDidTap: Observable<(Int, ApplicationStatusType)>
@@ -88,6 +89,11 @@ public final class HomeViewModel: BaseViewModel, Stepper {
             .bind(to: steps)
             .disposed(by: disposeBag)
 
+        input.navigateToWinterInternButtonDidTap.asObservable()
+            .map { _ in HomeStep.winterInternIsRequired }
+            .bind(to: steps)
+            .disposed(by: disposeBag)
+
         input.viewAppear.asObservable()
             .flatMap { [self] in
                 fetchBannerListUseCase.execute()
diff --git a/Projects/Presentation/Sources/WinterIntern/WinterInternViewController.swift b/Projects/Presentation/Sources/WinterIntern/WinterInternViewController.swift
diff --git a/Projects/Presentation/Sources/WinterIntern/WinterInternViewModel.swift b/Projects/Presentation/Sources/WinterIntern/WinterInternViewModel.swift

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,17 @@ struct RecruitmentsRepositoryImpl: RecruitmentsRepository {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`func fetchRecruitmentList(`
`16`		`- page: Int, jobCode: String?, techCode: [String]?, name: String?`
	`16`	`+ page: Int,`
	`17`	`+ jobCode: String?,`
	`18`	`+ techCode: [String]?,`
	`19`	`+ name: String?, winterIntern: Bool?`
`17`	`20`	`) -> Single<[RecruitmentEntity]> {`
`18`		`- remoteRecruitmentsDataSource.fetchRecruitmentList(page: page, jobCode: jobCode, techCode: techCode, name: name)`
	`21`	`+ remoteRecruitmentsDataSource.fetchRecruitmentList(`
	`22`	`+ page: page,`
	`23`	`+ jobCode: jobCode,`
	`24`	`+ techCode: techCode,`
	`25`	`+ name: name,`
	`26`	`+ winterIntern: winterIntern`
	`27`	`+ )`
`19`	`28`	`}`
`20`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ import RxSwift`
`3`	`3`	`public protocol RecruitmentsRepository {`
`4`	`4`	`func fetchRecruitmentDetail(id: Int) -> Single<RecruitmentDetailEntity>`
`5`	`5`	`func fetchRecruitmentList(`
`6`		`- page: Int, jobCode: String?, techCode: [String]?, name: String?`
	`6`	`+ page: Int, jobCode: String?, techCode: [String]?, name: String?, winterIntern: Bool?`
`7`	`7`	`) -> Single<[RecruitmentEntity]>`
`8`	`8`	`}`