✨ [feat] 게시글에 계정 차단하기 추가

dudtjs1021ej · dudtjs1021ej · commit 23e76af74c9b · 2023-02-24T19:33:40.000+09:00
- 가리기 -&gt; 차단하기로 문구 수정
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(290),
+            style: .custom(383),
             contentViewController: coordinator.navigationController
         )
         coordinator.bottomSheetDelegate = bottomSheetViewController
diff --git a/Fitfty/Projects/Coordinator/Sources/Profile/ReportCoordinator.swift b/Fitfty/Projects/Coordinator/Sources/Profile/ReportCoordinator.swift
@@ -58,7 +58,6 @@ private extension ReportCoordinator {
                 userManager: DefaultUserManager.shared,
                 userToken: userToken,
                 boardToken: boardToken,
-                reportType: reportPresentType == .userReport ? .userReport : .postReport,
                 fitftyRepository: DefaultFitftyRepository()
             ),
             reportPresentType: reportPresentType,
diff --git a/Fitfty/Projects/Profile/Sources/Post/Views/MyPostBottomSheetView.swift b/Fitfty/Projects/Profile/Sources/Post/Views/MyPostBottomSheetView.swift
@@ -35,6 +35,14 @@ final class MyPostBottomSheetView: UIStackView {
         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
@@ -47,6 +55,12 @@ final class MyPostBottomSheetView: UIStackView {
         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)
         setStackView()
@@ -83,19 +97,22 @@ extension MyPostBottomSheetView {
         firstButton.setTitleColor(CommonAsset.Colors.error.color, for: .normal)
         firstButton.setTitle("계정 신고", for: .normal)
         secondButton.setTitle("게시글 신고", for: .normal)
-        thirdButton.setTitle("이 게시글 가리기", for: .normal)
-        addArrangedSubviews(firstButton, seperatorView1, secondButton, seperatorView2, thirdButton)
+        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)
+            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)
+        secondButton.setTitle("이 계정 차단하기", for: .normal)
         setConstraintsLayout()
     }
     
@@ -111,4 +128,8 @@ extension MyPostBottomSheetView {
         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
@@ -74,11 +74,8 @@ final public class ReportViewController: UIViewController {
                 case .errorMessage(let message):
                     self?.showAlert(message: message)
                     
-                case .completed(let isCompleted):
-                    guard isCompleted else {
-                        return
-                    }
-                    let message = self?.reportPresentType == .userReport ? "계정" : "게시글"
+                case .completed(let reportType):
+                    let message = reportType == .userReport ? "계정" : "게시글"
                     let alert = UIAlertController(title: "", message: "\(message) 가리기를 완료했어요.", preferredStyle: .alert)
                     alert.addAction(UIAlertAction(title: "메인 화면으로 돌아가기", style: .default, handler: { _ in
                         self?.coordinator.popToRoot()
@@ -100,13 +97,14 @@ final public class ReportViewController: UIViewController {
         case .userReport:
             myPostBottomSheetView.setUpUserProfile()
             myPostBottomSheetView.setActionFirstButton(self, action: #selector(didTapUserReportButton))
-            myPostBottomSheetView.setActionSecondButton(self, action: #selector(didTapBlockButton))
+            myPostBottomSheetView.setActionSecondButton(self, action: #selector(didTapUserBlockButton))
             
         case .postUserReport:
             myPostBottomSheetView.setUpUserPost()
             myPostBottomSheetView.setActionFirstButton(self, action: #selector(didTapUserReportButton))
             myPostBottomSheetView.setActionSecondButton(self, action: #selector(didTapPostReportButton))
-            myPostBottomSheetView.setActionThirdButton(self, action: #selector(didTapBlockButton))
+            myPostBottomSheetView.setActionThirdButton(self, action: #selector(didTapPostBlockButton))
+            myPostBottomSheetView.setActionFourthButton(self, action: #selector(didTapUserBlockButton))
         }
     
     }
@@ -119,8 +117,12 @@ final public class ReportViewController: UIViewController {
         coordinator.showDetailReport(.postReport, userToken: userToken, boardToken: boardToken)
     }
     
-    @objc func didTapBlockButton(_ sender: Any?) {
-        viewModel.input.didTapBlockButton()
+    @objc func didTapUserBlockButton(_ sender: Any?) {
+        viewModel.input.didTapBlockButton(.userReport)
+    }
+    
+    @objc func didTapPostBlockButton(_ sender: Any?) {
+        viewModel.input.didTapBlockButton(.postReport)
     }
     
 }
diff --git a/Fitfty/Projects/Profile/Sources/Report/ViewModel/ReportViewModel.swift b/Fitfty/Projects/Profile/Sources/Report/ViewModel/ReportViewModel.swift
@@ -14,7 +14,7 @@ import Core
 protocol ReportViewModelInput {
     
     var input: ReportViewModelInput { get }
-    func didTapBlockButton()
+    func didTapBlockButton(_ reportType: ReportType)
 }
 
 public final class ReportViewModel {
@@ -24,20 +24,17 @@ public final class ReportViewModel {
     private var userManager: UserManager
     private var userToken: String?
     private var boardToken: String?
-    private var reportType: ReportType
     private var fitftyRepository: FitftyRepository
     
     public init(
         userManager: UserManager,
         userToken: String?,
         boardToken: String?,
-        reportType: ReportType,
         fitftyRepository: FitftyRepository
     ) {
         self.userManager = userManager
         self.userToken = userToken
         self.boardToken = boardToken
-        self.reportType = reportType
         self.fitftyRepository = fitftyRepository
     }
     
@@ -47,11 +44,11 @@ extension ReportViewModel: ReportViewModelInput {
     
     var input: ReportViewModelInput { self }
     
-    func didTapBlockButton() {
+    func didTapBlockButton(_ reportType: ReportType) {
         if userManager.getCurrentGuestState() {
             currentState.send(.errorMessage("로그인이 필요합니다."))
         } else {
-            report()
+            report(reportType)
         }
     }
     
@@ -61,7 +58,7 @@ extension ReportViewModel: ViewModelType {
     
     public enum ViewModelState {
         case errorMessage(String)
-        case completed(Bool)
+        case completed(ReportType)
     }
     
     public var state: AnyPublisher<ViewModelState, Never> { currentState.compactMap { $0 }.eraseToAnyPublisher() }
@@ -70,11 +67,8 @@ extension ReportViewModel: ViewModelType {
 
 private extension ReportViewModel {
     
-    func report() {
-        Task { [weak self] in
-            guard let self = self else {
-                return
-            }
+    func report(_ reportType: ReportType) {
+        Task {
             do {
                 switch reportType {
                 case .postReport:
@@ -85,11 +79,11 @@ private extension ReportViewModel {
                         reportedBoardToken: boardToken,
                         type: ["INSULT"]
                     )
-                    let response = try await self.fitftyRepository.report(request)
+                    let response = try await fitftyRepository.report(request)
                     guard response.result == "SUCCESS" else {
                         return
                     }
-                    self.currentState.send(.completed(true))
+                    currentState.send(.completed(.postReport))
                     
                 case .userReport:
                     guard let userToken = userToken else {
@@ -99,16 +93,16 @@ private extension ReportViewModel {
                         reportedUserToken: userToken,
                         type: ["INSULT"]
                     )
-                    let response = try await self.fitftyRepository.report(request)
+                    let response = try await fitftyRepository.report(request)
                     guard response.result == "SUCCESS" else {
                         return
                     }
-                    self.currentState.send(.completed(true))
+                    currentState.send(.completed(.userReport))
                 }
                 
             } catch {
                 Logger.debug(error: error, message: "신고하기 실패")
-                self.currentState.send(.errorMessage("신고에 알 수 없는 에러가 발생했습니다."))
+                currentState.send(.errorMessage("신고에 알 수 없는 에러가 발생했습니다."))
             }
         }
     }

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(290),`
	`106`	`+ style: .custom(383),`
`107`	`107`	`contentViewController: coordinator.navigationController`
`108`	`108`	`)`
`109`	`109`	`coordinator.bottomSheetDelegate = bottomSheetViewController`