[Feat] #473 - 신규 홈뷰 - 홍보 섹션 API 연동

SOPT-iOS/Projects/Data/Sources/Repository/HomeRepository.swift

@@ -63,4 +63,10 @@ extension HomeRepository: HomeRepositoryInterface {
             .map { $0.map { $0.toDomain() } }
             .eraseToAnyPublisher()
     }
+
+    public func getAnnouncementPosts() -> AnyPublisher<[Domain.HomeAnnouncementModel], any Error> {
+        homeService.getHomeEmploymentEntity()
+            .map { $0.map { $0.toDomain() } }
+            .eraseToAnyPublisher()
+    }
 }

SOPT-iOS/Projects/Data/Sources/Transform/HomeAnnouncementTransform.swift

@@ -0,0 +1,18 @@
+//
+//  HomeAnnouncementTransform.swift
+//  Data
+//
+//  Created by Jae Hyun Lee on 1/20/25.
+//  Copyright © 2025 SOPT-iOS. All rights reserved.
+//
+
+import Foundation
+
+import Domain
+import Networks
+
+extension HomeEmploymentEntity {
+    public func toDomain() -> HomeAnnouncementModel {
+        return HomeAnnouncementModel(id: id, categoryName: categoryName, title: title, profileImage: profileImage, name: name, content: content, images: images)
+    }
+}

SOPT-iOS/Projects/Domain/Sources/Model/HomeAnnouncementModel.swift

@@ -0,0 +1,27 @@
+//
+//  HomeAnnouncementModel.swift
+//  Domain
+//
+//  Created by Jae Hyun Lee on 1/20/25.
+//  Copyright © 2025 SOPT-iOS. All rights reserved.
+//
+
+import Foundation
+
+public struct HomeAnnouncementModel {
+    public let id: Int
+    public let profileImage, name: String?
+    public let categoryName, title: String
+    public let content: String
+    public let images: [String]?
+
+    public init(id: Int, categoryName: String, title: String, profileImage: String?, name: String?, content: String, images: [String]?) {
+        self.id = id
+        self.categoryName = categoryName
+        self.title = title
+        self.profileImage = profileImage
+        self.name = name
+        self.content = content
+        self.images = images
+    }
+}

SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/HomeRepositoryInterface.swift

@@ -17,4 +17,5 @@ public protocol HomeRepositoryInterface {
     func getInsightPosts() -> AnyPublisher<[HomeInsightPostsModel], Error>
     func getGroupPosts() -> AnyPublisher<[HomeGroupPostModel], Error>
     func getCoffeeChatPosts() -> AnyPublisher<[HomeCoffeeChatPostModel], Error>
+    func getAnnouncementPosts() -> AnyPublisher<[HomeAnnouncementModel], Error>
 }

SOPT-iOS/Projects/Domain/Sources/UseCase/HomeUseCase.swift

@@ -17,13 +17,15 @@ public protocol HomeUseCase {
     var insightPosts: PassthroughSubject<[HomeInsightPostsModel], Never> { get set }
     var groupPosts: PassthroughSubject<[HomeGroupPostModel], Never> { get set }
     var coffeeChatPosts: PassthroughSubject<[HomeCoffeeChatPostModel], Never> { get set }
+    var announcementPosts: PassthroughSubject<[HomeAnnouncementModel], Never> { get set }
 
     func getHomeDescription()
     func getRecentSchedule()
     func getAppServices()
     func getInsightPosts()
     func getGroupPosts()
     func getCoffeeChatPosts()
+    func getAnnouncementPosts()
 }
 
 public class DefaultHomeUseCase {
@@ -37,6 +39,7 @@ public class DefaultHomeUseCase {
     public var insightPosts = PassthroughSubject<[HomeInsightPostsModel], Never>()
     public var groupPosts = PassthroughSubject<[HomeGroupPostModel], Never>()
     public var coffeeChatPosts = PassthroughSubject<[HomeCoffeeChatPostModel], Never>()
+    public var announcementPosts = PassthroughSubject<[HomeAnnouncementModel], Never>()
 
     public init(repository: HomeRepositoryInterface) {
         self.repository = repository
@@ -109,4 +112,15 @@ extension DefaultHomeUseCase: HomeUseCase {
             }
             .store(in: cancelBag)
     }
+
+    public func getAnnouncementPosts() {
+        repository.getAnnouncementPosts()
+            .withUnretained(self)
+            .sink { event in
+                print("GetAnnouncementPosts State: \(event)")
+            } receiveValue: { owner, posts in
+                owner.announcementPosts.send(posts)
+            }
+            .store(in: cancelBag)
+    }
 }

SOPT-iOS/Projects/Features/HomeFeature/Sources/HomeScene/Cells/Announcements/AnnouncementCardCVC.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 
+import Domain
 import Core
 import DSKit
 
@@ -33,7 +34,7 @@ final class AnnouncementCardCVC: UICollectionViewCell {
         $0.spacing = 10
     }
 
-    private let writerProfileImageView = CustomProfileImageView()
+    private let writerProfileImageView = CustomProfileImageView().hideBorder()
 
     private let writerNameLabel = UILabel().then {
         $0.textColor = DSKitAsset.Colors.white.color
@@ -139,17 +140,21 @@ extension AnnouncementCardCVC {
 // MARK: - Methods
 
 extension AnnouncementCardCVC {
-    func configureCell(model: AnnouncementInfo) {
+    func configureCell(model: HomeAnnouncementModel?) {
+        guard let model else { return }
+
         self.categoryTagView.setData(with: model.categoryName, isHotTag: false)
-        self.categoryDetailLabel.text = model.categoryDetailName
-        self.writerProfileImageView.setImage(with: model.profileImage)
+        self.categoryDetailLabel.text = "꿀팁"
+        if let profileImage = model.profileImage {
+            self.writerProfileImageView.setImage(with: profileImage)
+        }
         self.writerNameLabel.text = model.name
         self.titleLabel.text = model.title
         self.contentLabel.text = model.content
 
         let hasCoverImage = (model.images != nil)
         updateContentLayout(hasCoverImage: hasCoverImage)
-        if hasCoverImage, let cover = model.images {
+        if hasCoverImage, let cover = model.images?.first {
             self.coverImageView.setImage(with: cover)
         } else {
             updateContentLabelAttributes()

SOPT-iOS/Projects/Features/HomeFeature/Sources/HomeScene/Components/HomeCategoryTagView.swift

@@ -23,6 +23,8 @@ final class HomeCategoryTagView: UIView {
 
     private let contentStackView = UIStackView().then {
         $0.axis = .horizontal
+        $0.alignment = .center
+        $0.distribution = .equalSpacing
     }
 
     private let hotIconImageView = UIImageView().then {

SOPT-iOS/Projects/Features/HomeFeature/Sources/HomeScene/VC/HomeForMemberVC.swift

@@ -150,14 +150,6 @@ extension HomeForMemberVC {
         self.collectionView.register(SocialLinkCardCVC.self,
                                      forCellWithReuseIdentifier: SocialLinkCardCVC.className)
     }
-
-    private func bindViewModels() {
-        let input = HomeForMemberViewModel.Input(
-            cellTapped: cellTapped.asDriver()
-        )
-
-        let output = self.viewModel.transform(from: input, cancelBag: self.cancelBag)
-    }
 }
 
 // MARK: - UICollectionViewDelegate
@@ -169,10 +161,6 @@ extension HomeForMemberVC: UICollectionViewDelegate {
 // MARK: - UICollectionViewDataSource
 
 extension HomeForMemberVC: UICollectionViewDataSource {
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        cellTapped.send(indexPath)
-    }
-
     func numberOfSections(in collectionView: UICollectionView) -> Int {
         return HomeForMemberSectionLayoutKind.allCases.count
     }
@@ -217,7 +205,7 @@ extension HomeForMemberVC: UICollectionViewDataSource {
         case .insight: return viewModel.insightPosts != nil ? 1 : 0
         case .group: return viewModel.groupPosts?.count ?? 0
         case .coffeeChat: return viewModel.coffeeChatPosts?.count ?? 0
-        case .announcement: return viewModel.announcementInfoList.count
+        case .announcement: return viewModel.announcementPosts?.count ?? 0
         case .socialLinks: return SocialLinkCardType.allCases.count
         }
     }
@@ -305,10 +293,11 @@ extension HomeForMemberVC: UICollectionViewDataSource {
         case .announcement:
             /// 홍보 카드 셀
             let announcementIndex = indexPath.item
+            guard let announcement = viewModel.announcementPosts?[safe: announcementIndex] else { return UICollectionViewCell() }
             guard let announcementCardCell = collectionView
                 .dequeueReusableCell(withReuseIdentifier: AnnouncementCardCVC.className,
                                      for: indexPath) as? AnnouncementCardCVC else { return UICollectionViewCell() }
-            announcementCardCell.configureCell(model: viewModel.announcementInfoList[announcementIndex])
+            announcementCardCell.configureCell(model: announcement)
 
             return announcementCardCell
 

SOPT-iOS/Projects/Features/HomeFeature/Sources/HomeScene/ViewModel/HomeForMemberViewModel.swift

@@ -86,6 +86,7 @@ public class HomeForMemberViewModel: HomeForMemberViewModelType {
     var insightPosts: [HomeInsightPostsModel]?
     var groupPosts: [HomeGroupPostModel]?
     var coffeeChatPosts: [HomeCoffeeChatPostModel]?
+    var announcementPosts: [HomeAnnouncementModel]?
 
     // MARK: - Inputs
 
@@ -125,6 +126,7 @@ extension HomeForMemberViewModel {
                 owner.useCase.getInsightPosts()
                 owner.useCase.getGroupPosts()
                 owner.useCase.getCoffeeChatPosts()
+                owner.useCase.getAnnouncementPosts()
             }.store(in: cancelBag)
 
         return output
@@ -173,5 +175,12 @@ extension HomeForMemberViewModel {
                 owner.coffeeChatPosts = posts
                 output.needToReload.send()
             }.store(in: cancelBag)
+
+        useCase.announcementPosts
+            .withUnretained(self)
+            .sink { owner, posts in
+                owner.announcementPosts = posts
+                output.needToReload.send()
+            }.store(in: cancelBag)
     }
 }

SOPT-iOS/Projects/Modules/Networks/Sources/API/HomeAPI.swift

@@ -18,6 +18,7 @@ public enum HomeAPI {
     case getInsightPosts
     case getGroupAll
     case getCoffeeChat
+    case getEmployment
 }
 
 extension HomeAPI: BaseAPI {
@@ -35,19 +36,21 @@ extension HomeAPI: BaseAPI {
             return "/meeting/all"
         case .getCoffeeChat:
             return "/coffeechat"
+        case .getEmployment:
+            return "/employments"
         }
     }
 
     public var method: Moya.Method {
         switch self {
-        case .getDescription, .getAppServiceAccessStatus, .getInsightPosts, .getGroupAll, .getCoffeeChat:
+        case .getDescription, .getAppServiceAccessStatus, .getInsightPosts, .getGroupAll, .getCoffeeChat, .getEmployment:
             return .get
         }
     }
 
     public var task: Moya.Task {
         switch self {
-        case .getDescription, .getAppServiceAccessStatus, .getInsightPosts, .getCoffeeChat:
+        case .getDescription, .getAppServiceAccessStatus, .getInsightPosts, .getCoffeeChat, .getEmployment:
             return .requestPlain
         case .getGroupAll:
             return .requestParameters(parameters: ["page": 1, "take": 10, "category": "행사,세미나"], encoding: URLEncoding.queryString)

SOPT-iOS/Projects/Modules/Networks/Sources/Entity/HomeEmploymentEntity.swift

@@ -0,0 +1,19 @@
+//
+//  HomeEmploymentEntity.swift
+//  Networks
+//
+//  Created by Jae Hyun Lee on 1/20/25.
+//  Copyright © 2025 SOPT-iOS. All rights reserved.
+//
+
+import Foundation
+
+// MARK: - HomeEmploymentEntity
+
+public struct HomeEmploymentEntity: Codable {
+    public let id: Int
+    public let profileImage, name: String?
+    public let categoryName, title: String
+    public let content: String
+    public let images: [String]
+}

SOPT-iOS/Projects/Modules/Networks/Sources/Service/HomeService.swift

@@ -19,6 +19,7 @@ public protocol HomeService {
     func getInsightPosts() -> AnyPublisher<[HomeInsightPostsEntity], Error>
     func getGroupAll() -> AnyPublisher<[HomeGroupEntity], Error>
     func getCoffeeChat() -> AnyPublisher<[HomeCoffeeChatEntity], Error>
+    func getHomeEmploymentEntity() -> AnyPublisher<[HomeEmploymentEntity], Error>
 }
 
 extension DefaultHomeService: HomeService {
@@ -41,4 +42,8 @@ extension DefaultHomeService: HomeService {
     public func getCoffeeChat() -> AnyPublisher<[HomeCoffeeChatEntity], any Error> {
         requestObjectInCombine(.getCoffeeChat)
     }
+
+    public func getHomeEmploymentEntity() -> AnyPublisher<[HomeEmploymentEntity], any Error> {
+        requestObjectInCombine(.getEmployment)
+    }
 }