✨ [feat] 계정 가리기, 게시글 가리기 구현

Author: dudtjs1021ej

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(290),
             contentViewController: coordinator.navigationController
         )
         coordinator.bottomSheetDelegate = bottomSheetViewController

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
         )
         bottomSheetDelegate = bottomSheetViewController

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,13 @@ 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,
+                reportType: reportPresentType == .userReport ? .userReport : .postReport,
+                fitftyRepository: DefaultFitftyRepository()
+            ),
             reportPresentType: reportPresentType,
             userToken: userToken,
             boardToken: boardToken
@@ -91,6 +99,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 {

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()
 
 }

Fitfty/Projects/Profile/Sources/Post/Views/MyPostBottomSheetView.swift

@@ -27,43 +27,76 @@ 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 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
     }()
 
     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)
+        addArrangedSubviews(firstButton, seperatorView1, secondButton, seperatorView2, thirdButton)
+        NSLayoutConstraint.activate([
+            seperatorView1.heightAnchor.constraint(equalToConstant: 1),
+            seperatorView2.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,5 +107,8 @@ extension MyPostBottomSheetView {
         secondButton.addTarget(target, action: action, for: .touchUpInside)
     }
 
+    func setActionThirdButton( _ target: Any?, action: Selector) {
+        thirdButton.addTarget(target, action: action, for: .touchUpInside)
+    }
+    
 }
-

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,25 +67,46 @@ 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 isCompleted):
+                    guard isCompleted else {
+                        return
+                    }
+                    let message = self?.reportPresentType == .userReport ? "계정" : "게시글"
+                    let alert = UIAlertController(title: "", message: "\(message) 가리기를 완료했어요.", preferredStyle: .alert)
+                    alert.addAction(UIAlertAction(title: "메인 화면으로 돌아가기", style: .default, handler: { _ in
+                        self?.coordinator.popToRoot()
+                    }))
+                    self?.present(alert, animated: true)
+                    
+                }
+            }).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(didTapBlockButton))
+            
         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(didTapBlockButton))
         }
 
     }
@@ -91,4 +119,8 @@ final public class ReportViewController: UIViewController {
         coordinator.showDetailReport(.postReport, userToken: userToken, boardToken: boardToken)
     }
 
+    @objc func didTapBlockButton(_ sender: Any?) {
+        viewModel.input.didTapBlockButton()
+    }
+    
 }

Fitfty/Projects/Profile/Sources/Report/ViewModel/ReportViewModel.swift

@@ -0,0 +1,116 @@
+//
+//  ReportViewModel.swift
+//  Profile
+//
+//  Created by 임영선 on 2023/02/23.
+//  Copyright © 2023 Fitfty. All rights reserved.
+//
+
+import Foundation
+import Common
+import Combine
+import Core
+
+protocol ReportViewModelInput {
+    
+    var input: ReportViewModelInput { get }
+    func didTapBlockButton()
+}
+
+public final class ReportViewModel {
+    
+    private var currentState: CurrentValueSubject<ViewModelState?, Never> = .init(nil)
+    private var cancellables: Set<AnyCancellable> = .init()
+    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
+    }
+    
+}
+
+extension ReportViewModel: ReportViewModelInput {
+    
+    var input: ReportViewModelInput { self }
+    
+    func didTapBlockButton() {
+        if userManager.getCurrentGuestState() {
+            currentState.send(.errorMessage("로그인이 필요합니다."))
+        } else {
+            report()
+        }
+    }
+    
+}
+
+extension ReportViewModel: ViewModelType {
+    
+    public enum ViewModelState {
+        case errorMessage(String)
+        case completed(Bool)
+    }
+    
+    public var state: AnyPublisher<ViewModelState, Never> { currentState.compactMap { $0 }.eraseToAnyPublisher() }
+    
+}
+
+private extension ReportViewModel {
+    
+    func report() {
+        Task { [weak self] in
+            guard let self = self else {
+                return
+            }
+            do {
+                switch reportType {
+                case .postReport:
+                    guard let boardToken = boardToken else {
+                        return
+                    }
+                    let request = PostReportRequest(
+                        reportedBoardToken: boardToken,
+                        type: ["INSULT"]
+                    )
+                    let response = try await self.fitftyRepository.report(request)
+                    guard response.result == "SUCCESS" else {
+                        return
+                    }
+                    self.currentState.send(.completed(true))
+                    
+                case .userReport:
+                    guard let userToken = userToken else {
+                        return
+                    }
+                    let request = UserReportRequest(
+                        reportedUserToken: userToken,
+                        type: ["INSULT"]
+                    )
+                    let response = try await self.fitftyRepository.report(request)
+                    guard response.result == "SUCCESS" else {
+                        return
+                    }
+                    self.currentState.send(.completed(true))
+                }
+                
+            } catch {
+                Logger.debug(error: error, message: "신고하기 실패")
+                self.currentState.send(.errorMessage("신고에 알 수 없는 에러가 발생했습니다."))
+            }
+        }
+    }
+    
+}