[Feat] Health-Food-Me#205 - 데이터 바인딩 옵셔널로 처리

L-j-h-c · Jul 22, 2022 · 392fac4 · 392fac4
1 parent 7a0c04d
commit 392fac4
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 7 deletions.
diff --git a/HealthFoodMe/HealthFoodMe/Data/Entity/Detail/MainDetailScene/MainDetailEntity.swift b/HealthFoodMe/HealthFoodMe/Data/Entity/Detail/MainDetailScene/MainDetailEntity.swift
@@ -15,17 +15,30 @@ struct MainDetailEntity: Codable {
 
 // MARK: - Menu
 struct Menu: Codable {
-    let id, name: String
+    let id, name: String?
     let image: String?
-    let kcal, per: Int?
-    let price: Int
-    let isPick: Bool
+    let kcal: Double?
+    let per: Int?
+    let price: Int?
+    let isPick: Bool?
 
     enum CodingKeys: String, CodingKey {
         case id = "_id"
         case name, image, kcal, per, price, isPick
     }
 
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+
+        id = (try? container.decode(String.self, forKey: .id)) ?? ""
+        name = (try? container.decode(String.self, forKey: .name)) ?? ""
+        image = (try? container.decode(String.self, forKey: .image)) ?? ""
+        kcal = (try? container.decode(Double.self, forKey: .kcal)) ?? 0
+        per = (try? container.decode(Int.self, forKey: .per)) ?? 0
+        price = (try? container.decode(Int.self, forKey: .price)) ?? 0
+        isPick = (try? container.decode(Bool.self, forKey: .isPick)) ?? false
+    }
+
     func toDomain() -> MenuDataModel {
         var imageURL: String?
         var perText: String?
@@ -39,7 +52,16 @@ struct Menu: Codable {
         } else {
             perText = nil
         }
-        return MenuDataModel.init(restaurantID: id, isPick: isPick, memuImageURL: imageURL, menuName: name, menuPrice: price, menuKcal: kcal, carbohydrates: nil, protein: nil, fat: nil, per: perText)
+        return MenuDataModel.init(restaurantID: id ?? "",
+                                  isPick: isPick ?? false,
+                                  memuImageURL: imageURL,
+                                  menuName: name ?? "",
+                                  menuPrice: price ?? 0,
+                                  menuKcal: kcal,
+                                  carbohydrates: nil,
+                                  protein: nil,
+                                  fat: nil,
+                                  per: perText)
     }
 }
 

diff --git a/HealthFoodMe/HealthFoodMe/Data/Network/Foundation/BaseService.swift b/HealthFoodMe/HealthFoodMe/Data/Network/Foundation/BaseService.swift
@@ -50,6 +50,8 @@ class BaseService {
 
             switch decodingMode {
             case .model:
+                print("여기여기")
+                dump(decodedData)
                 return .success(decodedData.data ?? "None-Data")
 
             case .message:

diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Detail/MainDetailScene/VC/MainDetailVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Detail/MainDetailScene/VC/MainDetailVC.swift
@@ -517,7 +517,10 @@ extension MainDetailVC {
             RestaurantService.shared.fetchRestaurantDetail(restaurantId: restaurantId, userId: UserManager.shared.getUser ?? "", latitude: location.latitude, longitude: location.longitude) { networkResult in
                 switch networkResult {
                 case .success(let data):
+                    dump(data)
+                    print("옵셔널")
                     if let data = data as? MainDetailEntity {
+                        print("성공")
                         self.navigationTitle = data.restaurant.name
                         self.restaurantName = data.restaurant.name
                         self.mainInfoTVC.isInitialReload = self.mainInfoInitialReload

diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Detail/MenuTabScene/Cells/MenuCellCVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Detail/MenuTabScene/Cells/MenuCellCVC.swift
@@ -74,7 +74,8 @@ extension MenuCellCVC {
             menuView.kcalView.isHidden = true
         } else {
             guard let menuKcal = menuData.menuKcal else { return }
-            menuView.kcalLabel.text = "\(menuKcal)"
+            let intKcal = Int(menuKcal)
+            menuView.kcalLabel.text = "\(intKcal)"
         }
     }
 }
diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Detail/MenuTabScene/ViewModel/MenuDataModel.swift b/HealthFoodMe/HealthFoodMe/Presentation/Detail/MenuTabScene/ViewModel/MenuDataModel.swift
@@ -13,7 +13,7 @@ struct MenuDataModel: Codable {
     let memuImageURL: String?
     let menuName: String
     let menuPrice: Int
-    let menuKcal: Int?
+    let menuKcal: Double?
     let carbohydrates: Int?
     let protein: Int?
     let fat: Int?

diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift
@@ -184,6 +184,8 @@ class MainMapVC: UIViewController, NMFLocationManagerDelegate {
         setMapView()
         addObserver()
         self.bindViewModels()
+
+        let temp: Double = 116.40000000000001
     }
 
     override func viewWillAppear(_ animated: Bool) {