[Feature] 계정, 게시글 차단하기 구현 (#53)

dudtjs1021ej · web-flow · commit 3f8e18954904 · 2023-02-24T20:38:14.000+09:00
diff --git a/Fitfty/Projects/Coordinator/Sources/Profile/PostCoordinator.swift b/Fitfty/Projects/Coordinator/Sources/Profile/PostCoordinator.swift
@@ -103,7 +103,7 @@ private extension PostCoordinator {
         coordinator.finishDelegate = self
         coordinator.parentCoordinator = self
         let bottomSheetViewController = BottomSheetViewController(
-            style: .custom(196),
+            style: .custom(383),
             contentViewController: coordinator.navigationController
         )
         coordinator.bottomSheetDelegate = bottomSheetViewController
diff --git a/Fitfty/Projects/Coordinator/Sources/Profile/ProfileCoordinator.swift b/Fitfty/Projects/Coordinator/Sources/Profile/ProfileCoordinator.swift
@@ -97,7 +97,7 @@ private extension ProfileCoordinator {
         coordinator.parentCoordinator = self
         let bottomSheetViewController =
         BottomSheetViewController(
-            style: .small,
+            style: .custom(196),
             contentViewController: coordinator.navigationController
         )
         coordinator.bottomSheetDelegate = bottomSheetViewController
diff --git a/Fitfty/Projects/Coordinator/Sources/Profile/ReportCoordinator.swift b/Fitfty/Projects/Coordinator/Sources/Profile/ReportCoordinator.swift
@@ -10,6 +10,7 @@ import Foundation
 import UIKit
 import Profile
 import Common
+import Core
 
 final class ReportCoordinator: Coordinator {
     
@@ -53,6 +54,12 @@ private extension ReportCoordinator {
     func makeReportViewController(reportPresentType: ReportPresentType, userToken: String?, boardToken: String?) -> UIViewController {
         let viewController = ReportViewController(
             coordinator: self,
+            viewModel: ReportViewModel(
+                userManager: DefaultUserManager.shared,
+                userToken: userToken,
+                boardToken: boardToken,
+                fitftyRepository: DefaultFitftyRepository()
+            ),
             reportPresentType: reportPresentType,
             userToken: userToken,
             boardToken: boardToken
@@ -91,6 +98,15 @@ extension ReportCoordinator: ReportCoordinatorInterface {
             self.finishDelegate?.coordinatorDidFinish(childCoordinator: self)
         }
     }
+    
+    func popToRoot() {
+        bottomSheetDelegate?.dismissBottomSheet {
+            self.navigationController.viewControllers.removeAll()
+            self.finishDelegate?.coordinatorDidFinish(childCoordinator: self)
+            self.parentCoordinator?.navigationController.popToRootViewController(animated: true)
+        }
+    }
+    
 }
 
 extension ReportCoordinator: CoordinatorFinishDelegate {
diff --git a/Fitfty/Projects/Profile/Sources/CoordinatorInterfaces/ReportCoordinatorInterface.swift b/Fitfty/Projects/Profile/Sources/CoordinatorInterfaces/ReportCoordinatorInterface.swift
@@ -13,5 +13,6 @@ public protocol ReportCoordinatorInterface: AnyObject {
     
     func showDetailReport(_ reportType: ReportType, userToken: String?, boardToken: String?)
     func dismiss()
+    func popToRoot()
     
 }
diff --git a/Fitfty/Projects/Profile/Sources/Post/Views/MyPostBottomSheetView.swift b/Fitfty/Projects/Profile/Sources/Post/Views/MyPostBottomSheetView.swift
@@ -27,43 +27,93 @@ final class MyPostBottomSheetView: UIStackView {
         return button
     }()
     
-    private lazy var seperatorView: UIView = {
+    private lazy var thirdButton: UIButton = {
+        let button = UIButton()
+        button.setTitleColor(CommonAsset.Colors.gray07.color, for: .normal)
+        button.titleLabel?.font = FitftyFont.appleSDSemiBold(size: 18).font
+        button.contentHorizontalAlignment = .left
+        return button
+    }()
+    
+    private lazy var fourthButton: UIButton = {
+        let button = UIButton()
+        button.setTitleColor(CommonAsset.Colors.gray07.color, for: .normal)
+        button.titleLabel?.font = FitftyFont.appleSDSemiBold(size: 18).font
+        button.contentHorizontalAlignment = .left
+        return button
+    }()
+    
+    private lazy var seperatorView1: UIView = {
+        let view = UIView()
+        view.backgroundColor = CommonAsset.Colors.gray01.color
+        return view
+    }()
+    
+    private lazy var seperatorView2: UIView = {
+        let view = UIView()
+        view.backgroundColor = CommonAsset.Colors.gray01.color
+        return view
+    }()
+    
+    private lazy var seperatorView3: UIView = {
         let view = UIView()
         view.backgroundColor = CommonAsset.Colors.gray01.color
         return view
     }()
     
     override init(frame: CGRect) {
         super.init(frame: frame)
-        setConstraintsLayout()
+        setStackView()
     }
     
     required init(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
     
     private func setConstraintsLayout() {
+        addArrangedSubviews(firstButton, seperatorView1, secondButton)
+        NSLayoutConstraint.activate([
+            seperatorView1.heightAnchor.constraint(equalToConstant: 1)
+        ])
+    }
+    
+    private func setStackView() {
         self.axis = .vertical
         self.distribution = .fill
         self.spacing = 24
-        addArrangedSubviews(firstButton, seperatorView, secondButton)
-        NSLayoutConstraint.activate([
-            seperatorView.heightAnchor.constraint(equalToConstant: 1)
-        ])
     }
+    
 }
 
 extension MyPostBottomSheetView {
     
     func setUpMyPost() {
         firstButton.setTitle("게시글 수정", for: .normal)
         secondButton.setTitle("게시글 삭제", for: .normal)
+        setConstraintsLayout()
     }
     
     func setUpUserPost() {
         firstButton.setTitleColor(CommonAsset.Colors.error.color, for: .normal)
         firstButton.setTitle("계정 신고", for: .normal)
         secondButton.setTitle("게시글 신고", for: .normal)
+        thirdButton.setTitle("이 게시글 차단하기", for: .normal)
+        fourthButton.setTitle("이 계정 차단하기", for: .normal)
+        addArrangedSubviews(firstButton, seperatorView1, secondButton, seperatorView2,
+                            thirdButton, seperatorView3, fourthButton)
+        NSLayoutConstraint.activate([
+            seperatorView1.heightAnchor.constraint(equalToConstant: 1),
+            seperatorView2.heightAnchor.constraint(equalToConstant: 1),
+            seperatorView3.heightAnchor.constraint(equalToConstant: 1)
+        ])
+    }
+    
+    func setUpUserProfile() {
+        firstButton.setTitleColor(CommonAsset.Colors.error.color, for: .normal)
+        secondButton.setTitleColor(CommonAsset.Colors.gray07.color, for: .normal)
+        firstButton.setTitle("계정 신고", for: .normal)
+        secondButton.setTitle("이 계정 차단하기", for: .normal)
+        setConstraintsLayout()
     }
     
     func setActionFirstButton(_ target: Any?, action: Selector) {
@@ -74,4 +124,12 @@ extension MyPostBottomSheetView {
         secondButton.addTarget(target, action: action, for: .touchUpInside)
     }
     
+    func setActionThirdButton( _ target: Any?, action: Selector) {
+        thirdButton.addTarget(target, action: action, for: .touchUpInside)
+    }
+    
+    func setActionFourthButton( _ target: Any?, action: Selector) {
+        fourthButton.addTarget(target, action: action, for: .touchUpInside)
+    }
+    
 }
diff --git a/Fitfty/Projects/Profile/Sources/Report/ViewControllers/ReportViewController.swift b/Fitfty/Projects/Profile/Sources/Report/ViewControllers/ReportViewController.swift
@@ -8,13 +8,17 @@
 
 import UIKit
 import Common
+import Combine
 
 final public class ReportViewController: UIViewController {
     
-    let coordinator: ReportCoordinatorInterface
-    let reportPresentType: ReportPresentType
-    var userToken: String?
-    var boardToken: String?
+    private let coordinator: ReportCoordinatorInterface
+    private let viewModel: ReportViewModel
+    private var cancellables: Set<AnyCancellable> = .init()
+    
+    private let reportPresentType: ReportPresentType
+    private var userToken: String?
+    private var boardToken: String?
     
     private lazy var userReportButton: UIButton = {
         let button = UIButton()
@@ -36,15 +40,18 @@ final public class ReportViewController: UIViewController {
     public override func viewDidLoad() {
         super.viewDidLoad()
         setUp()
+        bind()
     }
     
     public init(
         coordinator: ReportCoordinatorInterface,
+        viewModel: ReportViewModel,
         reportPresentType: ReportPresentType,
         userToken: String?,
         boardToken: String?
     ) {
         self.coordinator = coordinator
+        self.viewModel = viewModel
         self.reportPresentType = reportPresentType
         self.userToken = userToken
         self.boardToken = boardToken
@@ -60,29 +67,60 @@ final public class ReportViewController: UIViewController {
         
     }
     
+    func bind() {
+        viewModel.state.compactMap { $0 }
+            .sinkOnMainThread(receiveValue: { [weak self] state in
+                switch state {
+                case .errorMessage(let message):
+                    self?.showAlert(message: message)
+                    
+                case .completed(let completed):
+                    guard completed else {
+                        return
+                    }
+                    self?.coordinator.popToRoot()
+                }
+            }).store(in: &cancellables)
+    }
+    
     private func setConstraintsLayout() {
+        view.addSubviews(myPostBottomSheetView)
+        NSLayoutConstraint.activate([
+            myPostBottomSheetView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 20),
+            myPostBottomSheetView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -20),
+            myPostBottomSheetView.topAnchor.constraint(equalTo: view.topAnchor, constant: 40)
+        ])
         switch reportPresentType {
         case .userReport:
-            view.addSubviews(userReportButton)
-            NSLayoutConstraint.activate([
-                userReportButton.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 20),
-                userReportButton.topAnchor.constraint(equalTo: view.topAnchor, constant: 44),
-                userReportButton.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -20)
-            ])
+            myPostBottomSheetView.setUpUserProfile()
+            myPostBottomSheetView.setActionFirstButton(self, action: #selector(didTapUserReportButton))
+            myPostBottomSheetView.setActionSecondButton(self, action: #selector(didTapUserBlockButton))
+            
         case .postUserReport:
-            view.addSubviews(myPostBottomSheetView)
-            NSLayoutConstraint.activate([
-                myPostBottomSheetView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 20),
-                myPostBottomSheetView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -20),
-                myPostBottomSheetView.topAnchor.constraint(equalTo: view.topAnchor, constant: 40)
-            ])
             myPostBottomSheetView.setUpUserPost()
             myPostBottomSheetView.setActionFirstButton(self, action: #selector(didTapUserReportButton))
             myPostBottomSheetView.setActionSecondButton(self, action: #selector(didTapPostReportButton))
+            myPostBottomSheetView.setActionThirdButton(self, action: #selector(didTapPostBlockButton))
+            myPostBottomSheetView.setActionFourthButton(self, action: #selector(didTapUserBlockButton))
         }
     
     }
     
+    private func showBlockAlert(_ reportType: ReportType) {
+        let message = reportType == .userReport ? "계정" : "게시글"
+        let alert = UIAlertController(title: "정말 이 \(message)을 차단할까요?", message: nil, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "취소", style: .default))
+        alert.addAction(UIAlertAction(title: "차단하기", style: .default, handler: { _ in
+            switch reportType {
+            case .userReport:
+                self.viewModel.input.didTapBlockButton(.userReport)
+            case .postReport:
+                self.viewModel.input.didTapBlockButton(.postReport)
+            }
+        }))
+        present(alert, animated: true)
+    }
+    
     @objc func didTapUserReportButton(_ sender: Any?) {
         coordinator.showDetailReport(.userReport, userToken: userToken, boardToken: boardToken)
     }
@@ -91,4 +129,12 @@ final public class ReportViewController: UIViewController {
         coordinator.showDetailReport(.postReport, userToken: userToken, boardToken: boardToken)
     }
     
+    @objc func didTapUserBlockButton(_ sender: Any?) {
+        showBlockAlert(.userReport)
+    }
+    
+    @objc func didTapPostBlockButton(_ sender: Any?) {
+        showBlockAlert(.postReport)
+    }
+    
 }
diff --git a/Fitfty/Projects/Profile/Sources/Report/ViewModel/ReportViewModel.swift b/Fitfty/Projects/Profile/Sources/Report/ViewModel/ReportViewModel.swift

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ private extension PostCoordinator {`
`103`	`103`	`coordinator.finishDelegate = self`
`104`	`104`	`coordinator.parentCoordinator = self`
`105`	`105`	`let bottomSheetViewController = BottomSheetViewController(`
`106`		`- style: .custom(196),`
	`106`	`+ style: .custom(383),`
`107`	`107`	`contentViewController: coordinator.navigationController`
`108`	`108`	`)`
`109`	`109`	`coordinator.bottomSheetDelegate = bottomSheetViewController`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ private extension ProfileCoordinator {`
`97`	`97`	`coordinator.parentCoordinator = self`
`98`	`98`	`let bottomSheetViewController =`
`99`	`99`	`BottomSheetViewController(`
`100`		`- style: .small,`
	`100`	`+ style: .custom(196),`
`101`	`101`	`contentViewController: coordinator.navigationController`
`102`	`102`	`)`
`103`	`103`	`coordinator.bottomSheetDelegate = bottomSheetViewController`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ public protocol ReportCoordinatorInterface: AnyObject {`
`13`	`13`
`14`	`14`	`func showDetailReport(_ reportType: ReportType, userToken: String?, boardToken: String?)`
`15`	`15`	`func dismiss()`
	`16`	`+ func popToRoot()`
`16`	`17`
`17`	`18`	`}`