Merge branch 'develop' of https://github.com/Health-Food-Me/Health-Fo…

…od-Me-iOS into feature/Health-Food-Me#156
L-j-h-c · Jul 20, 2022 · ebbcbbe · ebbcbbe
2 parents 2ef7564 + 7879cf0
commit ebbcbbe
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 2 deletions.
diff --git a/HealthFoodMe/HealthFoodMe/Data/Entity/User/ScrapScene/ScrapListEntity.swift b/HealthFoodMe/HealthFoodMe/Data/Entity/User/ScrapScene/ScrapListEntity.swift
@@ -9,7 +9,7 @@ import Foundation
 
 struct ScrapListEntity: Codable {
     let _id, name, logo: String
-    let score: Int
+    let score: Double
     let category: String
     let hashtag: [String]
     let address: String

diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Detail/MainDetailScene/VC/MainDetailVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Detail/MainDetailScene/VC/MainDetailVC.swift
@@ -120,6 +120,7 @@ extension MainDetailVC {
         scrapButton.setImage(ImageLiterals.MainDetail.scrapIcon_filled, for: .selected)
         scrapButton.addAction(UIAction(handler: { _ in
             scrapButton.isSelected.toggle()
+            self.putScrap(userId: UserManager.shared.getUser?.id ?? "", restaurantId: self.restaurantId)
         }), for: .touchUpInside)
 
         reviewWriteCTAButton.layer.cornerRadius = 20
@@ -517,4 +518,15 @@ extension MainDetailVC {
             }
         }
     }
+
+    private func putScrap(userId: String, restaurantId: String) {
+        UserService.shared.putScrap(userId: userId, restaurantId: restaurantId) { networkResult in
+            switch networkResult {
+            case .success(let message):
+                print(message)
+            default:
+                break;
+            }
+        }
+    }
 }
diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/VC/MainMapVC.swift
@@ -263,6 +263,7 @@ extension MainMapVC {
     private func setDelegate() {
         categoryCollectionView.delegate = self
         categoryCollectionView.dataSource = self
+        mapDetailSummaryView.delegate = self
     }
 
     private func registerCell() {
@@ -570,6 +571,12 @@ extension MainMapVC: HamburgerbarVCDelegate {
     }
 }
 
+extension MainMapVC: MapDetailSummaryViewDelegate {
+    func MapDetailSummaryViewScarp() {
+        putScrap(userId: UserManager.shared.getUser?.id ?? "", restaurantId: currentRestaurantId)
+    }
+}
+
 // MARK: - Network
 
 extension MainMapVC {
@@ -616,4 +623,15 @@ extension MainMapVC {
             }
         }
     }
+
+    private func putScrap(userId: String, restaurantId: String) {
+        UserService.shared.putScrap(userId: userId, restaurantId: restaurantId) { networkResult in
+            switch networkResult {
+            case .success(let message):
+                print(message)
+            default:
+                break;
+            }
+        }
+    }
 }
diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/Views/MapDetailSummaryView.swift b/HealthFoodMe/HealthFoodMe/Presentation/Map/MainMapScene/Views/MapDetailSummaryView.swift
@@ -9,11 +9,16 @@ import UIKit
 
 import SnapKit
 
+protocol MapDetailSummaryViewDelegate: AnyObject {
+    func MapDetailSummaryViewScarp()
+}
+
 final class MapDetailSummaryView: UIView {
 
     // MARK: - Properties
 
     private var tagList = [String]()
+    weak var delegate: MapDetailSummaryViewDelegate?
 
     // MARK: - UI Components
 
@@ -37,6 +42,7 @@ final class MapDetailSummaryView: UIView {
         bt.setImage(ImageLiterals.MainDetail.scrapIcon_filled, for: .selected)
         bt.addAction(UIAction(handler: { _ in
             bt.isSelected.toggle()
+            self.delegate?.MapDetailSummaryViewScarp()
         }), for: .touchUpInside)
         return bt
     }()

diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Scrap/ScrapScene/Cells/ScrapCVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Scrap/ScrapScene/Cells/ScrapCVC.swift
@@ -81,7 +81,6 @@ extension ScrapCVC {
         storeImageView.image = UIImage(named: data.logo)
         storeNameLabel.text = data.name
         locationLabel.text = data.address
-        restaurantId = data._id
     }
 
     private func setUI() {