Merge pull request #139 from teamCA-PIN/feature/#114

[fix] 리뷰 삭제 분기처리 로직 수정

Author: seohyun-106

CA-PIN_IOS/CA-PIN_IOS.xcodeproj/project.pbxproj

@@ -247,6 +247,7 @@ extension DetailReviewTableViewCell {
                 let deleteReviewVC = DeleteReviewViewController()
                 deleteReviewVC.modalPresentationStyle = .overCurrentContext
                 deleteReviewVC.reviewId = self.reviewModel?.id ?? ""
+                deleteReviewVC.vc = .detail
                   deleteReviewVC.rootViewController = self.rootViewController
                   deleteReviewVC.cafeID = self.cafeID
 

CA-PIN_IOS/CA-PIN_IOS/Screens/CafeDetail/Cells/DetailReviewTableViewCell.swift

@@ -248,6 +248,7 @@ extension MyReviewTableViewCell {
       let deleteReviewVC = DeleteReviewViewController()
       deleteReviewVC.modalPresentationStyle = .overCurrentContext
       deleteReviewVC.reviewId = self.reviewModel?.id ?? ""
+      deleteReviewVC.vc = .myPage
       self.parentViewController?.present(deleteReviewVC, animated: false, completion: nil)
     })
 

CA-PIN_IOS/CA-PIN_IOS/Screens/Mypage/Cells/MyPage/Review/MyReviewTableViewCell.swift

@@ -7,7 +7,6 @@
 
 import UIKit
 
-import Moya
 import Moya
 import RxSwift
 import SnapKit

CA-PIN_IOS/CA-PIN_IOS/Screens/Mypage/ViewControllers/CategoryDetailViewController.swift

@@ -10,6 +10,7 @@ import Moya
 import Moya
 import RxSwift
 
+
 class DeleteReviewViewController: UIViewController {
 
   // MARK: - Components
@@ -20,6 +21,12 @@ class DeleteReviewViewController: UIViewController {
   let confirmButton = UIButton()
 
   var reviewId: String = ""
+  
+  enum VC: Int {
+    case detail, myPage
+  }
+  
+  var vc: VC?
     var rootViewController: UIViewController?
     var cafeID: String?
 
@@ -111,6 +118,7 @@ extension DeleteReviewViewController {
       }
     }
   }
+  // 서버통신
   func deleteReview(reviewId: String) {
     reviewDeleteService.rx.request(.deleteReview(reviewId: reviewId))
       .asObservable()
@@ -119,13 +127,21 @@ extension DeleteReviewViewController {
           do {
             let endIndex = self.presentingViewController?.children.endIndex ?? 0
             let mypageVC = self.presentingViewController?.children[endIndex-1] as? MypageViewController ?? UIViewController()
-              guard let detailVC = self.rootViewController as? CafeDetailViewController else { return }
-              guard let cafeID = self.cafeID else { return }
-            self.dismiss(animated: false) {
+            switch self.vc {
+            case .myPage:
+              self.dismiss(animated: true) {
               mypageVC.viewWillAppear(true)
               mypageVC.showGreenToast(message: "리뷰 삭제가 완료되었습니다.")
+            }
+            case .detail:
+              guard let detailVC = self.rootViewController as? CafeDetailViewController else { return }
+              guard let cafeID = self.cafeID else { return }
+              self.dismiss(animated: true, completion: {
                 detailVC.setupReviewData(cafeId: cafeID)
                 detailVC.showGreenToast(message: "리뷰 삭제가 완료되었습니다.")
+              })
+            case .none:
+              break
             }
           }
           catch {
@@ -150,7 +166,9 @@ extension DeleteReviewViewController {
   @objc func clickedCancelButton() {
     self.dismiss(animated: false, completion: nil)
   }
+  
   @objc func clickedConfirmButton() {
+
     /// 삭제 서버 연결
     deleteReview(reviewId: reviewId)
   }

CA-PIN_IOS/CA-PIN_IOS/Screens/Mypage/ViewControllers/DeleteReviewViewController.swift

@@ -40,4 +40,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 3064a8fd29822b776f9657765902f678838a25e2
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.0