[Feat] #493 - 신규 홈뷰 - 화면 전환 구현

SOPT-iOS/Projects/Core/Sources/Extension/UIKit+/UILabel+.swift

@@ -20,17 +20,15 @@ public extension UILabel {
         }
     }
 
-    func setLineSpacingWithChaining(lineSpacing: CGFloat) -> UILabel {
-        let label = self
+    func setLineSpacingWithChaining(lineSpacing: CGFloat) {
         if let text = self.text {
             let style = NSMutableParagraphStyle()
             style.lineSpacing = lineSpacing
             let attributes: [NSAttributedString.Key: Any] = [
                 .paragraphStyle: style
             ]
-            label.attributedText = NSAttributedString(string: text, attributes: attributes)
+            self.attributedText = NSAttributedString(string: text, attributes: attributes)
         }
-        return label
     }
 
     /// 자간 설정 메서드
@@ -83,9 +81,10 @@ public extension UILabel {
     /// - defaultFont, defaultColor에는 기본 폰트와 컬러를 넣어주세요
     func htmlToString(targetString: String,
                       defaultFont: UIFont,
-                      boldFont: UIFont,
+                      boldFont: UIFont?,
                       defaultColor: UIColor) {
         let text = targetString
+        let boldFont = boldFont ?? defaultFont
         guard let data = text.data(using: .utf8) else { return }
 
         do {

SOPT-iOS/Projects/Core/Sources/Literals/StringLiterals.swift

@@ -229,6 +229,12 @@ public struct I18N {
     public struct Home {
         public static let viewAll = "전체보기"
 
+        public struct PopUp {
+            public static let login = "로그인"
+            public static let needToLogin = "로그인이 필요해요"
+            public static let needToLoginDetail = "앱 서비스는 로그인을 해야만 사용할 수 있어요.\n솝트 회원이라면 로그인해주세요."
+        }
+
         public struct DashBoard {
             public struct UserHistory {
                 public static let visitor = "비회원"

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

@@ -16,24 +16,51 @@ public class HomeRepository {
 
     private let homeService: HomeService
     private let calendarService: CalendarService
+    private let userService: UserService
 
     private let cancelBag = CancelBag()
 
     public init(homeService: HomeService,
-                calendarService: CalendarService
+                calendarService: CalendarService,
+                userService: UserService
     ) {
         self.homeService = homeService
         self.calendarService = calendarService
+        self.userService = userService
     }
 }
 
 extension HomeRepository: HomeRepositoryInterface {
+
     public func getAppServices() -> AnyPublisher<[Domain.HomeAppServicesModel], any Error> {
         homeService.getAppServiceAccessStatus()
             .map { $0.map { $0.toDomain() } }
             .eraseToAnyPublisher()
     }
 
+    public func getUserInfo() -> AnyPublisher<Domain.UserMainInfoModel?, Domain.MainError> {
+        userService.getUserMainInfo()
+            .mapError { error -> MainError in
+                guard let error = error as? APIError else {
+                    return MainError.networkError(message: "Moya 에러")
+                }
+
+                switch error {
+                case .network(let statusCode, _):
+                    if statusCode == 401 {
+                        return MainError.authFailed
+                    }
+                    return MainError.networkError(message: "\(statusCode) 네트워크 에러")
+                case .tokenReissuanceFailed:
+                    return MainError.authFailed
+                default:
+                    return MainError.networkError(message: "API 에러 디폴트")
+                }
+            }
+            .map { $0.toDomain() }
+            .eraseToAnyPublisher()
+    }
+
     public func getInsightPosts() -> AnyPublisher<[Domain.HomeInsightPostsModel], any Error> {
         homeService.getInsightPosts()
             .map { $0.map { $0.toDomain() } }

SOPT-iOS/Projects/Demo/Sources/Dependency/RegisterDependencies.swift

@@ -175,7 +175,8 @@ extension AppDelegate {
             implement: {
                 HomeRepository(
                     homeService: DefaultHomeService(),
-                    calendarService: DefaultCalendarService()
+                    calendarService: DefaultCalendarService(),
+                    userService: DefaultUserService()
                 )
             }
         )

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

@@ -12,6 +12,7 @@ import Core
 
 public protocol HomeRepositoryInterface {
     func getHomeDescription() -> AnyPublisher<HomeDescriptionModel, Error>
+    func getUserInfo() -> AnyPublisher<UserMainInfoModel?, MainError>
     func getRecentSchedule() -> AnyPublisher<HomeRecentScheduleModel, Error>
     func getAppServices() -> AnyPublisher<[HomeAppServicesModel], Error>
     func getInsightPosts() -> AnyPublisher<[HomeInsightPostsModel], Error>

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

@@ -12,6 +12,7 @@ import Core
 
 public protocol HomeUseCase {
     func getHomeDescription() -> AnyPublisher<HomeDescriptionModel, Never>
+    func getUserInfo() -> AnyPublisher<UserMainInfoModel?, Never>
     func getRecentSchedule() -> AnyPublisher<HomeRecentScheduleModel, Never>
     func getAppServices() -> AnyPublisher<[HomeAppServicesModel], Never>
     func getInsightPosts() -> AnyPublisher<[HomeInsightPostsModel], Never>
@@ -38,6 +39,13 @@ extension DefaultHomeUseCase: HomeUseCase {
             }.eraseToAnyPublisher()
     }
 
+    public func getUserInfo() -> AnyPublisher<UserMainInfoModel?, Never> {
+        repository.getUserInfo()
+            .catch { error in
+                return Empty<UserMainInfoModel?, Never>()
+            }.eraseToAnyPublisher()
+    }
+
     public func getRecentSchedule() -> AnyPublisher<HomeRecentScheduleModel, Never> {
         repository.getRecentSchedule()
             .catch { error in

SOPT-iOS/Projects/Features/HomeFeature/Interface/Sources/HomeForMemberPresentable.swift

@@ -14,7 +14,12 @@ import Core
 public protocol HomeForMemberViewControllable: ViewControllable { }
 public protocol HomeForMemberCoordinatable {
     var onDashBoardCellTapped: (() -> Void)? { get set }
-
+    var onCalendarCellTapped: (() -> Void)? { get set }
+    var onAttendanceButtonTapped: (() -> Void)? { get set }
+    var onMainProductCellTapped: ((String) -> Void)? { get set }
+    var onAppServiceCellTapped: ((String) -> Void)? { get set }
+    var onNotificationButtonTapped: (() -> Void)? { get set }
+    var onSettingButtonTapped: ((UserType) -> Void)? { get set }
 }
 public typealias HomeForMemberViewModelType = ViewModelType & HomeForMemberCoordinatable
 public typealias HomeForMemberPresentable = (vc: HomeForMemberViewControllable, vm: any HomeForMemberViewModelType)

SOPT-iOS/Projects/Features/HomeFeature/Interface/Sources/HomeForVisitorPresentable.swift

@@ -13,7 +13,9 @@ import Core
 
 public protocol HomeForVisitorViewControllable: ViewControllable { }
 public protocol HomeForVisitorCoordinatable {
-
+    var onMainProductCellTapped: ((String) -> Void)? { get set }
+    var onAppServiceCellTapped: (() -> Void)? { get set }
+    var onSettingButtonTapped: ((UserType) -> Void)? { get set }
 }
 public typealias HomeForVisitorViewModelType = ViewModelType & HomeForVisitorCoordinatable
 public typealias HomeForVisitorPresentable = (vc: HomeForVisitorViewControllable, vm: any HomeForVisitorViewModelType)

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

@@ -140,9 +140,7 @@ extension AnnouncementCardCVC {
 // MARK: - Methods
 
 extension AnnouncementCardCVC {
-    func configureCell(model: HomePresentationModel.Announcement?) {
-        guard let model else { return }
-
+    func configureCell(model: HomePresentationModel.Announcement) {
         self.categoryTagView.setData(with: model.categoryName, isHotTag: false)
         self.categoryDetailLabel.text = "꿀팁"
         if let profileImage = model.profileImage {

SOPT-iOS/Projects/Features/HomeFeature/Sources/HomeScene/Cells/Calendar/CalendarCardCVC.swift

@@ -14,18 +14,20 @@ import DSKit
 
 final class CalendarCardCVC: UICollectionViewCell {
 
+    // MARK: - Properties
+
+    lazy var attendanceButtonTap = attendanceButton.publisher(for: .touchUpInside)
+
     // MARK: - UI Components
 
     private let dateLabel = UILabel().then {
-        $0.text = "10.22"
         $0.textColor = DSKitAsset.Colors.gray400.color
         $0.font = DSKitFontFamily.Suit.semiBold.font(size: 14)
     }
 
     private let scheduleCategoryTagView = HomeSquareTagView()
 
     private let scheduleTitleLabel = UILabel().then {
-        $0.text = "1차 행사"
         $0.textColor = DSKitAsset.Colors.white.color
         $0.font = DSKitFontFamily.Suit.semiBold.font(size: 16)
     }
@@ -126,7 +128,7 @@ extension CalendarCardCVC {
 extension CalendarCardCVC {
     func configureCell(model: HomePresentationModel.RecentSchedule,
                        userType: UserType) {
-        self.dateLabel.text = model.date
+        self.dateLabel.text = setDateFormat(date: model.date, to: "MM.dd")
         self.scheduleTitleLabel.text = model.title
         if let tagType = CalenderCategoryTagType(rawValue: model.type) {
             self.scheduleCategoryTagView.setData(title: tagType.text,

SOPT-iOS/Projects/Features/HomeFeature/Sources/HomeScene/Cells/DashBoard/DashBoardCardCVC.swift

@@ -84,22 +84,23 @@ extension DashBoardCardCVC {
 // MARK: - Methods
 
 extension DashBoardCardCVC {
-    func configureCell(userType: UserType, description: String? = nil) {
+    func configureCell(userType: UserType, model: HomePresentationModel.DashBoard? = nil) {
         switch userType {
         case .visitor:
             self.descriptionLabel.font = DSKitFontFamily.Suit.medium.font(size: 18)
             self.descriptionLabel.text = I18N.Home.DashBoard.UserHistory.encourage
             self.descriptionLabel.setLineSpacing(lineSpacing: 5)
             self.rightArrowWithCircleImageView.isHidden = true
         case .active, .inactive:
-            guard let description else { return }
-            self.descriptionLabel.htmlToString(targetString: description,
+            guard let model else { return }
+            self.descriptionLabel.htmlToString(targetString: model.description,
                                                defaultFont: DSKitFontFamily.Suit.medium.font(size: 18),
                                                boldFont: DSKitFontFamily.Suit.bold.font(size: 18),
                                                defaultColor: DSKitAsset.Colors.white100.color)
+            self.descriptionLabel.setLineSpacingWithChaining(lineSpacing: 5)
             self.rightArrowWithCircleImageView.isHidden = false
+            guard let historyList = model.historyList else { return }
+            userHistoryView.setData(userType: userType, recentHistory: 35, allHistory: historyList)
         }
-
-        userHistoryView.setData(userType: userType, recentHistory: 35, allHistory: [35, 34, 33, 32, 31, 30, 29])
     }
 }

SOPT-iOS/Projects/Features/HomeFeature/Sources/HomeScene/Cells/SocialLinks/SocialLinkCardCVC.swift

@@ -16,9 +16,7 @@ enum SocialLinkCardType: CaseIterable, Identifiable {
     case instagram
     case youtube
 
-    var id: UUID {
-        return UUID()
-    }
+    var id: Self { self }
 
     var image: UIImage {
         switch self {

SOPT-iOS/Projects/Features/HomeFeature/Sources/HomeScene/CollectionView/CompositionalLayout/HomeForMemberCompositionalLayout.swift

@@ -20,6 +20,7 @@ extension HomeForMemberVC {
 
         static let productItemSpacing: Double = 15
         static let appServiceItemSpacing: Double = 16
+        static let mainProductSectionSpacing: Double = 44
         static let announcementWidth: Double = 300
     }
 
@@ -112,7 +113,7 @@ extension HomeForMemberVC {
         let section = NSCollectionLayoutSection(group: productGroup)
         section.contentInsets = NSDirectionalEdgeInsets(top: Metric.defaultItemSpacing,
                                                         leading: Metric.collectionViewDefaultSideInset,
-                                                        bottom: 40,
+                                                        bottom: Metric.mainProductSectionSpacing,
                                                         trailing: Metric.collectionViewDefaultSideInset)
 
         return section

SOPT-iOS/Projects/Features/HomeFeature/Sources/HomeScene/CollectionView/CompositionalLayout/HomeForVisitorCompositionalLayout.swift

@@ -19,6 +19,7 @@ extension HomeForVisitorVC {
         static let defaultSectionSpacing: Double = 36
 
         static let productItemSpacing: Double = 15
+        static let mainProductSectionSpacing: Double = 44
         static let appServiceItemSpacing: Double = 16
     }
 
@@ -84,7 +85,7 @@ extension HomeForVisitorVC {
         section.boundarySupplementaryItems = [header]
         section.contentInsets = NSDirectionalEdgeInsets(top: Metric.defaultItemSpacing,
                                                         leading: Metric.collectionViewDefaultSideInset,
-                                                        bottom: 40,
+                                                        bottom: Metric.mainProductSectionSpacing,
                                                         trailing: Metric.collectionViewDefaultSideInset)
 
         return section

SOPT-iOS/Projects/Features/HomeFeature/Sources/HomeScene/CollectionView/Item/HomeForMemberItem.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 enum HomeForMemberItem: Hashable {
-    case description(HomePresentationModel.Description)
+    case dashBoard(HomePresentationModel.DashBoard)
     case recentSchedule(HomePresentationModel.RecentSchedule)
     case productService(HomePresentationModel.ProductService)
     case appService(HomePresentationModel.AppService)

SOPT-iOS/Projects/Features/HomeFeature/Sources/HomeScene/CollectionView/Item/HomeForVisitorItem.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 enum HomeForVisitorItem: Hashable {
-    case description(HomePresentationModel.Description)
+    case dashBoard(HomePresentationModel.DashBoard)
     case productService(HomePresentationModel.ProductService)
     case appService(HomePresentationModel.AppService)
 }

SOPT-iOS/Projects/Features/HomeFeature/Sources/HomeScene/CollectionView/Registration/HomeForMemberItemProvider.swift

@@ -8,66 +8,75 @@
 
 import UIKit
 
+import Combine
+
 extension HomeForMemberVC {
     // cells
-    func createDashBoardCellRegistration() -> UICollectionView.CellRegistration<DashBoardCardCVC, HomePresentationModel.Description> {
+    func createDashBoardCellRegistration() -> DashBoardCardCellRegistration {
         collectionView.createCellRegistration { [weak self] cell, _, item in
             guard let self else { return }
-            cell.configureCell(userType: self.viewModel.userType, description: item.description)
+            cell.configureCell(userType: self.viewModel.userType, model: item)
         }
     }
 
-    func createCalendarCellRegistration() -> UICollectionView.CellRegistration<CalendarCardCVC, HomePresentationModel.RecentSchedule> {
+    func createCalendarCellRegistration() -> CalendarCellRegistration {
         collectionView.createCellRegistration { [weak self] cell, _, item in
             guard let self else { return }
             cell.configureCell(model: item, userType: self.viewModel.userType)
+
+            cell.attendanceButtonTap
+                .withUnretained(self)
+                .sink { owner, _ in
+                    owner.attendanceButtonTapped.send()
+                }
+                .store(in: cancelBag)
         }
     }
 
-    func createProductCellRegistration() -> UICollectionView.CellRegistration<MainProductCardCVC, HomePresentationModel.ProductService> {
+    func createProductCellRegistration() -> ProductCellRegistration {
         collectionView.createCellRegistration { cell, _, item in
             cell.configureCell(title: item.name, image: item.image)
         }
     }
 
-    func createAppServiceCellRegistration() -> UICollectionView.CellRegistration<AppServiceCardCVC, HomePresentationModel.AppService> {
+    func createAppServiceCellRegistration() -> AppServiceCellRegistration {
         collectionView.createCellRegistration { cell, _, item in
             cell.configureCell(model: item)
         }
     }
 
-    func createInsightCellRegistration() -> UICollectionView.CellRegistration<InsightCardCVC, HomePresentationModel.InsightPost> {
+    func createInsightCellRegistration() -> InsightCellRegistration {
         collectionView.createCellRegistration { cell, _, item in
             cell.configureCell(model: item)
         }
     }
 
-    func createGroupCellRegistration() -> UICollectionView.CellRegistration<GroupCardCVC, HomePresentationModel.GroupPost> {
+    func createGroupCellRegistration() -> GroupCellRegistration {
         collectionView.createCellRegistration { cell, _, item in
             cell.configureCell(model: item)
         }
     }
 
-    func createCoffeeChatCellRegistration() -> UICollectionView.CellRegistration<CoffeeChatCardCVC, HomePresentationModel.CoffeeChat> {
+    func createCoffeeChatCellRegistration() -> CoffeeChatCellRegistration {
         collectionView.createCellRegistration { cell, _, item in
             cell.configureCell(model: item)
         }
     }
 
-    func createAnnouncementCellRegistration() -> UICollectionView.CellRegistration<AnnouncementCardCVC, HomePresentationModel.Announcement> {
+    func createAnnouncementCellRegistration() -> AnnouncementCellRegistration {
         collectionView.createCellRegistration { cell, _, item in
             cell.configureCell(model: item)
         }
     }
 
-    func createSocialLinkCellRegistration() -> UICollectionView.CellRegistration<SocialLinkCardCVC, SocialLinkCardType> {
+    func createSocialLinkCellRegistration() -> SocialLinkCellRegistration {
         collectionView.createCellRegistration { cell, _, item in
             cell.configureCell(type: item)
         }
     }
 
     // supplementary views
-    func createHeaderRegistration() -> UICollectionView.SupplementaryRegistration<HomeDefaultHeaderView> {
+    func createHeaderRegistration() -> HeaderRegistration {
         collectionView.createSupplementaryRegistration(
             elementKind: UICollectionView.elementKindSectionHeader
         ) { headerView, indexPath in
@@ -76,7 +85,7 @@ extension HomeForMemberVC {
         }
     }
 
-    func createFooterRegistration() -> UICollectionView.SupplementaryRegistration<AnnouncementPageContolFooterView> {
+    func createFooterRegistration() -> FooterRegistration {
         collectionView.createSupplementaryRegistration(
             elementKind: UICollectionView.elementKindSectionFooter
         ) { [weak self] footerView, indexPath in