Merge pull request #404 from Team-return/feature/(#403)-Codeseparation_qualityimprovement

🔗 :: (#403) code separation quality improvement

Author: leejh08

Projects/Presentation/Sources/Apply/ApplyReactor.swift

@@ -70,13 +70,31 @@ extension ApplyReactor {
     public func mutate(action: Action) -> Observable<Mutation> {
         switch action {
         case let .documentDidAdd(document):
-            return .just(.addDocument(document))
+            let newDocuments = currentState.documents + [document]
+            let isEnabled = !newDocuments.isEmpty || !currentState.urls.isEmpty
+            return .concat(
+                .just(.addDocument(document)),
+                .just(.updateApplyButtonEnabled(isEnabled))
+            )
 
         case .urlAddButtonDidTap:
-            return .just(.addUrl)
+            let newUrls = currentState.urls + [.init(url: "", type: .url)]
+            let isEnabled = !currentState.documents.isEmpty || !newUrls.isEmpty
+            return .concat(
+                .just(.addUrl),
+                .just(.updateApplyButtonEnabled(isEnabled))
+            )
 
         case let .urlDidChange(index, url):
-            return .just(.updateUrl(index, url))
+            var newUrls = currentState.urls
+            if index < newUrls.count {
+                newUrls[index] = .init(url: url, type: .url)
+            }
+            let isEnabled = !currentState.documents.isEmpty || !newUrls.isEmpty
+            return .concat(
+                .just(.updateUrl(index, url)),
+                .just(.updateApplyButtonEnabled(isEnabled))
+            )
 
         case .applyButtonDidTap:
             let attachments = currentState.documents + currentState.urls
@@ -111,10 +129,26 @@ extension ApplyReactor {
                 }
 
         case let .removeUrl(index):
-            return .just(.removeUrl(index))
+            var newUrls = currentState.urls
+            if index < newUrls.count {
+                newUrls.remove(at: index)
+            }
+            let isEnabled = !currentState.documents.isEmpty || !newUrls.isEmpty
+            return .concat(
+                .just(.removeUrl(index)),
+                .just(.updateApplyButtonEnabled(isEnabled))
+            )
 
         case let .removeDocument(index):
-            return .just(.removeDocument(index))
+            var newDocuments = currentState.documents
+            if index < newDocuments.count {
+                newDocuments.remove(at: index)
+            }
+            let isEnabled = !newDocuments.isEmpty || !currentState.urls.isEmpty
+            return .concat(
+                .just(.removeDocument(index)),
+                .just(.updateApplyButtonEnabled(isEnabled))
+            )
         }
     }
 
@@ -124,7 +158,6 @@ extension ApplyReactor {
         switch mutation {
         case let .addDocument(document):
             newState.documents.append(document)
-            newState.applyButtonEnabled = !newState.documents.isEmpty || !newState.urls.isEmpty
 
         case .addUrl:
             newState.urls.append(.init(url: "", type: .url))
@@ -133,19 +166,16 @@ extension ApplyReactor {
             if index < newState.urls.count {
                 newState.urls[index] = .init(url: url, type: .url)
             }
-            newState.applyButtonEnabled = !newState.documents.isEmpty || !newState.urls.isEmpty
 
         case let .removeUrl(index):
             if index < newState.urls.count {
                 newState.urls.remove(at: index)
             }
-            newState.applyButtonEnabled = !newState.documents.isEmpty || !newState.urls.isEmpty
 
         case let .removeDocument(index):
             if index < newState.documents.count {
                 newState.documents.remove(at: index)
             }
-            newState.applyButtonEnabled = !newState.documents.isEmpty || !newState.urls.isEmpty
 
         case let .updateApplyButtonEnabled(enabled):
             newState.applyButtonEnabled = enabled

Projects/Presentation/Sources/Apply/ApplyViewController.swift

@@ -46,12 +46,10 @@ public final class ApplyViewController: BaseReactorViewController<ApplyReactor>
     private let docsPicker = UIDocumentPickerViewController(forOpeningContentTypes: [
         .pdf,
         .png,
-        .jpeg,
-        .init(filenameExtension: "doc")!,
-        .init(filenameExtension: "docx")!,
-        .init(filenameExtension: "hwp")!,
-        .init(filenameExtension: "pptx")!
-    ])
+        .jpeg
+    ] + [
+        "doc", "docx", "hwp", "pptx"
+    ].compactMap { .init(filenameExtension: $0) })
 
     private let documents = PublishRelay<AttachmentsRequestQuery>()
     private let urls = BehaviorRelay<[AttachmentsRequestQuery]>(value: [])

Projects/Presentation/Sources/Bookmark/BookmarkViewController.swift

@@ -30,23 +30,18 @@ public final class BookmarkViewController: BaseReactorViewController<BookmarkRea
     }
 
     public override func addView() {
-        [
-            bookmarkTableView
-        ].forEach(self.view.addSubview(_:))
-
-        [
-            emptyBookmarkView,
-            navigateToRecruitmentButton
-        ].forEach(self.bookmarkTableView.addSubview(_:))
+        self.view.addSubview(bookmarkTableView)
+        self.view.addSubview(emptyBookmarkView)
+        self.view.addSubview(navigateToRecruitmentButton)
     }
 
     public override func setLayout() {
         bookmarkTableView.snp.makeConstraints {
-            $0.topMargin.leading.trailing.bottom.equalToSuperview()
+            $0.top.leading.trailing.bottom.equalTo(view.safeAreaLayoutGuide)
         }
 
         emptyBookmarkView.snp.makeConstraints {
-            $0.top.equalToSuperview().inset(80)
+            $0.top.equalTo(view.safeAreaLayoutGuide).inset(80)
             $0.centerX.equalToSuperview()
         }
 
@@ -118,6 +113,4 @@ public final class BookmarkViewController: BaseReactorViewController<BookmarkRea
             }
             .disposed(by: disposeBag)
     }
-
-    public override func configureNavigation() { }
 }

Projects/Presentation/Sources/Home/Components/BannerView.swift

@@ -75,7 +75,9 @@ final class BannerView: BaseView {
 
     public func setPageControl(count: Int) {
         self.pageControl.numberOfPages = count
-        self.pageControl.setIndicatorImage(.jobisIcon(.currentPageControl), forPage: 0)
+        if count > 0 {
+            self.pageControl.setIndicatorImage(.jobisIcon(.currentPageControl), forPage: 0)
+        }
     }
 }
 

Projects/Presentation/Sources/Home/Components/Cell/BannerCollectionViewCell.swift

@@ -4,19 +4,19 @@ import SnapKit
 import Then
 import DesignSystem
 
-final class BannerCollectionViewCell: BaseCollectionViewCell<FetchBannerEntity> {
+final class BannerCollectionViewCell: BaseCollectionViewCell<HomeBannerItem> {
     static let identifier = "BannerCollectionViewCell"
 
-    private let currentYear = Date()
     private let imageView = UIImageView().then {
         $0.contentMode = .scaleAspectFill
         $0.layer.cornerRadius = 16
         $0.clipsToBounds = true
     }
     private lazy var passTitleLabel = UILabel().then {
         $0.numberOfLines = 0
+        let currentYear = Calendar.current.component(.year, from: Date())
         $0.setJobisText(
-            "\(Int(currentYear.toStringFormat("yyyy"))! - 2016)기 대마고\n학생들의 취업률",
+            "\(currentYear - 2016)기 대마고\n학생들의 취업률",
             font: .headLine,
             color: .GrayScale.gray90
         )
@@ -81,19 +81,42 @@ final class BannerCollectionViewCell: BaseCollectionViewCell<FetchBannerEntity>
         self.backgroundColor = .GrayScale.gray30
     }
 
-    override func adapt(model: FetchBannerEntity) {
-        setLayout()
-        self.imageView.setJobisImage(urlString: model.bannerURL)
-    }
+    override func adapt(model: HomeBannerItem) {
+        switch model {
+        case let .banner(entity):
+            // Reset/Setup for Banner
+            resetViews()
+            setLayout()
+            self.imageView.setJobisImage(urlString: entity.bannerURL)
+            self.imageView.isHidden = false
 
-    func totalPassAdapt(model: TotalPassStudentEntity) {
-        totalPassSetLayout()
-        let employmentRate = Double(model.passedCount) / Double(model.totalStudentCount) * 100.0
-        let passText = String(format: "%.1f", employmentRate)
-        passLabel.setJobisText(
-            "\(passText)%",
-            font: .headLine,
-            color: .Primary.blue20
-        )
+        case let .totalPass(entity):
+            // Reset/Setup for Total Pass
+            resetViews()
+            totalPassSetLayout()
+            let employmentRate = Double(entity.passedCount) / Double(entity.totalStudentCount) * 100.0
+            let passText = String(format: "%.1f", employmentRate.isNaN ? 0.0 : employmentRate)
+            passLabel.setJobisText(
+                "\(passText)%",
+                font: .headLine,
+                color: .Primary.blue20
+            )
+            
+            passTitleLabel.isHidden = false
+            passLabel.isHidden = false
+            employStatusButton.isHidden = false
+            fileImageView.isHidden = false
+        }
+    }
+    
+    private func resetViews() {
+        imageView.isHidden = true
+        passTitleLabel.isHidden = true
+        passLabel.isHidden = true
+        employStatusButton.isHidden = true
+        fileImageView.isHidden = true
+        
+        // Clear image to prevent reuse issues
+        imageView.image = nil
     }
 }

Projects/Presentation/Sources/Home/HomeBannerItem.swift

@@ -0,0 +1,6 @@
+import Domain
+
+public enum HomeBannerItem {
+    case totalPass(TotalPassStudentEntity)
+    case banner(FetchBannerEntity)
+}

Projects/Presentation/Sources/Home/HomeReactor.swift

@@ -6,6 +6,8 @@ import RxFlow
 import Core
 import Domain
 
+import Domain
+
 public final class HomeReactor: BaseReactor, Stepper {
     public let steps = PublishRelay<Step>()
     public let initialState: State
@@ -56,6 +58,9 @@ public final class HomeReactor: BaseReactor, Stepper {
         var studentInfo: StudentInfoEntity?
         var applicationList: [ApplicationEntity] = []
         var bannerList: [FetchBannerEntity] = []
+        var banners: [HomeBannerItem] = [
+            .totalPass(.init(totalStudentCount: 0, passedCount: 0, approvedCount: 0))
+        ]
         var isWinterInternSeason: Bool = true
         var totalPassStudentInfo: TotalPassStudentEntity = TotalPassStudentEntity(
             totalStudentCount: 0,
@@ -163,12 +168,14 @@ extension HomeReactor {
 
         case let .setBannerList(bannerList):
             newState.bannerList = bannerList
+            newState.banners = [.totalPass(newState.totalPassStudentInfo)] + bannerList.map { .banner($0) }
 
         case let .setWinterInternSeason(isWinterIntern):
             newState.isWinterInternSeason = isWinterIntern
 
         case let .setTotalPassStudentInfo(totalPassStudent):
             newState.totalPassStudentInfo = totalPassStudent
+            newState.banners = [.totalPass(totalPassStudent)] + newState.bannerList.map { .banner($0) }
 
         case .incrementEasterEggCount:
             newState.touchedPopcatCount += 1

Projects/Presentation/Sources/Home/HomeViewController.swift

@@ -197,40 +197,25 @@ public final class HomeViewController: BaseReactorViewController<HomeReactor> {
             }
             .disposed(by: disposeBag)
 
-        let combinedBanners = Observable.combineLatest(
-            reactor.state.map { $0.totalPassStudentInfo },
-            reactor.state.map { $0.bannerList }
-        )
-        .map { totalPass, banners -> [Any] in
-            return [totalPass] + banners
-        }
-
-        combinedBanners
+        reactor.state.map { $0.banners }
             .do(onNext: { [weak self] _ in
                 self?.cellDisposeBag = DisposeBag()
             })
-            .do(onNext: { banners in
-                self.bannerView.setPageControl(count: banners.count)
+            .do(onNext: { [weak self] banners in
+                self?.bannerView.setPageControl(count: banners.count)
             })
             .bind(to: bannerView.collectionView.rx.items(
                 cellIdentifier: BannerCollectionViewCell.identifier,
                 cellType: BannerCollectionViewCell.self
-            )) { [weak self] index, element, cell in
+            )) { [weak self] _, element, cell in
                 guard let self = self else { return }
-
-                if index == 0,
-                   let totalPassModel = element as? TotalPassStudentEntity,
-                   let cell = cell as? BannerCollectionViewCell {
-                    cell.totalPassAdapt(model: totalPassModel)
+                cell.adapt(model: element)
+                
+                if case .totalPass = element {
                     cell.employStatusButton.rx.tap
                         .map { _ in () }
                         .bind(to: self.employStatusButtonTap)
                         .disposed(by: self.cellDisposeBag)
-                } else {
-                    if let fetchBanner = element as? FetchBannerEntity,
-                       let cell = cell as? BannerCollectionViewCell {
-                        cell.adapt(model: fetchBanner)
-                    }
                 }
             }
             .disposed(by: disposeBag)

Projects/Presentation/Sources/Recruitment/RecruitmentViewController.swift

@@ -36,16 +36,16 @@ public final class RecruitmentViewController: BaseReactorViewController<Recruitm
 
     public override func addView() {
         self.view.addSubview(recruitmentTableView)
-        recruitmentTableView.addSubview(listEmptyView)
+        self.view.addSubview(listEmptyView)
     }
 
     public override func setLayout() {
         recruitmentTableView.snp.makeConstraints {
-            $0.edges.equalToSuperview()
+            $0.top.leading.trailing.bottom.equalTo(view.safeAreaLayoutGuide)
         }
         listEmptyView.snp.makeConstraints {
             $0.centerX.equalToSuperview()
-            $0.top.equalToSuperview().inset(80)
+            $0.top.equalTo(view.safeAreaLayoutGuide).inset(80)
         }
     }
 
@@ -107,14 +107,17 @@ public final class RecruitmentViewController: BaseReactorViewController<Recruitm
 
                 if isLoading {
                     self.recruitmentTableView.reloadData()
-                    DispatchQueue.main.async {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.15) { [weak self] in
+                        guard let self = self,
+                              self.reactor.currentState.isLoading else { return }
                         self.recruitmentTableView.showAnimatedSkeleton(
                             usingColor: .systemGray5,
                             transition: .crossDissolve(0.25)
                         )
                     }
                 } else {
                     self.recruitmentTableView.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.25))
+                    self.listEmptyView.isHidden = !list.isEmpty
                 }
             })
             .disposed(by: disposeBag)

Projects/Presentation/Sources/RecruitmentDetail/RecruitmentDetailViewController.swift

@@ -36,8 +36,6 @@ public class RecruitmentDetailViewController: BaseReactorViewController<Recruitm
     private let recruitmentProcessLabel = RecruitmentDetailLabel(title: "선발 절차")
     private let requiredGradeLabel = RecruitmentDetailLabel(title: "기타 자격 요건")
     private let workingHoursLabel = RecruitmentDetailLabel(title: "근무시간")
-//    private let awardedMoneyLabel = RecruitmentDetailLabel(title: "실습 수당")
-//    private let permanentEmployeeLabel = RecruitmentDetailLabel(title: "정규직 전환 시")
     private let benefitsWelfareLabel = RecruitmentDetailLabel(title: "복리후생")
     private let needThingsLabel = RecruitmentDetailLabel(title: "제출 서류")
     private let otherMattersLabel = RecruitmentDetailLabel(title: "기타 사항")
@@ -69,8 +67,6 @@ public class RecruitmentDetailViewController: BaseReactorViewController<Recruitm
             recruitmentProcessLabel,
             requiredGradeLabel,
             workingHoursLabel,
-//            awardedMoneyLabel,
-//            permanentEmployeeLabel,
             benefitsWelfareLabel,
             needThingsLabel,
             otherMattersLabel
@@ -193,6 +189,4 @@ public class RecruitmentDetailViewController: BaseReactorViewController<Recruitm
             }
             .disposed(by: disposeBag)
     }
-
-    public override func configureNavigation() {}
 }