Merge pull request #263 from Team-return/feature/(#254)-feature_banner

cyj513 · web-flow · commit 15421ed51856 · 2024-10-26T00:37:58.000+09:00
🔗 :: (#254) 취업률 배너 추가
diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/fileImage.imageset/Contents.json b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/fileImage.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Pie Chart.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/fileImage.imageset/Pie Chart.png b/Projects/Modules/DesignSystem/Resources/Images/Icons.xcassets/fileImage.imageset/Pie Chart.png
diff --git a/Projects/Modules/DesignSystem/Sources/Image/JobisIcon.swift b/Projects/Modules/DesignSystem/Sources/Image/JobisIcon.swift
@@ -43,6 +43,7 @@ public enum JobisIcon {
     case link
     case close
     case addPhoto
+    case fileImage
 
     func uiImage() -> UIImage {
         let dsIcons = DesignSystemAsset.Icons.self
@@ -152,6 +153,9 @@ public enum JobisIcon {
 
         case .addPhoto:
             return dsIcons.addPhoto.image
+
+        case .fileImage:
+            return dsIcons.fileImage.image
         }
     }
 }
diff --git a/Projects/Presentation/Sources/DI/PresentationAssembly.swift b/Projects/Presentation/Sources/DI/PresentationAssembly.swift
@@ -14,7 +14,8 @@ public final class PresentationAssembly: Assembly {
             HomeViewModel(
                 fetchStudentInfoUseCase: resolver.resolve(FetchStudentInfoUseCase.self)!,
                 fetchApplicationUseCase: resolver.resolve(FetchApplicationUseCase.self)!,
-                fetchBannerListUseCase: resolver.resolve(FetchBannerListUseCase.self)!
+                fetchBannerListUseCase: resolver.resolve(FetchBannerListUseCase.self)!,
+                fetchTotalPassStudentUseCase: resolver.resolve(FetchTotalPassStudentUseCase.self)!
             )
         }
 
diff --git a/Projects/Presentation/Sources/Home/Components/Cell/BannerCollectionViewCell.swift b/Projects/Presentation/Sources/Home/Components/Cell/BannerCollectionViewCell.swift
@@ -11,10 +11,57 @@ final class BannerCollectionViewCell: BaseCollectionViewCell<FetchBannerEntity>
         $0.layer.cornerRadius = 16
         $0.clipsToBounds = true
     }
+    private let passTitleLabel = UILabel().then {
+        $0.numberOfLines = 0
+        $0.setJobisText(
+            "9기 대마고\n학생들의 취업률",
+            font: .headLine,
+            color: .GrayScale.gray90
+        )
+    }
+    private let passLabel = UILabel().then {
+        $0.setJobisText(
+            " - ",
+            font: .headLine,
+            color: .Primary.blue20
+        )
+    }
+    private let prePassCountTitleLabel = UILabel().then {
+        $0.setJobisText(
+            "현재",
+            font: .subHeadLine,
+            color: .GrayScale.gray60
+        )
+    }
+    private let sufPassCountTitleLabel = UILabel().then {
+        $0.setJobisText(
+            "명이 취업했어요",
+            font: .subHeadLine,
+            color: .GrayScale.gray60
+        )
+    }
+    private let passCountLabel = UILabel().then {
+        $0.setJobisText(
+            " - ",
+            font: .subHeadLine,
+            color: .GrayScale.gray70
+        )
+    }
+    private let fileImageView = UIImageView().then {
+        $0.contentMode = .scaleAspectFill
+        $0.clipsToBounds = true
+        $0.image = UIImage.jobisIcon(.fileImage)
+    }
 
     override func addView() {
         [
-            imageView
+            imageView,
+            passTitleLabel,
+            passLabel,
+            prePassCountTitleLabel,
+            sufPassCountTitleLabel,
+            passCountLabel,
+            fileImageView
         ].forEach(contentView.addSubview(_:))
     }
 
@@ -24,12 +71,58 @@ final class BannerCollectionViewCell: BaseCollectionViewCell<FetchBannerEntity>
         }
     }
 
+    func totalPassSetLayout() {
+        passTitleLabel.snp.makeConstraints {
+            $0.top.leading.equalToSuperview().inset(24)
+        }
+
+        passLabel.snp.makeConstraints {
+            $0.top.equalTo(passTitleLabel.snp.bottom)
+            $0.leading.equalToSuperview().inset(24)
+        }
+
+        prePassCountTitleLabel.snp.makeConstraints {
+            $0.bottom.leading.equalToSuperview().inset(24)
+        }
+
+        passCountLabel.snp.makeConstraints {
+            $0.top.equalTo(prePassCountTitleLabel.snp.top)
+            $0.leading.equalTo(prePassCountTitleLabel.snp.trailing).offset(4)
+        }
+
+        sufPassCountTitleLabel.snp.makeConstraints {
+            $0.bottom.equalToSuperview().inset(24)
+            $0.leading.equalTo(passCountLabel.snp.trailing).offset(4)
+        }
+
+        fileImageView.snp.makeConstraints {
+            $0.width.height.equalTo(180)
+            $0.top.trailing.equalToSuperview()
+        }
+    }
+
     override func configureView() {
         self.layer.cornerRadius = 12
         self.backgroundColor = .GrayScale.gray30
     }
 
     override func adapt(model: FetchBannerEntity) {
+        setLayout()
         self.imageView.setJobisImage(urlString: model.bannerURL)
     }
+
+    func totalPassAdapt(model: TotalPassStudentEntity) {
+        totalPassSetLayout()
+        passLabel.setJobisText(
+            "\(Int(Double(model.passedCount) / Double(model.totalStudentCount) * 100.0))%",
+            font: .headLine,
+            color: .Primary.blue20
+        )
+
+        passCountLabel.setJobisText(
+            "\(model.passedCount)/\(model.totalStudentCount)",
+            font: .subHeadLine,
+            color: .GrayScale.gray70
+        )
+    }
 }
diff --git a/Projects/Presentation/Sources/Home/HomeViewController.swift b/Projects/Presentation/Sources/Home/HomeViewController.swift
@@ -168,16 +168,28 @@ public final class HomeViewController: BaseViewController<HomeViewModel> {
             }
             .disposed(by: disposeBag)
 
-        output.bannerList
-            .filter { !$0.isEmpty }
-            .do(onNext: {
-                self.bannerView.setPageControl(count: $0.count)
+        let totalPassBannerModel = output.totalPassStudentInfo.value
+
+        let combinedBanners = output.bannerList
+            .map { banners in
+                return [totalPassBannerModel] + banners
+            }
+
+        combinedBanners
+            .do(onNext: { banners in
+                self.bannerView.setPageControl(count: banners.count)
             })
             .bind(to: bannerView.collectionView.rx.items(
                 cellIdentifier: BannerCollectionViewCell.identifier,
                 cellType: BannerCollectionViewCell.self
-            )) { _, element, cell in
-                cell.adapt(model: element)
+            )) { index, element, cell in
+                if index == 0 {
+                    cell.totalPassAdapt(model: output.totalPassStudentInfo.value)
+                } else {
+                    if let fetchBanner = element as? FetchBannerEntity {
+                        cell.adapt(model: fetchBanner)
+                    }
+                }
             }
             .disposed(by: disposeBag)
     }
diff --git a/Projects/Presentation/Sources/Home/HomeViewModel.swift b/Projects/Presentation/Sources/Home/HomeViewModel.swift
@@ -11,17 +11,20 @@ public final class HomeViewModel: BaseViewModel, Stepper {
     private let fetchStudentInfoUseCase: FetchStudentInfoUseCase
     private let fetchApplicationUseCase: FetchApplicationUseCase
     private let fetchBannerListUseCase: FetchBannerListUseCase
+    private let fetchTotalPassStudentUseCase: FetchTotalPassStudentUseCase
 
     private var touchedPopcatCount = 0
 
     init(
         fetchStudentInfoUseCase: FetchStudentInfoUseCase,
         fetchApplicationUseCase: FetchApplicationUseCase,
-        fetchBannerListUseCase: FetchBannerListUseCase
+        fetchBannerListUseCase: FetchBannerListUseCase,
+        fetchTotalPassStudentUseCase: FetchTotalPassStudentUseCase
     ) {
         self.fetchStudentInfoUseCase = fetchStudentInfoUseCase
         self.fetchApplicationUseCase = fetchApplicationUseCase
         self.fetchBannerListUseCase = fetchBannerListUseCase
+        self.fetchTotalPassStudentUseCase = fetchTotalPassStudentUseCase
     }
 
     public struct Input {
@@ -40,12 +43,18 @@ public final class HomeViewModel: BaseViewModel, Stepper {
         let studentInfo: PublishRelay<StudentInfoEntity>
         let applicationList: PublishRelay<[ApplicationEntity]>
         let bannerList: BehaviorRelay<[FetchBannerEntity]>
+        let totalPassStudentInfo: BehaviorRelay<TotalPassStudentEntity>
     }
 
     public func transform(_ input: Input) -> Output {
         let studentInfo = PublishRelay<StudentInfoEntity>()
         let applicationList = PublishRelay<[ApplicationEntity]>()
         let bannerList = BehaviorRelay<[FetchBannerEntity]>(value: [])
+        let totalPassStudentInfo = BehaviorRelay<TotalPassStudentEntity>(value: TotalPassStudentEntity.init(
+            totalStudentCount: 0,
+            passedCount: 0,
+            approvedCount: 0
+        ))
 
         input.viewAppear.asObservable()
             .flatMap { [self] in
@@ -94,6 +103,13 @@ public final class HomeViewModel: BaseViewModel, Stepper {
             .bind(to: steps)
             .disposed(by: disposeBag)
 
+        input.viewAppear.asObservable()
+            .flatMap { [self] in
+                fetchTotalPassStudentUseCase.execute()
+            }
+            .bind(to: totalPassStudentInfo)
+            .disposed(by: disposeBag)
+
         input.viewAppear.asObservable()
             .flatMap { [self] in
                 fetchBannerListUseCase.execute()
@@ -146,7 +162,8 @@ public final class HomeViewModel: BaseViewModel, Stepper {
         return Output(
             studentInfo: studentInfo,
             applicationList: applicationList,
-            bannerList: bannerList
+            bannerList: bannerList,
+            totalPassStudentInfo: totalPassStudentInfo
         )
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ public enum JobisIcon {`
`43`	`43`	`case link`
`44`	`44`	`case close`
`45`	`45`	`case addPhoto`
	`46`	`+ case fileImage`
`46`	`47`
`47`	`48`	`func uiImage() -> UIImage {`
`48`	`49`	`let dsIcons = DesignSystemAsset.Icons.self`
`@@ -152,6 +153,9 @@ public enum JobisIcon {`
`152`	`153`
`153`	`154`	`case .addPhoto:`
`154`	`155`	`return dsIcons.addPhoto.image`
	`156`	`+`
	`157`	`+ case .fileImage:`
	`158`	`+ return dsIcons.fileImage.image`
`155`	`159`	`}`
`156`	`160`	`}`
`157`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ public final class PresentationAssembly: Assembly {`
`14`	`14`	`HomeViewModel(`
`15`	`15`	`fetchStudentInfoUseCase: resolver.resolve(FetchStudentInfoUseCase.self)!,`
`16`	`16`	`fetchApplicationUseCase: resolver.resolve(FetchApplicationUseCase.self)!,`
`17`		`- fetchBannerListUseCase: resolver.resolve(FetchBannerListUseCase.self)!`
	`17`	`+ fetchBannerListUseCase: resolver.resolve(FetchBannerListUseCase.self)!,`
	`18`	`+ fetchTotalPassStudentUseCase: resolver.resolve(FetchTotalPassStudentUseCase.self)!`
`18`	`19`	`)`
`19`	`20`	`}`
`20`	`21`