Merge remote-tracking branch 'origin/develop' into feature/(#199)-notification_api

Author: juyeong525

Projects/Core/Sources/Steps/ApplyStep.swift

@@ -4,4 +4,5 @@ public enum ApplyStep: Step {
     case applyIsRequired(recruitmentId: Int, name: String, imageURL: String)
     case reApplyIsRequired(applicationId: Int, name: String, imageURL: String)
     case popToRecruitmentDetail
+    case errorToast(message: String)
 }

Projects/Core/Sources/Steps/CompanyDetailStep.swift

@@ -2,5 +2,6 @@ import RxFlow
 
 public enum CompanyDetailStep: Step {
     case companyDetailIsRequired
-    case recruitmentDetailIsRequired
+    case popIsRequired
+    case recruitmentDetailIsRequired(id: Int)
 }

Projects/Data/Sources/DataSource/API/ApplicationsAPI.swift

@@ -12,7 +12,7 @@ enum ApplicationsAPI {
 }
 
 extension ApplicationsAPI: JobisAPI {
-    typealias ErrorType = JobisError
+    typealias ErrorType = ApplicationsError
 
     var domain: JobisDomain {
         .applications
@@ -81,10 +81,18 @@ extension ApplicationsAPI: JobisAPI {
     public var errorMap: [Int: ErrorType]? {
         switch self {
         case .applyCompany:
-            return [:]
+            return [
+                404: .badRequest,
+                409: .conflict,
+                500: .internalServerError
+            ]
 
         case .reApplyCompany:
-            return [:]
+            return [
+                404: .badRequest,
+                409: .conflict,
+                500: .internalServerError
+            ]
 
         case .cancelApply:
             return [:]

Projects/Domain/Sources/Error/ApplicationsError.swift

@@ -0,0 +1,7 @@
+import Foundation
+
+public enum ApplicationsError: Error {
+    case conflict
+    case badRequest
+    case internalServerError
+}

Projects/Flow/Sources/Apply/ApplyFlow.swift

@@ -22,10 +22,15 @@ public final class ApplyFlow: Flow {
         switch step {
         case let .applyIsRequired(id, name, imageURL):
             return navigateToApply(id: id, name: name, imageURL: imageURL)
+
         case .popToRecruitmentDetail:
             return popToRecruitmentDetail()
+
         case let .reApplyIsRequired(id, name, imageURL):
             return navigateToReApply(id: id, name: name, imageURL: imageURL)
+
+        case let .errorToast(message):
+            return errorToast(message: message)
         }
     }
 }
@@ -57,4 +62,9 @@ private extension ApplyFlow {
         self.rootViewController.navigationController?.popViewController(animated: true)
         return .none
     }
+
+    func errorToast(message: String) -> FlowContributors {
+        self.rootViewController.showJobisToast(text: message, inset: 92)
+        return .none
+    }
 }

Projects/Flow/Sources/BookmarkFlow.swift

@@ -43,18 +43,19 @@ private extension BookmarkFlow {
     }
 
     func navigateToRecruitmentDetail(_ recruitmentID: Int) -> FlowContributors {
-        let recruitmentDetailViewController = container.resolve(RecruitmentDetailViewController.self)!.then {
-            $0.viewModel.recruitmentID = recruitmentID
+        let recruitmentDetailFlow = RecruitmentDetailFlow(container: container)
+
+        Flows.use(recruitmentDetailFlow, when: .created) { (root) in
+            let view = root as? RecruitmentDetailViewController
+            view?.viewModel.recruitmentID = recruitmentID
+            self.rootViewController.pushViewController(
+                view!, animated: true
+            )
         }
 
-        self.rootViewController.pushViewController(
-            recruitmentDetailViewController,
-            animated: true
-        )
-
         return .one(flowContributor: .contribute(
-            withNextPresentable: recruitmentDetailViewController,
-            withNextStepper: recruitmentDetailViewController.viewModel
+            withNextPresentable: recruitmentDetailFlow,
+            withNextStepper: OneStepper(withSingleStep: RecruitmentDetailStep.recruitmentDetailIsRequired)
         ))
     }
 }

Projects/Flow/Sources/Company/CompanyDetailFlow.swift

@@ -23,8 +23,11 @@ public final class CompanyDetailFlow: Flow {
         case .companyDetailIsRequired:
             return navigateToCompanyDetail()
 
-        case .recruitmentDetailIsRequired:
-            return dismissCompanyDetail()
+        case .popIsRequired:
+            return popCompanyDetail()
+
+        case let.recruitmentDetailIsRequired(id):
+            return navigateToRecruimtentDetail(recruitmentID: id)
         }
     }
 }
@@ -37,8 +40,26 @@ private extension CompanyDetailFlow {
         ))
     }
 
-    func dismissCompanyDetail() -> FlowContributors {
+    func popCompanyDetail() -> FlowContributors {
         rootViewController.navigationController?.popViewController(animated: true)
         return .none
     }
+
+    func navigateToRecruimtentDetail(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?.viewModel.type = .companyDeatil
+            self.rootViewController.navigationController?.pushViewController(
+                view!, animated: true
+            )
+        }
+
+        return .one(flowContributor: .contribute(
+            withNextPresentable: recruitmentDetailFlow,
+            withNextStepper: OneStepper(withSingleStep: RecruitmentDetailStep.recruitmentDetailIsRequired)
+        ))
+    }
 }

Projects/Flow/Sources/Company/CompanySearchFlow.swift

@@ -42,6 +42,7 @@ private extension CompanySearchFlow {
         Flows.use(companyDetailFlow, when: .created) { (root) in
             let view = root as? CompanyDetailViewController
             view?.viewModel.companyID = id
+            view?.viewModel.type = .searchCompany
             self.rootViewController.navigationController?.pushViewController(
                 view!, animated: true
             )

Projects/Modules/DesignSystem/Sources/Extensions/UIViewController/UIViewController+showJobisToast.swift

@@ -2,43 +2,40 @@ import UIKit
 import SnapKit
 
 public extension UIViewController {
-    func showJobisToast(text: String) {
+    func showJobisToast(text: String, inset: CGFloat) {
         let jobisToast = JobisToast(text: text)
         let animationOption = UIView.AnimationOptions.transitionCrossDissolve
-        self.view.addSubview(jobisToast)
-        resetToast(toast: jobisToast)
+        let scenes = UIApplication.shared.connectedScenes
+        let windowScene = scenes.first as? UIWindowScene
+        let window = windowScene?.windows.first
+
+        window?.addSubview(jobisToast)
+        resetToast(toast: jobisToast, inset: inset)
 
         UIView.animate(
             withDuration: 0.3,
             delay: 0,
             options: animationOption
-        ) { [self] in
+        ) {
             jobisToast.alpha = 1
-            jobisToast.snp.remakeConstraints {
-                $0.centerX.equalToSuperview()
-                $0.bottom.equalTo(self.view.safeAreaLayoutGuide).inset(12).priority(1000)
-            }
-            self.view.layoutIfNeeded()
         }
 
         UIView.animate(
             withDuration: 0.3,
-            delay: 3,
+            delay: 1.25,
             options: animationOption,
-            animations: { [self] in
+            animations: {
                 jobisToast.alpha = 0
-                resetToast(toast: jobisToast)
             }, completion: { _ in
                 jobisToast.removeFromSuperview()
             }
         )
     }
 
-    private func resetToast(toast: JobisToast) {
-        self.view.layoutIfNeeded()
+    private func resetToast(toast: JobisToast, inset: CGFloat) {
         toast.snp.makeConstraints {
             $0.centerX.equalToSuperview()
-            $0.top.equalTo(self.view.snp.bottom)
+            $0.bottomMargin.equalToSuperview().inset(inset)
         }
     }
 }

Projects/Modules/DesignSystem/Sources/Toast/JobisToast.swift

@@ -2,7 +2,7 @@ import UIKit
 import Then
 import SnapKit
 
-final class JobisToast: UIView {
+final class JobisToast: UIStackView {
     private let imageView = UIImageView().then {
         $0.image = DesignSystemAsset.Icons.toastIcon.image
     }
@@ -13,7 +13,8 @@ final class JobisToast: UIView {
         textLabel.setJobisText(text, font: .subHeadLine, color: .GrayScale.gray90)
         configureView()
     }
-    required init?(coder: NSCoder) {
+
+    required init(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
@@ -22,20 +23,18 @@ final class JobisToast: UIView {
         self.layer.borderColor = UIColor.GrayScale.gray40.cgColor
         self.layer.borderWidth = 1
         self.backgroundColor = .GrayScale.gray30
+        self.axis = .horizontal
+        self.spacing = 4
+        self.layoutMargins = .init(top: 12, left: 16, bottom: 12, right: 16)
+        self.isLayoutMarginsRelativeArrangement = true
 
         [
             imageView,
             textLabel
-        ].forEach { self.addSubview($0) }
+        ].forEach { self.addArrangedSubview($0) }
 
         imageView.snp.makeConstraints {
-            $0.leading.top.bottom.equalToSuperview().inset(12)
             $0.width.height.equalTo(24)
         }
-        textLabel.snp.makeConstraints {
-            $0.trailing.equalToSuperview().inset(16)
-            $0.top.bottom.equalToSuperview().inset(12)
-            $0.leading.equalTo(imageView.snp.trailing).offset(4)
-        }
     }
 }