[WIP] 검색 뷰 기능 구현 및 아키텍처 적용

RecorDream-iOS/Projects/Core/Sources/Protocols/Cancellable.swift

@@ -0,0 +1,13 @@
+//
+//  Cancellable.swift
+//  RD-Core
+//
+//  Created by 정은희 on 2022/11/09.
+//  Copyright © 2022 RecorDream. All rights reserved.
+//
+
+import Foundation
+
+public protocol Cancellable {
+    func cancel()
+}

RecorDream-iOS/Projects/Data/Sources/Network/DataTransform/DreamSearchResuest.swift

@@ -0,0 +1,13 @@
+//
+//  DreamSearchResuest.swift
+//  Data
+//
+//  Created by 정은희 on 2022/11/09.
+//  Copyright © 2022 RecorDream. All rights reserved.
+//
+
+import Foundation
+
+struct DreamSearchResuest: Encodable {
+    let query: String
+}

RecorDream-iOS/Projects/Domain/Sources/Entities/DreamSearch/DreamSearchEntity.swift

@@ -0,0 +1,37 @@
+//
+//  DreamSearchEntity.swift
+//  DomainTests
+//
+//  Created by 정은희 on 2022/11/09.
+//  Copyright © 2022 RecorDream. All rights reserved.
+//
+
+import Foundation
+
+public struct Records: Equatable, Identifiable {
+    public enum Genre: Int {
+        case comedy
+        case romance
+        case action
+        case thriller
+        case mystery
+        case fear
+        case sf
+        case fantasy
+        case family
+        case etc
+        case none
+    }
+
+    public let id: String
+    public let dreamColor: Int?
+    public let emotion: Int?
+    public let date: String?
+    public let title: String?
+    public let genre: Genre?
+}
+
+public struct DreamSearchEntity: Equatable {
+    public let recordsCount: Int
+    public let records: [Records]
+}

RecorDream-iOS/Projects/Domain/Sources/Entities/DreamSearch/DreamSearchQuery.swift

@@ -0,0 +1,13 @@
+//
+//  DreamSearchQuery.swift
+//  DomainTests
+//
+//  Created by 정은희 on 2022/11/09.
+//  Copyright © 2022 RecorDream. All rights reserved.
+//
+
+import Foundation
+
+public struct DreamSearchQuery: Equatable {
+    public let query: String
+}

RecorDream-iOS/Projects/Domain/Sources/RepositoryInterfaces/DremSearchRepository.swift

@@ -0,0 +1,18 @@
+//
+//  DreamSearchRepository.swift
+//  DomainTests
+//
+//  Created by 정은희 on 2022/11/09.
+//  Copyright © 2022 RecorDream. All rights reserved.
+//
+
+import Foundation
+
+import RxSwift
+import RD_Core
+
+public protocol DreamSearchRepository {
+    @discardableResult
+    func fetchDreamSearchList(query: DreamSearchQuery,
+                              completion: @escaping(Result<DreamSearchEntity, Error>) -> Void) -> Cancellable?
+}

RecorDream-iOS/Projects/Domain/Sources/UseCases/DreamSearchUseCase.swift

@@ -0,0 +1,36 @@
+//
+//  DreamSearchUseCase.swift
+//  DomainTests
+//
+//  Created by 정은희 on 2022/11/09.
+//  Copyright © 2022 RecorDream. All rights reserved.
+//
+
+import Foundation
+
+import RD_Core
+
+public protocol DreamSearchUseCase {
+    func execute(requestValue: DreamSearchUseCaseRequestValue,
+                 completion: @escaping (Result<DreamSearchEntity, Error>) -> Void) -> Cancellable?
+}
+
+public final class DefaultDreamSearchUseCase: DreamSearchUseCase {
+
+    private let dreamSearchRepository: DreamSearchRepository
+
+    init(dreamSearchRepository: DreamSearchRepository) {
+        self.dreamSearchRepository = dreamSearchRepository
+    }
+
+    public func execute(requestValue: DreamSearchUseCaseRequestValue,
+                 completion: @escaping (Result<DreamSearchEntity, Error>) -> Void) -> Cancellable? {
+        return dreamSearchRepository.fetchDreamSearchList(query: requestValue.query) { result in
+            completion(result)
+        }
+    }
+}
+
+public struct DreamSearchUseCaseRequestValue {
+    let query: DreamSearchQuery
+}

RecorDream-iOS/Projects/Domain/Sources/UseCases/UseCase.swift

@@ -0,0 +1,16 @@
+//
+//  UseCase.swift
+//  DomainTests
+//
+//  Created by 정은희 on 2022/11/09.
+//  Copyright © 2022 RecorDream. All rights reserved.
+//
+
+import Foundation
+
+import RD_Core
+
+public protocol UseCase {
+    @discardableResult
+    func start() -> Cancellable?
+}

RecorDream-iOS/Projects/Modules/RD-Network/Sources/Responses/DreamSearchResponse.swift

@@ -0,0 +1,54 @@
+//
+//  DreamSearchResponse.swift
+//  RD-Network
+//
+//  Created by 정은희 on 2022/11/08.
+//  Copyright © 2022 RecorDream. All rights reserved.
+//
+
+import Foundation
+
+public struct DreamSearchResponse: Decodable {
+    public let query: String
+    public let results: [DreamSearchResult]
+}
+
+public extension DreamSearchResponse {
+    struct DreamSearchResult: Decodable {
+        private enum CodingKeys: String, CodingKey {
+            case recordsCount = "records_count"
+            case records
+        }
+
+        public let recordsCount: Int
+        public let records: [Records]
+    }
+
+    struct Records: Decodable {
+        private enum CodingKeys: String, CodingKey {
+            case id = "_id"
+            case dreamColor = "dream_color"
+            case emotion, date, title, genre
+        }
+        public enum Genre: Int, Decodable {
+            case comedy
+            case romance
+            case action
+            case thriller
+            case mystery
+            case fear
+            case sf
+            case fantasy
+            case family
+            case etc
+            case none
+        }
+
+        public let id: String?
+        public let dreamColor: Int?
+        public let emotion: Int?
+        public let date: String?
+        public let title: String?
+        public let genre: Genre?
+    }
+}

RecorDream-iOS/Projects/Modules/RD-Network/Sources/Routers/RecordRouter.swift

@@ -12,13 +12,16 @@ import Alamofire
 
 enum RecordRouter {
     case writeRecord(title: String, date: String, content: String, emotion: Int, genre: [Int], note: String?, voice: URL?)
+    case searchRecord(keyword: String)
 }
 
 extension RecordRouter: BaseRouter {
     var method: HTTPMethod {
         switch self {
         case .writeRecord:
             return .post
+        case .searchRecord:
+            return .get
         default: return .get
         }
     }
@@ -27,6 +30,8 @@ extension RecordRouter: BaseRouter {
         switch self {
         case .writeRecord:
             return "/record"
+        case .searchRecord:
+            return "/record/storage/search"
         default: return ""
         }
     }
@@ -42,6 +47,11 @@ extension RecordRouter: BaseRouter {
                 "genre": genre
             ]
             return .requestBody(requestBody)
+        case .searchRecord(let keyword):
+            let query: [String: Any] = [
+                "keyword": keyword
+            ]
+            return .query(query)
         default: return .requestPlain
         }
     }

RecorDream-iOS/Projects/Modules/RD-Network/Sources/Services/RecordService.swift

@@ -13,6 +13,7 @@ import RxSwift
 
 public protocol RecordService {
     func writeDreamRecord(title: String, date: String, content: String, emotion: Int, genre: [Int], note: String?, voice: URL?) -> Observable<DreamWriteResponse?>
+    func searchDreamRecord(query: String) -> Observable<DreamSearchResponse?>
 }
 
 public class DefaultRecordService: BaseService {
@@ -21,8 +22,11 @@ public class DefaultRecordService: BaseService {
     private override init() {}
 }
 
-extension DefaultRecordService: RecordService {
-    public func writeDreamRecord(title: String, date: String, content: String, emotion: Int, genre: [Int], note: String?, voice: URL?) -> RxSwift.Observable<DreamWriteResponse?> {
-        requestObjectInRx(RecordRouter.writeRecord(title: title, date: date, content: content, emotion: emotion, genre: genre, note: note, voice: voice))
-    }
-}
+//extension DefaultRecordService: RecordService {
+//    public func writeDreamRecord(title: String, date: String, content: String, emotion: Int, genre: [Int], note: String?, voice: URL?) -> RxSwift.Observable<DreamWriteResponse?> {
+//        requestObjectInRx(RecordRouter.writeRecord(title: title, date: date, content: content, emotion: emotion, genre: genre, note: note, voice: voice))
+//    }
+//    public func searchDreamRecord(query: String) -> Observable<DreamSearchResponse?> {
+//        requestObject(RecordRouter.searchRecord(keyword: query), type: DreamSearchResponse.self, decodingMode: .general, completion: <#T##(NetworkResult<Any>) -> Void#>)
+//    }
+//}

RecorDream-iOS/Projects/Presentation/Sources/SearchScene/DreamSearch/DreamSearhControllable.swift

@@ -12,7 +12,7 @@ import HeeKit
 
 public protocol DreamSearhControllable: Presentable, Reusable { }
 
-public class DreamSearchCollectionViewCell: UICollectionReusableView, DreamSearhControllable {
+public class DreamSearchCollectionViewCell: UICollectionViewCell, DreamSearhControllable {
     // MARK: - View Life Cycle
     override init(frame: CGRect) {
         super.init(frame: frame)

RecorDream-iOS/Projects/Presentation/Sources/SearchScene/DreamSearch/View/Cell/DreamSearchBottomCVC.swift

@@ -10,7 +10,7 @@ import UIKit
 
 import RD_DSKit
 
-final class DreamSearchBottomCVC: DreamSearchCollectionViewCell {
+final class DreamSearchBottomCVC: UICollectionReusableView {
     private lazy var rogoImageView: UIImageView = {
         let iv = UIImageView()
         iv.image = RDDSKitAsset.Images.rdHomeLogo.image

RecorDream-iOS/Projects/Presentation/Sources/SearchScene/DreamSearch/View/Cell/DreamSearchCountCVC.swift

@@ -10,10 +10,9 @@ import UIKit
 
 import RD_DSKit
 
-final class DreamSearchCountCVC: DreamSearchCollectionViewCell {
+final class DreamSearchCountCVC: UICollectionReusableView {
     private lazy var countLabel: UILabel = {
         let lb = UILabel()
-        lb.text = "4개의 기록" // ✅
         lb.textColor = RDDSKitColors.Color.white
         lb.font = RDDSKitFontFamily.Pretendard.semiBold.font(size: 12)
         return lb
@@ -41,3 +40,9 @@ final class DreamSearchCountCVC: DreamSearchCollectionViewCell {
         }
     }
 }
+
+extension DreamSearchCountCVC {
+    func configureCell(viewModel: DreamSearchResultViewModel) {
+        self.countLabel.text = "\(viewModel.recordsCount)개의 기록"
+    }
+}

RecorDream-iOS/Projects/Presentation/Sources/SearchScene/DreamSearch/View/Cell/DreamSearchExistCVC.swift

@@ -88,3 +88,10 @@ final class DreamSearchExistCVC: DreamSearchCollectionViewCell {
         }
     }
 }
+
+extension DreamSearchExistCVC {
+    func configureCell(viewModel: DreamSearchResultViewModel) {
+//        self.backgroundImageView
+//        self.genreView
+    }
+}

RecorDream-iOS/Projects/Presentation/Sources/SearchScene/DreamSearch/View/Cell/Layout/DreamSearchSection.swift

@@ -9,7 +9,6 @@
 import UIKit
 
 
-@available(iOS 16.0, *)
 extension DreamSearchVC {
     func layout() -> UICollectionViewLayout {
         return UICollectionViewCompositionalLayout { [weak self] sectionNumber, environment -> NSCollectionLayoutSection? in
@@ -36,7 +35,7 @@ extension DreamSearchVC {
             heightDimension: .estimated(88.adjustedHeight)
         )
         let group = NSCollectionLayoutGroup.vertical(
-            layoutSize: groupSize, repeatingSubitem: item, count: 1)
+            layoutSize: groupSize, subitems: [item])
         let section = NSCollectionLayoutSection(group: group)
         let sectionFooter = self.createSectionFooter()
         section.orthogonalScrollingBehavior = .continuous
@@ -57,7 +56,7 @@ extension DreamSearchVC {
             heightDimension: .fractionalHeight(1.0)
         )
         let group = NSCollectionLayoutGroup.vertical(
-            layoutSize: groupSize, repeatingSubitem: item, count: 1
+            layoutSize: groupSize, subitems: [item]
         )
         let sectionFooter = self.createSectionFooter()
         let section = NSCollectionLayoutSection(group: group)
@@ -66,7 +65,6 @@ extension DreamSearchVC {
         section.contentInsets = .init(
             top: 208, leading: 113, bottom: 282, trailing: 113
         )
-
         return section
     }
     private func createSectionFooter() -> NSCollectionLayoutBoundarySupplementaryItem {