컬렉션 API 연동

MLS/.swiftlint.yml

@@ -13,3 +13,15 @@ function_body_length:
 disabled_rules:
   - force_cast
   - blanket_disable_command
+
+function_parameter_count:
+  warning: 5
+  error: 10
+
+identifier_name:
+  min_length: 2
+  max_length: 40
+
+type_name:
+  min_length: 3
+  max_length: 60

MLS/Data/Data/Network/DTO/AlarmDTO/AlarmResponseDTO.swift

@@ -8,18 +8,6 @@ public struct AlarmResponseDTO: Decodable {
         case normal(NormalContent)
         case all(AllContent)
 
-        public struct NormalContent: Decodable {
-            public let type: String
-            public let title: String
-            public let link: String
-            public let date: [Int]
-        }
-
-        public struct AllContent: Decodable {
-            public let alrim: NormalContent
-            public let alreadyRead: Bool
-        }
-
         public init(from decoder: Decoder) throws {
             let container = try decoder.singleValueContainer()
 
@@ -42,6 +30,18 @@ public struct AlarmResponseDTO: Decodable {
             )
         }
     }
+
+    public struct NormalContent: Decodable {
+        public let type: String
+        public let title: String
+        public let link: String
+        public let date: [Int]
+    }
+
+    public struct AllContent: Decodable {
+        public let alrim: NormalContent
+        public let alreadyRead: Bool
+    }
 }
 
 public extension AlarmResponseDTO {

MLS/Data/Data/Network/Endpoints/CollectionEndPoint.swift

@@ -3,19 +3,68 @@ import DomainInterface
 public enum CollectionEndPoint {
     static let base = "https://api.mapleland.kro.kr"
 
-    public static func fetchCollectionList() -> ResponsableEndPoint<[CollectionListResponseDTO]> {
-        .init(baseURL: base, path: "/api/v1/collections", method: .GET)
+    public static func fetchCollectionList(query: Encodable) -> ResponsableEndPoint<[CollectionListResponseDTO]> {
+        .init(
+            baseURL: base,
+            path: "/api/v1/collections",
+            method: .GET,
+            query: query
+        )
     }
 
     public static func createCollectionList(body: Encodable) -> EndPoint {
         .init(baseURL: base, path: "/api/v1/collections", method: .POST, body: body)
     }
-    
+
     public static func fetchCollection(id: Int) -> ResponsableEndPoint<[BookmarkDTO]> {
         .init(
             baseURL: base,
             path: "/api/v1/collections/\(id)/bookmarks",
             method: .GET
         )
     }
+
+    public static func addBookmarksToCollection(id: Int, body: Encodable) -> EndPoint {
+        .init(
+            baseURL: base,
+            path: "/api/v1/collections/\(id)/bookmarks",
+            method: .POST,
+            body: body
+        )
+    }
+
+    public static func addCollectionsToBookmark(id: Int, body: Encodable) -> EndPoint {
+        .init(
+            baseURL: base,
+            path: "/api/v1/bookmarks/\(id)/collections",
+            method: .POST,
+            body: body
+        )
+    }
+
+    public static func setCollectionName(id: Int, body: Encodable) -> EndPoint {
+        .init(
+            baseURL: base,
+            path: "/api/v1/collections/\(id)",
+            method: .PUT,
+            body: body
+        )
+    }
+
+    public static func deleteCollection(id: Int) -> EndPoint {
+        .init(
+            baseURL: base,
+            path: "/api/v1/collections/\(id)",
+            method: .DELETE
+        )
+    }
+
+    public static func addCollectionAndBookmark(body: Encodable) -> EndPoint {
+        .init(
+            baseURL: base,
+            path: "/api/v1/bookmark-collections",
+            method: .POST,
+            body: body
+        )
+    }
 }

MLS/Data/Data/Network/Endpoints/DictionaryListEndPoint.swift

@@ -17,7 +17,7 @@ public enum DictionaryListEndPoint {
     }
     // 몬스터 리스트
     public static func fetchMonsterList(keyword: String?, minLevel: Int?, maxLevel: Int?, page: Int, size: Int, sort: String?) -> ResponsableEndPoint<PagedListResponseDTO<DictionaryMonsterDTO>> {
-        let query = DictionaryListQuery(keyword: keyword ?? "", page: page, size: size, sort: sort, minLevel: minLevel, maxLevel: maxLevel)
+        let query = DictionaryListQuery(keyword: keyword ?? "", page: page, size: size, sort: sort, minLevel: minLevel ?? 1, maxLevel: maxLevel ?? 200)
         return .init(baseURL: base, path: "/api/v1/monsters", method: .GET, query: query
         )
     }
@@ -34,11 +34,20 @@ public enum DictionaryListEndPoint {
         )
     }
     // 아이템 리스트
-    public static func fetchItemList(keyword: String? = nil, jobId: [Int]? = nil, minLevel: Int? = nil, maxLevel: Int? = nil, categoryIds: [Int]? = nil, page: Int? = nil, size: Int? = nil, sort: String? = nil) -> ResponsableEndPoint<PagedListResponseDTO<DictionaryItemDTO>> {
+    public static func fetchItemList(
+        keyword: String? = nil,
+        jobId: [Int]? = nil,
+        minLevel: Int? = nil,
+        maxLevel: Int? = nil,
+        categoryIds: [Int]? = nil,
+        page: Int? = nil,
+        size: Int? = nil,
+        sort: String? = nil
+    ) -> ResponsableEndPoint<PagedListResponseDTO<DictionaryItemDTO>> {
         let joinedCategoryIds = categoryIds?.map(String.init).joined(separator: ",")
         let joinedJobIds = jobId?.map(String.init).joined(separator: ",")
 
-        let query = DictionaryListQuery(keyword: keyword, page: page ?? 0, size: size ?? 20, sort: sort, minLevel: minLevel, maxLevel: maxLevel, jobIds: joinedJobIds, categoryIds: joinedCategoryIds)
+        let query = DictionaryListQuery(keyword: keyword, page: page ?? 0, size: size ?? 20, sort: sort, minLevel: minLevel ?? 1, maxLevel: maxLevel ?? 200, jobIds: joinedJobIds, categoryIds: joinedCategoryIds)
         return .init(baseURL: base, path: "/api/v1/items", method: .GET, query: query
         )
     }

MLS/Data/Data/Repository/CollectionAPIRepositoryImpl.swift

@@ -13,8 +13,8 @@ public class CollectionAPIRepositoryImpl: CollectionAPIRepository {
         self.tokenInterceptor = tokenInterceptor
     }
 
-    public func fetchCollectionList() -> Observable<[CollectionResponse]> {
-        let endPoint = CollectionEndPoint.fetchCollectionList()
+    public func fetchCollectionList(sort: String?) -> Observable<[CollectionResponse]> {
+        let endPoint = CollectionEndPoint.fetchCollectionList(query: FetchCollectionListQuery(sort: sort))
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
             .map { $0.map { $0.toDomain() }
             }
@@ -30,10 +30,68 @@ public class CollectionAPIRepositoryImpl: CollectionAPIRepository {
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
             .map { $0.toDomain() }
     }
+
+//    public func addBookmarksToCollection(collectionId: Int, bookmarkIds: [Int]) -> Completable {
+//        let endPoint = CollectionEndPoint.addBookmarksToCollection(id: collectionId, body: AddBookmarkRequestBody(bookmarkIds: bookmarkIds))
+//        return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
+//            .catch { error in
+//                if let netErr = error as? NetworkError {
+//                    switch netErr {
+//                    case let .statusError(code, body):
+//                        return .error(DomainHTTPError.httpStatus(code: code, message: body))
+//                    default:
+//                        return .error(DomainHTTPError.unknown)
+//                    }
+//                } else {
+//                    return .error(DomainHTTPError.unknown)
+//                }
+//            }
+//    }
+//
+//    public func addCollectionsToBookmark(bookmarkId: Int, collectionIds: [Int]) -> Completable {
+//        let endPoint = CollectionEndPoint.addCollectionsToBookmark(id: bookmarkId, body: AddCollectionRequestBody(collectionIds: collectionIds))
+//        return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
+//    }
+
+    public func setCollectionName(collectionId: Int, name: String) -> Completable {
+        let endPoint = CollectionEndPoint.setCollectionName(id: collectionId, body: SetCollectionRequestBody(name: name))
+        return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
+    }
+
+    public func deleteCollection(collectionId: Int) -> Completable {
+        let endPoint = CollectionEndPoint.deleteCollection(id: collectionId)
+        return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
+    }
+
+    public func addCollectionAndBookmark(collectionIds: [Int], bookmarkIds: [Int]) -> Completable {
+        let endPoint = CollectionEndPoint.addCollectionAndBookmark(body: AddCollectionAndBookmarkBody(collectionIds: collectionIds, bookmarkIds: bookmarkIds))
+        return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
+    }
 }
 
 private extension CollectionAPIRepositoryImpl {
+    struct FetchCollectionListQuery: Encodable {
+        let sort: String?
+    }
+
     struct CreateCollectionRequestDTO: Encodable {
         let name: String
     }
+
+    struct AddBookmarkRequestBody: Encodable {
+        let bookmarkIds: [Int]
+    }
+
+    struct AddCollectionRequestBody: Encodable {
+        let collectionIds: [Int]
+    }
+
+    struct SetCollectionRequestBody: Encodable {
+        let name: String
+    }
+
+    struct AddCollectionAndBookmarkBody: Encodable {
+        let collectionIds: [Int]
+        let bookmarkIds: [Int]
+    }
 }

MLS/Domain/Domain/UseCaseImpl/AuthAPI/CheckNotificationPermissionUseCaseImpl.swift

@@ -11,10 +11,10 @@ public final class CheckNotificationPermissionUseCaseImpl: CheckNotificationPerm
         return Single.create { single in
             UNUserNotificationCenter.current().getNotificationSettings { settings in
                 switch settings.authorizationStatus {
-                    case .authorized:
-                        single(.success(true))
-                    default:
-                        single(.success(false))
+                case .authorized:
+                    single(.success(true))
+                default:
+                    single(.success(false))
                 }
             }
             return Disposables.create()

MLS/Domain/Domain/UseCaseImpl/Collection/AddBookmarksToCollectionUseCaseImpl.swift

@@ -0,0 +1,15 @@
+// import DomainInterface
+//
+// import RxSwift
+//
+// public final class AddBookmarksToCollectionUseCaseImpl: AddBookmarksToCollectionUseCase {
+//    private let repository: CollectionAPIRepository
+//
+//    public init(repository: CollectionAPIRepository) {
+//        self.repository = repository
+//    }
+//
+//    public func execute(collectionId: Int, bookmarkIds: [Int]) -> Completable {
+//        return repository.addBookmarksToCollection(collectionId: collectionId, bookmarkIds: bookmarkIds)
+//    }
+// }

MLS/Domain/Domain/UseCaseImpl/Collection/AddCollectionAndBookmarkUseCaseImpl.swift

@@ -0,0 +1,14 @@
+import DomainInterface
+import RxSwift
+
+public final class AddCollectionAndBookmarkUseCaseImpl: AddCollectionAndBookmarkUseCase {
+    private let repository: CollectionAPIRepository
+
+    public init(repository: CollectionAPIRepository) {
+        self.repository = repository
+    }
+
+    public func execute(collectionIds: [Int], bookmarkIds: [Int]) -> Completable {
+        return repository.addCollectionAndBookmark(collectionIds: collectionIds, bookmarkIds: bookmarkIds)
+    }
+}

MLS/Domain/Domain/UseCaseImpl/Collection/AddCollectionsToBookmarkUseCaseImpl.swift

@@ -0,0 +1,14 @@
+// import DomainInterface
+// import RxSwift
+//
+// public final class AddCollectionsToBookmarkUseCaseImpl: AddCollectionsToBookmarkUseCase {
+//    private let repository: CollectionAPIRepository
+//
+//    public init(repository: CollectionAPIRepository) {
+//        self.repository = repository
+//    }
+//
+//    public func execute(bookmarkId: Int, collectionIds: [Int]) -> Completable {
+//        return repository.addCollectionsToBookmark(bookmarkId: bookmarkId, collectionIds: collectionIds)
+//    }
+// }

MLS/Domain/Domain/UseCaseImpl/Collection/DeleteCollectionUseCaseImpl.swift

@@ -0,0 +1,15 @@
+import DomainInterface
+
+import RxSwift
+
+public final class DeleteCollectionUseCaseImpl: DeleteCollectionUseCase {
+    private let repository: CollectionAPIRepository
+
+    public init(repository: CollectionAPIRepository) {
+        self.repository = repository
+    }
+
+    public func execute(collectionId: Int) -> Completable {
+        return repository.deleteCollection(collectionId: collectionId)
+    }
+}

MLS/Domain/Domain/UseCaseImpl/Collection/FetchCollectionListUseCaseImpl.swift

@@ -9,7 +9,7 @@ public final class FetchCollectionListUseCaseImpl: FetchCollectionListUseCase {
         self.repository = repository
     }
 
-    public func execute() -> Observable<[CollectionResponse]> {
-        return repository.fetchCollectionList()
+    public func execute(sort: SortType?) -> Observable<[CollectionResponse]> {
+        return repository.fetchCollectionList(sort: sort?.sortParameter)
     }
 }

MLS/Domain/Domain/UseCaseImpl/Collection/SetCollectionUseCaseImpl.swift

@@ -0,0 +1,15 @@
+import DomainInterface
+
+import RxSwift
+
+public final class SetCollectionUseCaseImpl: SetCollectionUseCase {
+    private let repository: CollectionAPIRepository
+
+    public init(repository: CollectionAPIRepository) {
+        self.repository = repository
+    }
+
+    public func execute(collectionId: Int, name: String) -> Completable {
+        return repository.setCollectionName(collectionId: collectionId, name: name)
+    }
+}

MLS/Domain/DomainInterface/Repository/CollectionAPIRepository.swift

@@ -4,9 +4,19 @@ import RxSwift
 
 public protocol CollectionAPIRepository {
     // 컬렉션 목록 조회 
-    func fetchCollectionList() -> Observable<[CollectionResponse]>
+    func fetchCollectionList(sort: String?) -> Observable<[CollectionResponse]>
     // 컬렉션 목록 추가
     func createCollectionList(name: String) -> Completable
     // 컬렉션 상세 조회
     func fetchCollectionUseCase(id: Int) -> Observable<[BookmarkResponse]>
+
+//    func addBookmarksToCollection(collectionId: Int, bookmarkIds: [Int]) -> Completable
+
+//    func addCollectionsToBookmark(bookmarkId: Int, collectionIds: [Int]) -> Completable
+
+    func setCollectionName(collectionId: Int, name: String) -> Completable
+
+    func deleteCollection(collectionId: Int) -> Completable
+
+    func addCollectionAndBookmark(collectionIds: [Int], bookmarkIds: [Int]) -> Completable
 }

MLS/Domain/DomainInterface/UseCase/Collection/AddBookmarksToCollectionUseCase.swift

@@ -0,0 +1,5 @@
+// import RxSwift
+//
+// public protocol AddBookmarksToCollectionUseCase {
+//    func execute(collectionId: Int, bookmarkIds: [Int]) -> Completable
+// }

MLS/Domain/DomainInterface/UseCase/Collection/AddCollectionAndBookmarkUseCase.swift

@@ -0,0 +1,5 @@
+import RxSwift
+
+public protocol AddCollectionAndBookmarkUseCase {
+    func execute(collectionIds: [Int], bookmarkIds: [Int]) -> Completable
+}

MLS/Domain/DomainInterface/UseCase/Collection/AddCollectionsToBookmarkUseCase.swift

@@ -0,0 +1,5 @@
+// import RxSwift
+//
+// public protocol AddCollectionsToBookmarkUseCase {
+//    func execute(bookmarkId: Int, collectionIds: [Int]) -> Completable
+// }

MLS/Domain/DomainInterface/UseCase/Collection/DeleteCollectionUseCase.swift

@@ -0,0 +1,5 @@
+import RxSwift
+
+public protocol DeleteCollectionUseCase {
+    func execute(collectionId: Int) -> Completable
+}

MLS/Domain/DomainInterface/UseCase/Collection/FetchCollectionListUseCase.swift

@@ -1,5 +1,5 @@
 import RxSwift
 
 public protocol FetchCollectionListUseCase {
-    func execute() -> Observable<[CollectionResponse]>
+    func execute(sort: SortType?) -> Observable<[CollectionResponse]>
 }

MLS/Domain/DomainInterface/UseCase/Collection/SetCollectionUseCase.swift

@@ -0,0 +1,5 @@
+import RxSwift
+
+public protocol SetCollectionUseCase {
+    func execute(collectionId: Int, name: String) -> Completable
+}