Feat/#172 검색로직 수정

Spoony-iOS/Spoony-iOS/Network/Model/ResturantpickListResponse.swift

@@ -11,7 +11,7 @@ struct ResturantpickListResponse: Codable {
     let zzimCardResponses: [PickListCardResponse]
 }
 
-struct PickListCardResponse: Codable {
+struct PickListCardResponse: Codable, Equatable {
     let placeId: Int
     let placeName: String
     let placeAddress: String
@@ -20,9 +20,21 @@ struct PickListCardResponse: Codable {
     let latitude: Double
     let longitude: Double
     let categoryColorResponse: BottomSheetCategoryColorResponse
+
+    static func == (lhs: PickListCardResponse, rhs: PickListCardResponse) -> Bool {
+        return lhs.placeId == rhs.placeId &&
+               lhs.placeName == rhs.placeName &&
+               lhs.placeAddress == rhs.placeAddress &&
+               lhs.postTitle == rhs.postTitle &&
+               lhs.photoUrl == rhs.photoUrl &&
+               lhs.latitude == rhs.latitude &&
+               lhs.longitude == rhs.longitude &&
+               lhs.categoryColorResponse == rhs.categoryColorResponse
+    }
 }
 
-struct BottomSheetCategoryColorResponse: Codable {
+struct BottomSheetCategoryColorResponse: Codable, Equatable {
+    let categoryId: Int
     let categoryName: String
     let iconUrl: String
     let iconTextColor: String

Spoony-iOS/Spoony-iOS/Network/Model/SearchLocationResponse.swift

@@ -0,0 +1,45 @@
+//
+//  SearchLocationResponse.swift
+//  Spoony-iOS
+//
+//  Created by 이지훈 on 1/30/25.
+//
+
+import Foundation
+
+struct SearchLocationResponse: Codable {
+    let success: Bool
+    let data: SearchLocationData?
+    let error: String?
+}
+
+struct SearchLocationData: Codable {
+    let zzimCardResponses: [SearchLocationResult]
+}
+
+struct SearchLocationResult: Codable, Identifiable {
+    var id = UUID()
+    let locationId: Int
+    let placeId: Int?     
+    let title: String
+    let address: String
+    let postTitle: String?
+    let photoUrl: String?
+    let latitude: Double?
+    let longitude: Double?
+    let categoryColorResponse: SearchCategoryColorResponse?
+}
+
+struct SearchCategoryColorResponse: Codable {
+    let categoryId: Int
+    let categoryName: String
+    let iconUrl: String
+    let iconTextColor: String
+    let iconBackgroundColor: String
+}
+
+extension SearchLocationResponse {
+    func toEntity() -> [SearchLocationResult] {
+        return data?.zzimCardResponses ?? []
+    }
+}

Spoony-iOS/Spoony-iOS/Network/Model/SearchResult.swift

@@ -0,0 +1,71 @@
+//
+//  SearchResult.swift
+//  Spoony-iOS
+//
+//  Created by 이지훈 on 1/16/25.
+//
+
+import Foundation
+
+struct SearchResult: Identifiable, Equatable {
+    let id = UUID()
+    let title: String
+    let locationId: Int
+    let address: String
+}
+
+extension PickListCardResponse {
+    func toSearchLocationResult() -> SearchLocationResult {
+        return SearchLocationResult(
+            locationId: self.placeId,
+            placeId: self.placeId,
+            title: self.placeName,
+            address: self.placeAddress,
+            postTitle: self.postTitle,
+            photoUrl: self.photoUrl,
+            latitude: self.latitude,
+            longitude: self.longitude,
+            categoryColorResponse: self.categoryColorResponse.toSearchCategoryColorResponse()
+        )
+    }
+}
+
+extension BottomSheetCategoryColorResponse {
+    func toSearchCategoryColorResponse() -> SearchCategoryColorResponse {
+        return SearchCategoryColorResponse(
+            categoryId: self.categoryId,
+            categoryName: self.categoryName,
+            iconUrl: self.iconUrl,
+            iconTextColor: self.iconTextColor,
+            iconBackgroundColor: self.iconBackgroundColor
+        )
+    }
+}
+
+extension SearchLocationResult {
+    func toPickListCardResponse() -> PickListCardResponse {
+        return PickListCardResponse(
+            placeId: self.placeId ?? 0,
+            placeName: self.title,
+            placeAddress: self.address,
+            postTitle: self.postTitle ?? "",
+            photoUrl: self.photoUrl ?? "",
+            latitude: self.latitude ?? 0.0,
+            longitude: self.longitude ?? 0.0,
+            categoryColorResponse: self.categoryColorResponse?.toBottomSheetCategoryColorResponse() ??
+                BottomSheetCategoryColorResponse(categoryId: 0, categoryName: "", iconUrl: "", iconTextColor: "", iconBackgroundColor: "")
+        )
+    }
+}
+
+extension SearchCategoryColorResponse {
+    func toBottomSheetCategoryColorResponse() -> BottomSheetCategoryColorResponse {
+        return BottomSheetCategoryColorResponse(
+            categoryId: self.categoryId,
+            categoryName: self.categoryName,
+            iconUrl: self.iconUrl,
+            iconTextColor: self.iconTextColor,
+            iconBackgroundColor: self.iconBackgroundColor
+        )
+    }
+}

Spoony-iOS/Spoony-iOS/Network/Service/HomeService/HomeService.swift

@@ -12,6 +12,7 @@ protocol HomeServiceType {
     func fetchPickList(userId: Int) async throws -> ResturantpickListResponse
     func fetchSpoonCount(userId: Int) async throws -> Int
     func fetchFocusedPlace(userId: Int, placeId: Int) async throws -> MapFocusResponse
+    func fetchLocationList(userId: Int, locationId: Int) async throws -> ResturantpickListResponse
 }
 
 final class DefaultHomeService: HomeServiceType {
@@ -83,4 +84,25 @@ final class DefaultHomeService: HomeServiceType {
                 }
             }
         }
+
+    func fetchLocationList(userId: Int, locationId: Int) async throws -> ResturantpickListResponse {
+            return try await withCheckedThrowingContinuation { continuation in
+                provider.request(.getLocationList(userId: userId, locationId: locationId)) { result in
+                    switch result {
+                    case .success(let response):
+                        do {
+                            let responseDto = try response.map(BaseResponse<ResturantpickListResponse>.self)
+                            guard let data = responseDto.data else {
+                                throw NSError(domain: "HomeService", code: -1, userInfo: [NSLocalizedDescriptionKey: "No data available"])
+                            }
+                            continuation.resume(returning: data)
+                        } catch {
+                            continuation.resume(throwing: error)
+                        }
+                    case .failure(let error):
+                        continuation.resume(throwing: error)
+                    }
+                }
+            }
+        }
 }

Spoony-iOS/Spoony-iOS/Network/TargetType/HomeTargetType.swift

@@ -14,6 +14,7 @@ enum HomeTargetType {
     case getMapFocus(userId: Int, placeId: Int)
     case getSearchResultList(query: String)
     case getSearchResultLocation(userId: Int, locationId: Int)
+    case getLocationList(userId: Int, locationId: Int)
 }
 
 extension HomeTargetType: TargetType {
@@ -36,7 +37,9 @@ extension HomeTargetType: TargetType {
         case .getSearchResultList:
             return "/location/search"
         case .getSearchResultLocation(let userId, let locationId):
-            return "/post/zzin/\(userId)/\(locationId)"
+            return "/post/zzim/\(userId)/\(locationId)"
+        case .getLocationList(let userId, let locationId):
+            return "/post/zzim/location/\(userId)/\(locationId)" 
         }
     }
 
@@ -46,6 +49,7 @@ extension HomeTargetType: TargetType {
                 .getMapList,
                 .getMapFocus,
                 .getSearchResultList,
+                .getLocationList,
                 .getSearchResultLocation:
             return .get
         }
@@ -56,6 +60,7 @@ extension HomeTargetType: TargetType {
         case .getSpoonCount,
                 .getMapList,
                 .getMapFocus,
+                .getLocationList,
                 .getSearchResultLocation:
             return .requestPlain
 

Spoony-iOS/Spoony-iOS/Resource/Components/BottomSheet/Plain/BottomSheetItem.swift

@@ -0,0 +1,102 @@
+//
+//  BottomSheetItem.swift
+//  Spoony-iOS
+//
+//  Created by 이지훈 on 1/30/25.
+//
+
+import SwiftUI
+
+struct BottomSheetListItem: View {
+    let pickCard: PickListCardResponse
+
+    var body: some View {
+        HStack(spacing: 12) {
+            VStack(alignment: .leading, spacing: 8) {
+                HStack(spacing: 8) {
+                    Text(pickCard.placeName)
+                        .customFont(.body1b)
+                        .lineLimit(1)
+                        .truncationMode(.tail)
+
+                    // 카테고리 칩
+                    HStack(spacing: 4) {
+                        // 카테고리 아이콘
+                        AsyncImage(url: URL(string: pickCard.categoryColorResponse.iconUrl)) { phase in
+                            switch phase {
+                            case .success(let image):
+                                image
+                                    .resizable()
+                                    .scaledToFit()
+                                    .frame(width: 16.adjusted, height: 16.adjustedH)
+                            default:
+                                Color.clear
+                                    .frame(width: 16.adjusted, height: 16.adjustedH)
+                            }
+                        }
+
+                        Text(pickCard.categoryColorResponse.categoryName)
+                            .customFont(.caption1m)
+                            .lineLimit(1)
+                    }
+                    .padding(.horizontal, 8)
+                    .padding(.vertical, 4)
+                    .background(Color(hex: pickCard.categoryColorResponse.iconBackgroundColor))
+                    .foregroundColor(Color(hex: pickCard.categoryColorResponse.iconTextColor))
+                    .cornerRadius(12)
+                }
+
+                Text(pickCard.placeAddress)
+                    .customFont(.caption1m)
+                    .foregroundColor(.gray600)
+                    .lineLimit(1)
+                    .truncationMode(.tail)
+
+                Text(pickCard.postTitle)
+                    .customFont(.caption1m)
+                    .foregroundColor(.spoonBlack)
+                    .lineLimit(1)
+                    .truncationMode(.tail)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .padding(12)
+                    .background(.white)
+                    .cornerRadius(8)
+                    .overlay(
+                        RoundedRectangle(cornerRadius: 8)
+                            .stroke(Color(.gray0), lineWidth: 1)
+                    )
+                    .shadow(
+                        color: Color(.gray0),
+                        radius: 16,
+                        x: 0,
+                        y: 2
+                    )
+            }
+            // 이미지
+            AsyncImage(url: URL(string: pickCard.photoUrl)) { phase in
+                switch phase {
+                case .success(let image):
+                    image
+                        .resizable()
+                        .scaledToFill()
+                case .failure:
+                    defaultPlaceholder
+                case .empty:
+                    defaultPlaceholder
+                default:
+                    defaultPlaceholder
+                }
+            }
+            .frame(width: 98.adjusted, height: 98.adjusted)
+            .clipShape(RoundedRectangle(cornerRadius: 8))
+            .layoutPriority(0)
+        }
+        .padding(.horizontal, 16)
+        .frame(height: 120.adjusted)
+    }
+
+    private var defaultPlaceholder: some View {
+        RoundedRectangle(cornerRadius: 8)
+            .fill(Color.gray.opacity(0.1))
+    }
+}