컬렉션 API 연동

MLS/Data/Data/Network/DTO/CollectionDTO/CollectionListResponseDTO.swift

@@ -0,0 +1,12 @@
+import DomainInterface
+
+public struct CollectionListResponseDTO: Decodable {
+    public let collectionId: Int
+    public let name: String
+    public let createdAt: [Int]
+    public let recentBookmarks: [BookmarkDTO]
+
+    public func toDomain() -> CollectionListResponse {
+        return CollectionListResponse(collectionId: collectionId, name: name, createdAt: createdAt, recentBookmarks: recentBookmarks.toDomain())
+    }
+}

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

@@ -0,0 +1,13 @@
+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 createCollectionList(body: Encodable) -> EndPoint {
+        .init(baseURL: base, path: "/api/v1/collections", method: .POST, body: body)
+    }
+}

MLS/Data/Data/Repository/CollectionAPIRepositoryImpl.swift

@@ -0,0 +1,35 @@
+import Foundation
+
+import DomainInterface
+
+import RxSwift
+
+public class CollectionAPIRepositoryImpl: CollectionAPIRepository {
+    private let provider: NetworkProvider
+    private let tokenInterceptor: Interceptor
+
+    public init(provider: NetworkProvider, tokenInterceptor: Interceptor) {
+        self.provider = provider
+        self.tokenInterceptor = tokenInterceptor
+    }
+
+    public func fetchCollectionList() -> Observable<[CollectionListResponse]> {
+        let endPoint = CollectionEndPoint.fetchCollectionList()
+        return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor).map {
+            $0.map {$0.toDomain()}
+        }
+    }
+
+    public func createCollectionList(name: String) -> Completable {
+        let endPoint = CollectionEndPoint.createCollectionList(body: CreateCollectionRequestDTO(name: name))
+        return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
+
+    }
+}
+
+private extension CollectionAPIRepositoryImpl {
+    struct CreateCollectionRequestDTO: Encodable {
+        let name: String
+    }
+
+}

MLS/Domain/Domain/UseCaseImpl/Collection/CreateCollectionListUseCaseImpl.swift

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

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

@@ -0,0 +1,15 @@
+import DomainInterface
+
+import RxSwift
+
+public final class FetchCollectionListUseCaseImpl: FetchCollectionListUseCase {
+    private let repository: CollectionAPIRepository
+
+    public init(repository: CollectionAPIRepository) {
+        self.repository = repository
+    }
+
+    public func execute() -> Observable<[CollectionListResponse]> {
+        return repository.fetchCollectionList()
+    }
+}

MLS/Domain/DomainInterface/Entity/Collection/CollectionListResponse.swift

@@ -0,0 +1,13 @@
+public struct CollectionListResponse {
+    public let collectionId: Int
+    public let name: String
+    public let createdAt: [Int]
+    public let recentBookmarks: [BookmarkResponse]
+
+    public init(collectionId: Int, name: String, createdAt: [Int], recentBookmarks: [BookmarkResponse]) {
+        self.collectionId = collectionId
+        self.name = name
+        self.createdAt = createdAt
+        self.recentBookmarks = recentBookmarks
+    }
+}

MLS/Domain/DomainInterface/Repository/CollectionAPIRepository.swift

@@ -0,0 +1,10 @@
+import Foundation
+
+import RxSwift
+
+public protocol CollectionAPIRepository {
+    // 컬렉션 목록 조회 
+    func fetchCollectionList() -> Observable<[CollectionListResponse]>
+    // 컬렉션 목록 추가
+    func createCollectionList(name: String) -> Completable
+}

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

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

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

@@ -0,0 +1,5 @@
+import RxSwift
+
+public protocol FetchCollectionListUseCase {
+    func execute() -> Observable<[CollectionListResponse]>
+}

MLS/MLS/Application/AppDelegate.swift

@@ -137,6 +137,10 @@ private extension AppDelegate {
         DIContainer.register(type: AlarmAPIRepository.self) {
             AlarmAPIRepositoryImpl(provider: DIContainer.resolve(type: NetworkProvider.self), interceptor: DIContainer.resolve(type: Interceptor.self))
         }
+        DIContainer.register(type: CollectionAPIRepository.self) {
+            CollectionAPIRepositoryImpl(provider: DIContainer.resolve(type: NetworkProvider.self),
+                                        tokenInterceptor: DIContainer.resolve(type: Interceptor.self))
+        }
     }
 
     func registerUseCase() {
@@ -340,6 +344,12 @@ private extension AppDelegate {
         DIContainer.register(type: ParseItemFilterResultUseCase.self) {
             ParseItemFilterResultUseCaseImpl()
         }
+        DIContainer.register(type: FetchCollectionListUseCase.self) {
+            FetchCollectionListUseCaseImpl(repository: DIContainer.resolve(type: CollectionAPIRepository.self))
+        }
+        DIContainer.register(type: CreateCollectionListUseCase.self) {
+            CreateCollectionListUseCaseImpl(repository: DIContainer.resolve(type: CollectionAPIRepository.self))
+        }
     }
 
     func registerFactory() {
@@ -478,7 +488,7 @@ private extension AppDelegate {
             BookmarkListFactoryImpl(itemFilterFactory: DIContainer.resolve(type: ItemFilterBottomSheetFactory.self), monsterFilterFactory: DIContainer.resolve(type: MonsterFilterBottomSheetFactory.self), sortedFactory: DIContainer.resolve(type: SortedBottomSheetFactory.self), bookmarkModalFactory: DIContainer.resolve(type: BookmarkModalFactory.self), loginFactory: DIContainer.resolve(type: LoginFactory.self), dictionaryDetailFactory: DIContainer.resolve(type: DictionaryDetailFactory.self), setBookmarkUseCase: DIContainer.resolve(type: SetBookmarkUseCase.self), checkLoginUseCase: DIContainer.resolve(type: CheckLoginUseCase.self), fetchBookmarkUseCase: DIContainer.resolve(type: FetchBookmarkUseCase.self), fetchMonsterBookmarkUseCase: DIContainer.resolve(type: FetchMonsterBookmarkUseCase.self), fetchItemBookmarkUseCase: DIContainer.resolve(type: FetchItemBookmarkUseCase.self), fetchNPCBookmarkUseCase: DIContainer.resolve(type: FetchNPCBookmarkUseCase.self), fetchQuestBookmarkUseCase: DIContainer.resolve(type: FetchQuestBookmarkUseCase.self), fetchMapBookmarkUseCase: DIContainer.resolve(type: FetchMapBookmarkUseCase.self), collectionEditFactory: DIContainer.resolve(type: CollectionEditFactory.self))
         }
         DIContainer.register(type: CollectionListFactory.self) {
-            CollectionListFactoryImpl(addCollectionFactory: DIContainer.resolve(type: AddCollectionFactory.self), bookmarkDetailFactory: DIContainer.resolve(type: CollectionDetailFactory.self))
+            CollectionListFactoryImpl(collectionListUseCase: DIContainer.resolve(type: FetchCollectionListUseCase.self), createCollectionListUseCase: DIContainer.resolve(type: CreateCollectionListUseCase.self), addCollectionFactory: DIContainer.resolve(type: AddCollectionFactory.self), bookmarkDetailFactory: DIContainer.resolve(type: CollectionDetailFactory.self))
         }
         DIContainer.register(type: CollectionDetailFactory.self) {
             CollectionDetailFactoryImpl(

MLS/Presentation/BookmarkFeature/BookmarkFeature/AddCollection/AddCollectionReactor.swift

@@ -82,7 +82,12 @@ public final class AddCollectionModalReactor: Reactor {
             newState.route = route
         case .addCollection(let title):
             var collection = newState.collection
-            collection?.title = title
+            // 기존 collection이 없으면 새로 생성
+            if collection == nil {
+                collection = BookmarkCollection(id: -1, title: title, items: [])
+            } else {
+                collection?.title = title
+            }
             newState.route = .dismissWithSuccess(collection)
         }
 

MLS/Presentation/BookmarkFeature/BookmarkFeature/CollectionList/CollectionListCell.swift

@@ -1,3 +1,4 @@
+import BaseFeature
 import UIKit
 
 import DesignSystem
@@ -39,18 +40,40 @@ public extension CollectionListCell {
     struct Input {
         let title: String
         let count: Int
-        let images: [UIImage?]
+        let images: [String?]
 
-        public init(title: String, count: Int, images: [UIImage?]) {
+        public init(title: String, count: Int, images: [String?]) {
             self.title = title
             self.count = count
             self.images = images
         }
     }
 
     func inject(input: Input) {
-        cellView.setImages(images: input.images)
+        loadImages(from: input.images) { [weak self] images in
+            print("이미지:\(images)")
+            self?.cellView.setImages(images: images)
+        }
         cellView.setTitle(text: input.title)
         cellView.setSubtitle(text: "\(String(input.count))개")
     }
 }
+
+private func loadImages(from urls: [String?], completion: @escaping ([UIImage?]) -> Void) {
+
+    var results = [UIImage?](repeating: nil, count: urls.count)
+    let dispatchGroup = DispatchGroup()
+
+    for (index, urlString) in urls.enumerated() {
+        dispatchGroup.enter()
+
+        ImageLoader.shared.loadImage(stringURL: urlString) { image in
+            results[index] = image
+            dispatchGroup.leave()
+        }
+    }
+
+    dispatchGroup.notify(queue: .main) {
+        completion(results)
+    }
+}

MLS/Presentation/BookmarkFeature/BookmarkFeature/CollectionList/CollectionListFactoryImpl.swift

@@ -1,17 +1,22 @@
 import BaseFeature
 import BookmarkFeatureInterface
+import DomainInterface
 
 public final class CollectionListFactoryImpl: CollectionListFactory {
+    private let collectionListUseCase: FetchCollectionListUseCase
+    private let createCollectionListUseCase: CreateCollectionListUseCase
     private let addCollectionFactory: AddCollectionFactory
     private let bookmarkDetailFactory: CollectionDetailFactory
 
-    public init(addCollectionFactory: AddCollectionFactory, bookmarkDetailFactory: CollectionDetailFactory) {
+    public init(collectionListUseCase: FetchCollectionListUseCase, createCollectionListUseCase: CreateCollectionListUseCase, addCollectionFactory: AddCollectionFactory, bookmarkDetailFactory: CollectionDetailFactory) {
+        self.collectionListUseCase = collectionListUseCase
+        self.createCollectionListUseCase = createCollectionListUseCase
         self.addCollectionFactory = addCollectionFactory
         self.bookmarkDetailFactory = bookmarkDetailFactory
     }
 
     public func make() -> BaseViewController {
-        let reactor = CollectionListReactor()
+        let reactor = CollectionListReactor(collectionListUseCase: collectionListUseCase, createCollectionListUseCase: createCollectionListUseCase)
         let viewController = CollectionListViewController(addCollectionFactory: addCollectionFactory, detailFactory: bookmarkDetailFactory)
         viewController.reactor = reactor
         return viewController

MLS/Presentation/BookmarkFeature/BookmarkFeature/CollectionList/CollectionListReactor.swift

@@ -13,45 +13,64 @@ public final class CollectionListReactor: Reactor {
 
     public enum Action {
         case itemTapped(Int)
+        case viewWillAppear
+        case addCollection(String)
     }
 
     public enum Mutation {
         case navigateTo(Route)
+        case setListData([CollectionListResponse])
     }
 
     public struct State {
         @Pulse var route: Route
         var collections: [BookmarkCollection]
+        var collectionListData: [CollectionListResponse]
     }
 
     // MARK: - Properties
     public var initialState: State
 
     private let disposeBag = DisposeBag()
 
-    public init() {
+    private let collectionListUseCase: FetchCollectionListUseCase
+    private let createCollectionListUseCase: CreateCollectionListUseCase
+
+    public init(
+        collectionListUseCase: FetchCollectionListUseCase,
+        createCollectionListUseCase: CreateCollectionListUseCase
+    ) {
+        self.collectionListUseCase = collectionListUseCase
+        self.createCollectionListUseCase = createCollectionListUseCase
         self.initialState = State(route: .none, collections: [
-            BookmarkCollection(id: 1, title: "1번", items: [
+            BookmarkCollection(id: 1, title: "1000번", items: [
                 DictionaryItem(id: 1, type: .item, mainText: "1번 아이템", subText: "1번 설명", image: .add, isBookmarked: false),
                 DictionaryItem(id: 2, type: .item, mainText: "2번 아이템", subText: "2번 설명", image: .add, isBookmarked: false)
             ]),
-            BookmarkCollection(id: 2, title: "2번", items: [
+            BookmarkCollection(id: 2, title: "2000번", items: [
                 DictionaryItem(id: 3, type: .item, mainText: "3번 아이템", subText: "3번 설명", image: .add, isBookmarked: false),
                 DictionaryItem(id: 4, type: .item, mainText: "4번 아이템", subText: "4번 설명", image: .add, isBookmarked: false)
             ])
-        ])
+        ], collectionListData: [])
     }
 
     public func mutate(action: Action) -> Observable<Mutation> {
         switch action {
+        case .viewWillAppear:
+            return collectionListUseCase.execute().map { .setListData($0) }
         case .itemTapped(let index):
             return .just(.navigateTo(.detail(currentState.collections[index])))
+        case .addCollection(let collection):
+            return createCollectionListUseCase.execute(name: collection).andThen(collectionListUseCase.execute())
+                .map {.setListData($0)}
         }
     }
 
     public func reduce(state: State, mutation: Mutation) -> State {
         var newState = state
         switch mutation {
+        case .setListData(let data):
+            newState.collectionListData = data
         case .navigateTo(let route):
             newState.route = route
         }

MLS/Presentation/BookmarkFeature/BookmarkFeature/CollectionList/CollectionListViewController.swift

@@ -61,6 +61,10 @@ private extension CollectionListViewController {
         addFloatingButton { [weak self] in
             guard let self = self else { return }
             let viewController = self.addCollectionFactory.make(collection: nil, onDismissWithMessage: { [weak self] collection in
+                if let collection = collection {
+                    // Reactor에게 새로운 콜렉션 추가를 알림
+                    self?.reactor?.action.onNext(.addCollection(collection.title))
+                }
                 self?.onDismissWithMessage?(collection)
             })
             self.present(viewController, animated: true)
@@ -83,7 +87,12 @@ extension CollectionListViewController {
         bindViewState(reactor: reactor)
     }
 
-    func bindUserActions(reactor: Reactor) {}
+    func bindUserActions(reactor: Reactor) {
+        rx.viewWillAppear
+            .map { Reactor.Action.viewWillAppear }
+            .bind(to: reactor.action)
+            .disposed(by: disposeBag)
+    }
 
     func bindViewState(reactor: Reactor) {
         rx.viewDidAppear
@@ -102,10 +111,11 @@ extension CollectionListViewController {
             .disposed(by: disposeBag)
 
         reactor.state
-            .map(\.collections)
+            .map(\.collectionListData)
             .withUnretained(self)
-            .subscribe { owner, collections in
-                owner.mainView.updateView(isEmptyData: collections.isEmpty)
+            .observe(on: MainScheduler.instance)
+            .subscribe { owner, collectionListData in
+                owner.mainView.updateView(isEmptyData: collectionListData.isEmpty)
                 owner.mainView.listCollectionView.reloadData()
             }
             .disposed(by: disposeBag)
@@ -115,7 +125,7 @@ extension CollectionListViewController {
 // MARK: - Delegate
 extension CollectionListViewController: UICollectionViewDelegate, UICollectionViewDataSource {
     public func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        reactor?.currentState.collections.count ?? 0
+        reactor?.currentState.collectionListData.count ?? 0
     }
 
     public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
@@ -124,11 +134,11 @@ extension CollectionListViewController: UICollectionViewDelegate, UICollectionVi
                 withReuseIdentifier: CollectionListCell.identifier,
                 for: indexPath
             ) as? CollectionListCell,
-            let item = reactor?.currentState.collections[indexPath.row]
+            let item = reactor?.currentState.collectionListData[indexPath.row]
         else {
             return UICollectionViewCell()
         }
-        cell.inject(input: CollectionListCell.Input(title: item.title, count: item.count, images: item.thumbnails))
+        cell.inject(input: CollectionListCell.Input(title: item.name, count: item.recentBookmarks.count, images: item.recentBookmarks.map { $0.imageUrl }))
         return cell
     }
 

MLS/Presentation/DesignSystem/DesignSystem/Components/CollectionList.swift

@@ -136,6 +136,7 @@ public extension CollectionList {
     func setImages(images: [UIImage?]) {
         for (index, view) in imageViews.enumerated() {
             let imageView = view.subviews.compactMap { $0 as? UIImageView }.first
+            print("이미지 뷰 설정")
             imageView?.image = index < images.count ? images[index] : nil
         }
     }