[FEAT] 未達修正

HotSpot/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,91 +1,109 @@
 {
   "images" : [
     {
+      "filename" : "40.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "60.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
+      "filename" : "58.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "87.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
+      "filename" : "80.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "120.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
+      "filename" : "120 1.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
+      "filename" : "180.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
+      "filename" : "20.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
+      "filename" : "40 1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
+      "filename" : "29.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
+      "filename" : "58 1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
+      "filename" : "40 2.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
+      "filename" : "80 1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
+      "filename" : "76.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
+      "filename" : "152.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
+      "filename" : "167.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
+      "filename" : "appstore.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"

HotSpot/Sources/Common/Dependency/ShopRepository+Dependency.swift

@@ -1,3 +1,4 @@
+import Foundation
 import ComposableArchitecture
 
 private enum ShopRepositoryKey: DependencyKey {

HotSpot/Sources/Common/Dependency/UserDefaults+Dependency.swift

@@ -0,0 +1,76 @@
+import Foundation
+import ComposableArchitecture
+
+private enum UserDefaultsKey: DependencyKey {
+    static let liveValue = UserDefaults.standard
+}
+
+extension DependencyValues {
+    var userDefaults: UserDefaults {
+        get { self[UserDefaultsKey.self] }
+        set { self[UserDefaultsKey.self] = newValue }
+    }
+}
+
+// MARK: - Filter Keys
+extension UserDefaults {
+    private enum FilterKey: String {
+        case range = "range"
+        case budgets = "budgets"
+        case genres = "genres"
+        case wifi = "wifi"
+        case privateRoom = "privateRoom"
+        case nonSmoking = "nonSmoking"
+        case parking = "parking"
+        case location = "location"
+    }
+
+    var range: Int {
+        get { integer(forKey: FilterKey.range.rawValue) == 0 ? 3 : integer(forKey: FilterKey.range.rawValue) }
+        set { set(newValue, forKey: FilterKey.range.rawValue) }
+    }
+
+    var location: MapCoordinate {
+        get {
+            let lat = double(forKey: "\(FilterKey.location.rawValue)_lat")
+            let lng = double(forKey: "\(FilterKey.location.rawValue)_lng")
+            return lat == 0 && lng == 0 
+                ? MapCoordinate(latitude: 34.6937, longitude: 135.5023) // Osaka coordinates
+                : MapCoordinate(latitude: lat, longitude: lng)
+        }
+        set {
+            set(newValue.latitude, forKey: "\(FilterKey.location.rawValue)_lat")
+            set(newValue.longitude, forKey: "\(FilterKey.location.rawValue)_lng")
+        }
+    }
+
+    var budgets: [String] {
+        get { stringArray(forKey: FilterKey.budgets.rawValue) ?? [] }
+        set { set(newValue, forKey: FilterKey.budgets.rawValue) }
+    }
+
+    var genres: [String] {
+        get { stringArray(forKey: FilterKey.genres.rawValue) ?? [] }
+        set { set(newValue, forKey: FilterKey.genres.rawValue) }
+    }
+
+    var wifi: Int {
+        get { integer(forKey: FilterKey.wifi.rawValue) }
+        set { set(newValue, forKey: FilterKey.wifi.rawValue) }
+    }
+
+    var privateRoom: Int {
+        get { integer(forKey: FilterKey.privateRoom.rawValue) }
+        set { set(newValue, forKey: FilterKey.privateRoom.rawValue) }
+    }
+
+    var nonSmoking: Int {
+        get { integer(forKey: FilterKey.nonSmoking.rawValue) }
+        set { set(newValue, forKey: FilterKey.nonSmoking.rawValue) }
+    }
+
+    var parking: Int {
+        get { integer(forKey: FilterKey.parking.rawValue) }
+        set { set(newValue, forKey: FilterKey.parking.rawValue) }
+    }
+}

HotSpot/Sources/Common/Extensions/UIImage+Kingfisher.swift

@@ -26,7 +26,7 @@ extension UIImage {
             return
         }
 
-        let processor = DownsamplingImageProcessor(size: CGSize(width: 200, height: 200))
+        let processor = DownsamplingImageProcessor(size: CGSize(width: 100, height: 100))
         KingfisherManager.shared.retrieveImage(
             with: url,
             options: [

HotSpot/Sources/Data/DTO/Request/ShopSearchRequestDTO.swift

@@ -5,36 +5,32 @@ struct ShopSearchRequestDTO {
     let lng: Double                   // Longitude
     let range: Int                    // Search range (1–5)
     let count: Int?                   // Number of results (1–100)
-    let keyword: String?             // Keyword search
-    let genre: String?               // Genre code
-    let order: Int?                  // Order: 1=recommend, 2=popularity
+    let name: String?                 // Name search
+    let genres: [String]?            // Genre codes
     let start: Int?                  // Starting index for paging
-    let budget: String?              // Budget code
-    let privateRoom: Bool?           // Private room availability
-    let wifi: Bool?                  // Wi-Fi availability
-    let nonSmoking: Bool?            // Non-smoking availability
-    let coupon: Bool?                // Coupon availability
-    let openNow: Bool?               // Currently open filter
+    let budgets: [String]?           // Budget codes
+    let privateRoom: Int             // Private room availability (0 or 1)
+    let wifi: Int                    // Wi-Fi availability (0 or 1)
+    let nonSmoking: Int              // Non-smoking availability (0 or 1)
+    let parking: Int                 // Parking availability (0 or 1)
 
     /// Converts the DTO into a dictionary of parameters for Moya or URL encoding
     var asParameters: [String: Any] {
         var params: [String: Any] = [
             "lat": lat,
             "lng": lng,
-            "range": range
+            "range": range,
+            "private_room": privateRoom,
+            "wifi": wifi,
+            "non_smoking": nonSmoking,
+            "parking": parking
         ]
 
         if let count = count { params["count"] = count }
-        if let keyword = keyword { params["keyword"] = keyword }
-        if let genre = genre { params["genre"] = genre }
-        if let order = order { params["order"] = order }
+        if let name = name { params["name"] = name }
+        if let genres = genres, !genres.isEmpty { params["genre"] = genres.joined(separator: ",") }
         if let start = start { params["start"] = start }
-        if let budget = budget { params["budget"] = budget }
-        if let privateRoom = privateRoom { params["private_room"] = privateRoom ? 1 : 0 }
-        if let wifi = wifi { params["wifi"] = wifi ? 1 : 0 }
-        if let nonSmoking = nonSmoking { params["non_smoking"] = nonSmoking ? 1 : 0 }
-        if let coupon = coupon { params["coupon"] = coupon ? 1 : 0 }
-        if let openNow = openNow, openNow { params["open"] = "now" }
+        if let budgets = budgets, !budgets.isEmpty { params["budget"] = budgets.joined(separator: ",") }
 
         return params
     }