🔀 :: (#674) 공지사항 전부 읽었는지 판별 기능

Projects/App/Sources/Application/AppComponent+Notice.swift

@@ -1,11 +1,3 @@
-//
-//  AppComponent+Notice.swift
-//  WaktaverseMusic
-//
-//  Created by KTH on 2023/04/08.
-//  Copyright © 2023 yongbeomkwak. All rights reserved.
-//
-
 import BaseFeature
 import MainTabFeature
 import MyInfoFeature
@@ -39,9 +31,15 @@ public extension AppComponent {
         }
     }
 
-    var fetchNoticeUseCase: any FetchNoticeUseCase {
+    var fetchNoticeAllUseCase: any FetchNoticeAllUseCase {
+        shared {
+            FetchNoticeAllUseCaseImpl(noticeRepository: noticeRepository)
+        }
+    }
+
+    var fetchNoticePopupUseCase: any FetchNoticePopupUseCase {
         shared {
-            FetchNoticeUseCaseImpl(noticeRepository: noticeRepository)
+            FetchNoticePopupUseCaseImpl(noticeRepository: noticeRepository)
         }
     }
 
@@ -50,4 +48,10 @@ public extension AppComponent {
             FetchNoticeCategoriesUseCaseImpl(noticeRepository: noticeRepository)
         }
     }
+
+    var fetchNoticeIDListUseCase: any FetchNoticeIDListUseCase {
+        shared {
+            FetchNoticeIDListUseCaseImpl(noticeRepository: noticeRepository)
+        }
+    }
 }

Projects/Domains/NoticeDomain/Interface/DataSource/RemoteNoticeDataSource.swift

@@ -10,6 +10,8 @@ import Foundation
 import RxSwift
 
 public protocol RemoteNoticeDataSource {
-    func fetchNotice(type: NoticeType) -> Single<[FetchNoticeEntity]>
     func fetchNoticeCategories() -> Single<FetchNoticeCategoriesEntity>
+    func fetchNoticePopup() -> Single<[FetchNoticeEntity]>
+    func fetchNoticeAll() -> Single<[FetchNoticeEntity]>
+    func fetchNoticeIDList() -> Single<FetchNoticeIDListEntity>
 }

Projects/Domains/NoticeDomain/Interface/Entity/FetchNoticeCategoriesEntity.swift

@@ -1,11 +1,3 @@
-//
-//  FetchNoticeCategoriesEntity.swift
-//  DomainModuleTests
-//
-//  Created by KTH on 2023/04/08.
-//  Copyright © 2023 yongbeomkwak. All rights reserved.
-//
-
 import Foundation
 
 public struct FetchNoticeCategoriesEntity {

Projects/Domains/NoticeDomain/Interface/Entity/FetchNoticeEntity.swift

@@ -1,11 +1,3 @@
-//
-//  FetchNoticeEntity.swift
-//  DomainModuleTests
-//
-//  Created by KTH on 2023/04/08.
-//  Copyright © 2023 yongbeomkwak. All rights reserved.
-//
-
 import Foundation
 
 public struct FetchNoticeEntity {

Projects/Domains/NoticeDomain/Interface/Entity/FetchNoticeIDListEntity.swift

@@ -0,0 +1,14 @@
+import Foundation
+
+public struct FetchNoticeIDListEntity {
+    public init(
+        status: String,
+        data: [Int]
+    ) {
+        self.status = status
+        self.data = data
+    }
+
+    public let status: String
+    public let data: [Int]
+}

Projects/Domains/NoticeDomain/Interface/Repository/NoticeRepository.swift

@@ -1,15 +1,9 @@
-//
-//  NoticeRepository.swift
-//  DomainModuleTests
-//
-//  Created by KTH on 2023/04/08.
-//  Copyright © 2023 yongbeomkwak. All rights reserved.
-//
-
 import Foundation
 import RxSwift
 
 public protocol NoticeRepository {
-    func fetchNotice(type: NoticeType) -> Single<[FetchNoticeEntity]>
     func fetchNoticeCategories() -> Single<FetchNoticeCategoriesEntity>
+    func fetchNoticePopup() -> Single<[FetchNoticeEntity]>
+    func fetchNoticeAll() -> Single<[FetchNoticeEntity]>
+    func fetchNoticeIDList() -> Single<FetchNoticeIDListEntity>
 }

Projects/Domains/NoticeDomain/Interface/UseCase/FetchNoticeAllUseCase.swift

@@ -0,0 +1,6 @@
+import Foundation
+import RxSwift
+
+public protocol FetchNoticeAllUseCase {
+    func execute() -> Single<[FetchNoticeEntity]>
+}

Projects/Domains/NoticeDomain/Interface/UseCase/FetchNoticeCategoriesUseCase.swift

@@ -1,11 +1,3 @@
-//
-//  FetchNoticeCategoriesUseCase.swift
-//  DomainModuleTests
-//
-//  Created by KTH on 2023/04/08.
-//  Copyright © 2023 yongbeomkwak. All rights reserved.
-//
-
 import Foundation
 import RxSwift
 

Projects/Domains/NoticeDomain/Interface/UseCase/FetchNoticeIDListUseCase.swift

@@ -0,0 +1,6 @@
+import Foundation
+import RxSwift
+
+public protocol FetchNoticeIDListUseCase {
+    func execute() -> Single<FetchNoticeIDListEntity>
+}

Projects/Domains/NoticeDomain/Interface/UseCase/FetchNoticePopupUseCase.swift

@@ -0,0 +1,6 @@
+import Foundation
+import RxSwift
+
+public protocol FetchNoticePopupUseCase {
+    func execute() -> Single<[FetchNoticeEntity]>
+}

Projects/Domains/NoticeDomain/Sources/API/NoticeAPI.swift

@@ -13,49 +13,53 @@ import Moya
 import NoticeDomainInterface
 
 public enum NoticeAPI {
-    case fetchNotice(type: NoticeType)
     case fetchNoticeCategories
+    case fetchNoticePopup
+    case fetchNoticeAll
+    case fetchNoticeIDList
 }
 
 extension NoticeAPI: WMAPI {
     public var domain: WMDomain {
-        switch self {
-        case .fetchNotice,
-             .fetchNoticeCategories:
-            return .notice
-        }
+        return .notice
     }
 
     public var urlPath: String {
         switch self {
-        case let .fetchNotice(type):
-            return "/\(type.rawValue)"
         case .fetchNoticeCategories:
             return "/categories"
+        case .fetchNoticePopup:
+            return "/popup"
+        case .fetchNoticeAll:
+            return "/all"
+        case .fetchNoticeIDList:
+            return "/ids"
         }
     }
 
     public var method: Moya.Method {
         switch self {
-        case .fetchNotice,
-             .fetchNoticeCategories:
+        case .fetchNoticeCategories:
+            return .get
+        case .fetchNoticePopup:
+            return .get
+        case .fetchNoticeAll:
+            return .get
+        case .fetchNoticeIDList:
             return .get
         }
     }
 
     public var task: Moya.Task {
         switch self {
-        case .fetchNotice:
-            return .requestParameters(
-                parameters: [
-                    "os": "ios",
-                    "version": Bundle.main
-                        .object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? ""
-                ],
-                encoding: URLEncoding.queryString
-            )
         case .fetchNoticeCategories:
             return .requestPlain
+        case .fetchNoticePopup:
+            return .requestPlain
+        case .fetchNoticeAll:
+            return .requestPlain
+        case .fetchNoticeIDList:
+            return .requestPlain
         }
     }
 

Projects/Domains/NoticeDomain/Sources/DataSource/RemoteNoticeDataSourceImpl.swift

@@ -12,15 +12,27 @@ import NoticeDomainInterface
 import RxSwift
 
 public final class RemoteNoticeDataSourceImpl: BaseRemoteDataSource<NoticeAPI>, RemoteNoticeDataSource {
-    public func fetchNotice(type: NoticeType) -> Single<[FetchNoticeEntity]> {
-        request(.fetchNotice(type: type))
-            .map([FetchNoticeResponseDTO].self)
-            .map { $0.map { $0.toDomain() }}
-    }
-
     public func fetchNoticeCategories() -> Single<FetchNoticeCategoriesEntity> {
         request(.fetchNoticeCategories)
             .map(FetchNoticeCategoriesResponseDTO.self)
             .map { $0.toDomain() }
     }
+
+    public func fetchNoticePopup() -> Single<[FetchNoticeEntity]> {
+        request(.fetchNoticePopup)
+            .map([FetchNoticeResponseDTO].self)
+            .map { $0.map { $0.toDomain() } }
+    }
+
+    public func fetchNoticeAll() -> Single<[FetchNoticeEntity]> {
+        request(.fetchNoticeAll)
+            .map([FetchNoticeResponseDTO].self)
+            .map { $0.map { $0.toDomain() } }
+    }
+
+    public func fetchNoticeIDList() -> Single<FetchNoticeIDListEntity> {
+        request(.fetchNoticeIDList)
+            .map(FetchNoticeIDListDTO.self)
+            .map { $0.toDomain() }
+    }
 }

Projects/Domains/NoticeDomain/Sources/Repository/NoticeRepositoryImpl.swift

@@ -1,11 +1,3 @@
-//
-//  NoticeRepositoryImpl.swift
-//  DataModule
-//
-//  Created by KTH on 2023/04/08.
-//  Copyright © 2023 yongbeomkwak. All rights reserved.
-//
-
 import Foundation
 import NoticeDomainInterface
 import RxSwift
@@ -19,11 +11,19 @@ public final class NoticeRepositoryImpl: NoticeRepository {
         self.remoteNoticeDataSource = remoteNoticeDataSource
     }
 
-    public func fetchNotice(type: NoticeType) -> Single<[FetchNoticeEntity]> {
-        remoteNoticeDataSource.fetchNotice(type: type)
-    }
-
     public func fetchNoticeCategories() -> Single<FetchNoticeCategoriesEntity> {
         remoteNoticeDataSource.fetchNoticeCategories()
     }
+
+    public func fetchNoticePopup() -> Single<[FetchNoticeEntity]> {
+        remoteNoticeDataSource.fetchNoticePopup()
+    }
+
+    public func fetchNoticeAll() -> Single<[FetchNoticeEntity]> {
+        remoteNoticeDataSource.fetchNoticeAll()
+    }
+
+    public func fetchNoticeIDList() -> Single<FetchNoticeIDListEntity> {
+        remoteNoticeDataSource.fetchNoticeIDList()
+    }
 }

Projects/Domains/NoticeDomain/Sources/ResponseDTO/FetchNoticeCategoriesResponseDTO.swift

@@ -1,11 +1,3 @@
-//
-//  FetchNoticeCategoriesResponseDTO.swift
-//  DataMappingModule
-//
-//  Created by KTH on 2023/04/08.
-//  Copyright © 2023 yongbeomkwak. All rights reserved.
-//
-
 import Foundation
 import NoticeDomainInterface
 

Projects/Domains/NoticeDomain/Sources/ResponseDTO/FetchNoticeIDListDTO.swift

@@ -0,0 +1,13 @@
+import Foundation
+import NoticeDomainInterface
+
+public struct FetchNoticeIDListDTO: Decodable {
+    let status: String
+    let data: [Int]
+}
+
+public extension FetchNoticeIDListDTO {
+    func toDomain() -> FetchNoticeIDListEntity {
+        return FetchNoticeIDListEntity(status: status, data: data)
+    }
+}

Projects/Domains/NoticeDomain/Sources/ResponseDTO/FetchNoticeResponseDTO.swift

@@ -1,11 +1,3 @@
-//
-//  FetchNoticeResponseDTO.swift
-//  DataMappingModule
-//
-//  Created by KTH on 2023/04/08.
-//  Copyright © 2023 yongbeomkwak. All rights reserved.
-//
-
 import Foundation
 import NoticeDomainInterface
 
@@ -36,7 +28,7 @@
         public let url: String?
         public let link: String?
 
         enum CodingKeys: String, CodingKey {
             case url = "imageUrl"
             case link = "hyperlinkUrl"
         }

Projects/Domains/NoticeDomain/Sources/UseCase/FetchNoticeUseCaseImpl.swift → Projects/Domains/NoticeDomain/Sources/UseCase/FetchNoticeAllUseCaseImpl.swift

@@ -2,7 +2,7 @@ import Foundation
 import NoticeDomainInterface
 import RxSwift
 
-public struct FetchNoticeUseCaseImpl: FetchNoticeUseCase {
+public struct FetchNoticeAllUseCaseImpl: FetchNoticeAllUseCase {
     private let noticeRepository: any NoticeRepository
 
     public init(
@@ -11,7 +11,7 @@ public struct FetchNoticeUseCaseImpl: FetchNoticeUseCase {
         self.noticeRepository = noticeRepository
     }
 
-    public func execute(type: NoticeType) -> Single<[FetchNoticeEntity]> {
-        noticeRepository.fetchNotice(type: type)
+    public func execute() -> Single<[FetchNoticeEntity]> {
+        return noticeRepository.fetchNoticeAll()
     }
 }

Projects/Domains/NoticeDomain/Sources/UseCase/FetchNoticeIDListUseCaseImpl.swift

@@ -0,0 +1,17 @@
+import Foundation
+import NoticeDomainInterface
+import RxSwift
+
+public struct FetchNoticeIDListUseCaseImpl: FetchNoticeIDListUseCase {
+    private let noticeRepository: any NoticeRepository
+
+    public init(
+        noticeRepository: NoticeRepository
+    ) {
+        self.noticeRepository = noticeRepository
+    }
+
+    public func execute() -> Single<FetchNoticeIDListEntity> {
+        return noticeRepository.fetchNoticeIDList()
+    }
+}