feat: 검색 화면 정리 및 검색 상세 화면 구현

Projects/Core/DesignSystem/Sources/HorizontalMimScrollView.swift

@@ -1,5 +1,5 @@
 //
-//  HorizontalMimScrollView.swift
+//  HorizontalMememScrollView.swift
 //  DesignSystem
 //
 //  Created by 리나 on 2024/06/29.
@@ -8,14 +8,14 @@
 import SwiftUI
 import ResourceKit
 
-public protocol HorizontalMimItemProtocol: Hashable { }
+public protocol HorizontalMemeItemProtocol: Hashable { }
 
-public protocol HorizontalMimItemViewProtocol: View {
-  associatedtype Item: HorizontalMimItemProtocol
+public protocol HorizontalMemeItemViewProtocol: View {
+  associatedtype Item: HorizontalMemeItemProtocol
   init(item: Item)
 }
 
-public struct HorizontalMimScrollView<Item: HorizontalMimItemProtocol, ItemView: HorizontalMimItemViewProtocol>: View where ItemView.Item == Item {
+public struct HorizontalMemeScrollView<Item: HorizontalMemeItemProtocol, ItemView: HorizontalMemeItemViewProtocol>: View where ItemView.Item == Item {
   @Binding public var items: [Item]
   private var itemClickHandler: ((Item) -> ())?
   public init(items: Binding<[Item]>, itemClickHandler: ((Item) -> ())? = nil) {

Projects/Core/DesignSystem/Sources/CategoryTagView.swift → Projects/Core/DesignSystem/Sources/KeywordsTagView.swift

@@ -1,5 +1,5 @@
 //
-//  CategoryTagView.swift
+//  KeywordsTagView.swift
 //  DesignSystem
 //
 //  Created by 리나 on 2024/06/29.
@@ -9,33 +9,39 @@ import SwiftUI
 import ResourceKit
 
 // thanks to NamS
-public struct CategoryTagView: View {
-  @State public var categories: [String]
+public struct KeywordsTagView: View {
+  @State public var keywords: [String]
+  var onTapHandler: ((String) -> ())?
 
-  public init(categories: [String]) {
-    self.categories = categories
+  public init(keywords: [String], onTapHandler: ((String) -> ())?) {
+    self.keywords = keywords
+    self.onTapHandler = onTapHandler
   }
 
   public var body: some View {
     ScrollView {
       CategoryTagLayout(verticalSpacing: 8, horizontalSpacing: 8) {
-        ForEach(categories, id: \.self) { category in
-          Text(category)
+        ForEach(keywords, id: \.self) { keyword in
+          Text(keyword)
             .font(Font.Body.Medium.medium)
             .foregroundColor(Color.Text.primary)
             .padding(.horizontal, 16)
             .padding(.vertical, 9.5)
             .background(
               Capsule().foregroundStyle(Color.Background.assistive)
             )
+            .onTapGesture {
+              onTapHandler?(keyword)
+            }
         }
       }
     }
     .onAppear {
+      // tagView 사이즈를 잰 후 다시 그리기 위함
       DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-        let cacheValue = categories
-        categories = []
-        categories = cacheValue
+        let cacheValue = keywords
+        keywords = []
+        keywords = cacheValue
       }
     }
   }

Projects/Core/DesignSystem/Sources/MimCategoryView.swift → Projects/Core/DesignSystem/Sources/MemeCategoryView.swift

@@ -1,5 +1,5 @@
 //
-//  MimCategoryView.swift
+//  MemeCategoryView.swift
 //  DesignSystem
 //
 //  Created by 리나 on 2024/06/30.
@@ -8,19 +8,25 @@
 import SwiftUI
 import ResourceKit
 
-public struct MimCategoryView: View {
-  public let title: String
-  public let categories: [String]
+public struct MemeCategoryView: View {
+  public let category: String
+  public let keywords: [String]
+  public let onTapHandler: ((String) -> ())?
 
-  public init(title: String, categories: [String]) {
-    self.title = title
-    self.categories = categories
+  public init(
+    category: String,
+    keywords: [String],
+    onTapHandler: ((String) -> ())?
+  ) {
+    self.category = category
+    self.keywords = keywords
+    self.onTapHandler = onTapHandler
   }
 
   public var body: some View {
     VStack(spacing: 0) {
       HStack {
-        Text(title)
+        Text(category)
           .font(Font.Body.Small.semiBold)
           .foregroundColor(Color.Text.tertiary)
 
@@ -30,7 +36,7 @@ public struct MimCategoryView: View {
       .padding(.bottom, 16)
       .padding(.horizontal, 20)
 
-      CategoryTagView(categories: categories)
+      KeywordsTagView(keywords: keywords, onTapHandler: onTapHandler)
         .padding(.horizontal, 20)
         .padding(.bottom, 20)
     }

Projects/Core/DesignSystem/Sources/View/Meme/MemeListView.swift

@@ -9,19 +9,23 @@ import SwiftUI
 import PPACModels
 
 public struct MemeListView: View {
-  private let memeDetailList: [MemeDetail]
-  private let columns = Array(repeating: GridItem(.flexible(),
-                                                  spacing: 12,
-                                                  alignment: .center),count: 2)
+  @Binding var memeDetailList: [MemeDetail]
+  private let columns = Array(
+    repeating: GridItem(
+      .flexible(),
+      spacing: 12,
+      alignment: .center
+    ), count: 2
+  )
   private let memeClickHandler: ((MemeDetail) -> ())?
   private let memeCopyHandler: ((MemeDetail) -> ())?
 
   public init(
-    memeDetailList: [MemeDetail],
+    memeDetailList: Binding<[MemeDetail]>,
     memeClickHandler: ((MemeDetail) -> ())? = nil,
     memeCopyHandler: ((MemeDetail) -> ())? = nil
   ) {
-    self.memeDetailList = memeDetailList
+    self._memeDetailList = memeDetailList
     self.memeClickHandler = memeClickHandler
     self.memeCopyHandler = memeCopyHandler
   }
@@ -38,7 +42,6 @@ public struct MemeListView: View {
     }
   }
 
-
   public var body: some View {
     ScrollView {
       HStack {
@@ -75,11 +78,11 @@ public struct MemeListView: View {
 
                        "https://images.unsplash.com/photo-1507146426996-ef05306b995a?q=80&w=3540&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D" ]
 
-  let memeDetailList = (0..<20)
+  @State var memeDetailList = (0..<20)
     .map { MemeDetail(id: "\($0)", title: MemeDetail.mock.title,
                       keywords: MemeDetail.mock.keywords,
                       imageUrlString: mockImageList[$0 % 4],
                       source: MemeDetail.mock.source,
                       isTodayMeme: true, reaction: $0 % 4, isFarmemed: true) }
-  return MemeListView(memeDetailList: memeDetailList)
+  return MemeListView(memeDetailList: $memeDetailList)
 }

Projects/Core/PPACData/Sources/Endpoint/MemeEndpoint.swift

@@ -1,22 +1,18 @@
-////
-////  MemeEndpoint.swift
-////  PPACData
-////
-////  Created by kimchansoo on 7/6/24.
-////
 //
-//import Foundation
+//  MemeEndpoint.swift
+//  PPACData
 //
-//import PPACNetwork
+//  Created by kimchansoo on 7/6/24.
 //
 
 import Foundation
 
 import PPACNetwork
+import PPACUtil
 
 public enum MemeEndpoint: Requestable {
-
   case recommendMeme(size: Int)
+  case getSearchKeywordMemeList(keyword: String)
   case meme(memeId: String)
   case bookmark(memeId: String)
   case share(memeId: String)
@@ -31,6 +27,8 @@ public enum MemeEndpoint: Requestable {
     switch self {
     case .recommendMeme:
       return .get
+    case .getSearchKeywordMemeList:
+      return .get
     case .meme:
       return .get
     case .bookmark:
@@ -45,13 +43,20 @@ public enum MemeEndpoint: Requestable {
   }
 
   public var headers: [String : String]? {
-    return nil
+    switch self {
+    case .getSearchKeywordMemeList:
+      return ["x-device-id": UserInfo.shared.deviceId]
+    default:
+      return nil
+    }
   }
 
   public var path: String? {
     switch self {
     case .recommendMeme:
       return "/meme/recomment-memes"
+    case let .getSearchKeywordMemeList(keyword):
+      return "/meme/search/\(keyword)"
     case .meme(let memeId):
       return "/meme/\(memeId)"
     case .bookmark(let memeId):
@@ -69,6 +74,8 @@ public enum MemeEndpoint: Requestable {
     switch self {
     case .recommendMeme(let size):
       return .query(["size": String(size)])
+    case .getSearchKeywordMemeList:
+      return nil
     case .bookmark:
       return nil
     case .share:

Projects/Core/PPACData/Sources/Repository/KeywordRepositoryImpl.swift

@@ -23,9 +23,8 @@ public final class KeywordRepositoryImpl: KeywordRepository {
   // MARK: - Methods
 
   public func getHotKeywords() async throws -> [HotKeyword] {
-    let result = await self.networkService
-      .request(KeywordEndPoint.getTopKeywords,
-               dataType: BaseDTO<[TopKeywordResponseDTO]>.self)
+    let endPoint = KeywordEndPoint.getTopKeywords
+    let result = await self.networkService.request(endPoint, dataType: BaseDTO<[TopKeywordResponseDTO]>.self)
     switch result {
     case .success(let data):
       guard let hotKeywordData = data.data else { throw NetworkError.dataDecodingError }
@@ -37,16 +36,15 @@ public final class KeywordRepositoryImpl: KeywordRepository {
     }
   }
 
-  public func getMimCategorys()  async throws -> [MimCategory] {
-    let result = await self.networkService
-      .request(KeywordEndPoint.getRecommendKeywords,
-               dataType: BaseDTO<[RecommendKeywordResponseDTO]>.self)
+  public func getMemeCategorys()  async throws -> [MemeCategory] {
+    let endPoint = KeywordEndPoint.getRecommendKeywords
+    let result = await self.networkService.request(endPoint, dataType: BaseDTO<[RecommendKeywordResponseDTO]>.self)
     switch result {
     case .success(let data):
-      guard let mimCategoryData = data.data else { throw NetworkError.dataDecodingError }
-      let mimCategorys = mimCategoryData
-        .compactMap { MimCategory(title: $0.category, categories: $0.keywords.map {$0.name }) }
-      return mimCategorys
+      guard let memeCategoryData = data.data else { throw NetworkError.dataDecodingError }
+      let memeCategorys = memeCategoryData
+        .compactMap { MemeCategory(category: $0.category, keywords: $0.keywords.map { $0.name }) }
+      return memeCategorys
     case .failure(let error):
       throw error
     }

Projects/Core/PPACData/Sources/Repository/MemeRepositoryImpl.swift

@@ -38,6 +38,18 @@ public class MemeRepositoryImpl: MemeRepository {
     }
   }
 
+  public func getSearchKeywordMemeList(keyword: String) async throws -> [MemeDetail] {
+    let endpoint = MemeEndpoint.getSearchKeywordMemeList(keyword: keyword)
+    let result = await networkservice.request(endpoint, dataType: BaseDTO<MemeWithPaginationResponseDTO>.self)
+    switch result {
+    case .success(let data):
+      guard let memeResponseDTOList = data.data?.memeList else { throw NetworkError.dataDecodingError }
+      return memeResponseDTOList.map { $0.toModel() }
+    case .failure(let error):
+      throw error
+    }
+  }
+
   public func getMemeDetail(memeId: String) async throws -> MemeDetail {
     let endpoint = MemeEndpoint.meme(memeId: memeId)
     let result = await networkservice.request(endpoint, dataType: BaseDTO<MemeResponseDTO>.self)

Projects/Core/PPACDomain/Sources/Repository/KeywordRepository.swift

@@ -10,5 +10,5 @@ import PPACModels
 
 public protocol KeywordRepository {
   func getHotKeywords() async throws -> [HotKeyword]
-  func getMimCategorys() async throws -> [MimCategory]
+  func getMemeCategorys() async throws -> [MemeCategory]
 }

Projects/Core/PPACDomain/Sources/Repository/MemeRepository.swift

@@ -12,6 +12,7 @@ import PPACModels
 public protocol MemeRepository {
 
   func getRecommendMemes(size: Int) async throws -> [MemeDetail]
+  func getSearchKeywordMemeList(keyword: String) async throws -> [MemeDetail]
   func getMemeDetail(memeId: String) async throws -> MemeDetail
   func bookmarkMeme(memeId: String) async throws
   func shareMeme(memeId: String) async throws

Projects/Core/PPACDomain/Sources/UseCase/Meme/SearchKeywordUseCase.swift

@@ -0,0 +1,26 @@
+//
+//  SearchKeywordUseCase.swift
+//  PPACDomain
+//
+//  Created by 리나 on 7/18/24.
+//
+
+import Foundation
+
+import PPACModels
+
+public protocol SearchKeywordUseCase {
+    func execute(keyword: String) async throws -> [MemeDetail]
+}
+
+public class SearchKeywordUseCaseImpl: SearchKeywordUseCase {
+  private let repository: MemeRepository
+
+  public init(repository: MemeRepository) {
+    self.repository = repository
+  }
+
+  public func execute(keyword: String) async throws -> [MemeDetail] {
+    try await repository.getSearchKeywordMemeList(keyword: keyword)
+  }
+}

Projects/Core/PPACDomain/Sources/UseCase/Search/HotKeywordsUseCase.swift

@@ -0,0 +1,26 @@
+//
+//  HotKeywordsUseCase.swift
+//  PPACDomain
+//
+//  Created by 리나 on 7/18/24.
+//
+
+import Foundation
+
+import PPACModels
+
+public protocol HotKeywordsUseCase {
+    func execute() async throws -> [HotKeyword]
+}
+
+public class HotKeywordsUseCaseImpl: HotKeywordsUseCase {
+    private let repository: KeywordRepository
+
+    public init(repository: KeywordRepository) {
+        self.repository = repository
+    }
+
+    public func execute() async throws -> [HotKeyword] {
+        try await repository.getHotKeywords()
+    }
+}