🪛[chore] : 모듈 분리 작업

DDD-Community · Nov 4, 2023 · 0765423 · 0765423
1 parent 53cc84f
commit 0765423
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 41 deletions.
diff --git a/PingPong/Projects/Feature/Home/Project.swift b/PingPong/Projects/Feature/Home/Project.swift
@@ -23,6 +23,7 @@ let project = Project.makeAppModule(
         .core(implements: .Authorization),
         .core(implements: .Common),
         .feature(implements: .Bake),
+        .feature(implements: .Search),
 
         .SPM.PopupView,
         .SPM.Inject,

diff --git a/PingPong/Projects/Feature/Home/Sources/UI/View/ModalModifier/ModalView.swift b/PingPong/Projects/Feature/Home/Sources/UI/View/ModalModifier/ModalView.swift
@@ -11,13 +11,16 @@ import DesignSystem
 import Foundation
 import Model
 import SwiftUI
+import Search
 
 public struct ModalView: View {
     let config: SheetManager.Config
     let isPopup: Bool
     let defaultYoffset: CGFloat
 
     @StateObject private var viewModel: CommonViewViewModel
+    @StateObject var exploreViewViewModel: ExploreViewModel = ExploreViewModel()
+
 
     let didClose: () -> Void
 
@@ -177,6 +180,24 @@ private extension ModalView {
                 let flavorParameter: [String] = generateParameter(searchType: .flavor)
                 let sourceParameter: [String] = generateParameter(searchType: .source)
                 print(situationParameter, flavorParameter, sourceParameter, viewModel.exploreViewSearchBarText)
+
+                Task {
+                    await exploreViewViewModel.searchRequest(keyword: viewModel.exploreViewSearchBarText, flavors: flavorParameter, sources: sourceParameter, mood: situationParameter, orderBy: "") {
+                        viewModel.searchedCards = []
+
+                        for quoteContent in exploreViewViewModel.searchModel?.data?.content ?? [] {
+                            let hashTags = viewModel.getHashtags(post: quoteContent)
+                            self.viewModel.likeYn = quoteContent.likeYn ?? false
+                            let card = CardInfomation(qouteId: quoteContent.quoteID ?? .zero,
+                                                      hashtags: hashTags, image: "",
+                                                      title: quoteContent.content ?? "",
+                                                      sources: quoteContent.author ?? "",
+                                                      isBookrmark: quoteContent.likeYn ?? false)
+                            viewModel.searchedCards.append(card)
+                        }
+                    }
+                }
+
                 didClose()
             }
     }

diff --git a/PingPong/Projects/Feature/Search/Sources/UI/View/ExploreView.swift b/PingPong/Projects/Feature/Search/Sources/UI/View/ExploreView.swift
@@ -40,48 +40,11 @@ public struct ExploreView: View {
                 searchBar()
                     .padding(.top, 62)
 
-                VStack {
-                    HStack {
-                        HStack {
-
-                            ForEach(viewModel.searchViewButtonInfoArray.indices, id: \.self) { idx in
-
-                                //                                TODO: 버튼 정보 예: 맛 + 3 이런 식으로 처리하기
-                                //                                let info: OptionButtonInfo = exploreViewViewModel.optionButtonInfoArray[idx]
-                                let info = viewModel.searchViewButtonInfoArray[idx]
-
-                                Button(action: {
-                                    withAnimation {
-                                        sheetManager.present(with: .init(idx: idx))
-                                    }
-                                    sheetManager.isPopup = true
-                                }) {
-
-                                    Text(info.count == 0 ? "\(viewModel.searchViewButtonInfoArray[idx].title.rawValue)" : "\(info.choicedTitle)")
-                                        .foregroundColor(.cardTextMain)
-                                        .pretendardFont(family: .SemiBold, size: 14)
-                                        .frame(minWidth: 48, minHeight: 30)
-                                        .padding(.horizontal, 8)
-                                        .background(
-                                            RoundedRectangle(cornerRadius: 8)
-                                                .foregroundColor(info.count == 0 ? .primaryOrangeBright: .primaryOrangeOpacity40)
-                                                .overlay(
-                                                    RoundedRectangle(cornerRadius: 10)
-                                                        .stroke(info.count == 0 ? Color.hotIconBG : .primaryOrange, lineWidth: 1)
-                                                )
-                                        )
-                                }
-                            }
-                        }.padding(EdgeInsets(top: 0, leading: 20, bottom: 0, trailing: 0))
-
-                        Spacer()
-                    }
-                }
-                .frame(height:46)
+                searchHashTagView()
 
-                staticsView(count: exploreViewViewModel.searchModel?.data?.totalElements ?? .zero)
+                staticsView(count: viewModel.searchedCards.count)
 
-                if !viewModel.cards.isEmpty {
+                if !viewModel.searchedCards.isEmpty {
                     searchTextisEmptyQuote
 
                 }  else {
@@ -220,6 +183,48 @@ public struct ExploreView: View {
         .frame(height: UIScreen.main.bounds.height * 0.56)
     }
 
+    @ViewBuilder
+    private func searchHashTagView() -> some View {
+        VStack {
+            HStack {
+                HStack {
+
+                    ForEach(viewModel.searchViewButtonInfoArray.indices, id: \.self) { idx in
+
+                        //                                TODO: 버튼 정보 예: 맛 + 3 이런 식으로 처리하기
+                        //                                let info: OptionButtonInfo = exploreViewViewModel.optionButtonInfoArray[idx]
+                        let info = viewModel.searchViewButtonInfoArray[idx]
+
+                        Button(action: {
+                            withAnimation {
+                                sheetManager.present(with: .init(idx: idx))
+                            }
+                            sheetManager.isPopup = true
+                        }) {
+
+                            Text(info.count == 0 ? "\(viewModel.searchViewButtonInfoArray[idx].title.rawValue)" : "\(info.choicedTitle)")
+                                .foregroundColor(.cardTextMain)
+                                .pretendardFont(family: .SemiBold, size: 14)
+                                .frame(minWidth: 48, minHeight: 30)
+                                .padding(.horizontal, 8)
+                                .background(
+                                    RoundedRectangle(cornerRadius: 8)
+                                        .foregroundColor(info.count == 0 ? .primaryOrangeBright: .primaryOrangeOpacity40)
+                                        .overlay(
+                                            RoundedRectangle(cornerRadius: 10)
+                                                .stroke(info.count == 0 ? Color.hotIconBG : .primaryOrange, lineWidth: 1)
+                                        )
+                                )
+                        }
+                    }
+                }.padding(EdgeInsets(top: 0, leading: 20, bottom: 0, trailing: 0))
+
+                Spacer()
+            }
+        }
+        .frame(height:46)
+    }
+
     @ViewBuilder
     private func staticsView(count: Int) -> some View {
         HStack{

diff --git a/PingPong/Projects/Feature/Search/Sources/ViewModel/ExploreViewModel.swift b/PingPong/Projects/Feature/Search/Sources/ViewModel/ExploreViewModel.swift
@@ -16,7 +16,7 @@ import API
 
 public class ExploreViewModel: ObservableObject {
 
-    @Published var searchModel: SearchQuoteModel?
+    @Published public var searchModel: SearchQuoteModel?
     var searchCancellable: AnyCancellable?
 
     @Published public var optionButtonInfoArray: [OptionButtonInfo] = [OptionButtonInfo(defaultTitle: .situation),