✨ [feat] 게시글에 계정신고 로직 추가 구현

dudtjs1021ej · dudtjs1021ej · commit f142133e9522 · 2023-02-16T17:47:53.000+09:00
diff --git a/Fitfty/Projects/Common/Sources/ReportPresentType.swift b/Fitfty/Projects/Common/Sources/ReportPresentType.swift
@@ -8,7 +8,12 @@
 
 import Foundation
 
-public enum ReportType {
+public enum ReportPresentType {
     case userReport
     case postUserReport
 }
+
+public enum ReportType {
+    case userReport
+    case postReport
+}
diff --git a/Fitfty/Projects/Coordinator/Sources/Profile/DetailReportCoordinator.swift b/Fitfty/Projects/Coordinator/Sources/Profile/DetailReportCoordinator.swift
@@ -15,7 +15,8 @@ import Core
 final class DetailReportCoordinator: Coordinator {
     
     var type: CoordinatorType { .detailReport }
-    var reportedToken: String
+    var userToken: String?
+    var boardToken: String?
     var reportType: ReportType
     
     weak var finishDelegate: CoordinatorFinishDelegate?
@@ -27,11 +28,13 @@ final class DetailReportCoordinator: Coordinator {
     
     init(
         navigationController: BaseNavigationController = BaseNavigationController(),
-        reportedToken: String,
-        reportType: ReportType
+        reportType: ReportType,
+        boardToken: String?,
+        userToken: String?
     ) {
         self.navigationController = navigationController
-        self.reportedToken = reportedToken
+        self.userToken = userToken
+        self.boardToken = boardToken
         self.reportType = reportType
     }
     
@@ -49,7 +52,8 @@ private extension DetailReportCoordinator {
             coordinator: self,
             viewModel: DetailReportViewModel(
                 userManager: DefaultUserManager.shared,
-                reportedToken: reportedToken,
+                userToken: userToken,
+                boardToken: boardToken,
                 reportType: reportType,
                 fitftyRepository: DefaultFitftyRepository()
             )
diff --git a/Fitfty/Projects/Coordinator/Sources/Profile/PostCoordinator.swift b/Fitfty/Projects/Coordinator/Sources/Profile/PostCoordinator.swift
@@ -91,10 +91,11 @@ private extension PostCoordinator {
         return coordinator
     }
     
-    func makeReportViewController(reportedToken: String) -> UIViewController {
+    func makeReportViewController(userToken: String, boardToken: String) -> UIViewController {
         let coordinator = ReportCoordinator(
-            reportType: .postUserReport,
-            reportedToken: reportedToken
+            reportPresentType: .postUserReport,
+            boardToken: boardToken,
+            userToken: userToken
         )
         coordinator.parentCoordinator = self
         childCoordinators.append(coordinator)
@@ -132,8 +133,8 @@ extension PostCoordinator: PostCoordinatorInterface {
         navigationController.present(coordinator.navigationController, animated: true)
     }
     
-    func showReport(reportedToken: String) {
-        let viewController = makeReportViewController(reportedToken: reportedToken)
+    func showReport(userToken: String, boardToken: String) {
+        let viewController = makeReportViewController(userToken: userToken, boardToken: boardToken)
         viewController.modalPresentationStyle = .overFullScreen
         navigationController.present(viewController, animated: false)
     }
diff --git a/Fitfty/Projects/Coordinator/Sources/Profile/ProfileCoordinator.swift b/Fitfty/Projects/Coordinator/Sources/Profile/ProfileCoordinator.swift
@@ -89,10 +89,7 @@ private extension ProfileCoordinator {
     }
     
     func makeReportViewController(reportedToken: String) -> UIViewController {
-        let coordinator = ReportCoordinator(
-            reportType: .userReport,
-            reportedToken: reportedToken
-        )
+        let coordinator = ReportCoordinator(reportPresentType: .userReport, boardToken: nil, userToken: reportedToken)
         coordinator.parentCoordinator = self
         childCoordinators.append(coordinator)
         coordinator.start()
diff --git a/Fitfty/Projects/Coordinator/Sources/Profile/ReportCoordinator.swift b/Fitfty/Projects/Coordinator/Sources/Profile/ReportCoordinator.swift
@@ -14,8 +14,9 @@ import Common
 final class ReportCoordinator: Coordinator {
     
     var type: CoordinatorType { .report }
-    var reportType: ReportType
-    var reportedToken: String
+    var reportPresentType: ReportPresentType
+    var userToken: String?
+    var boardToken: String?
     
     weak var finishDelegate: CoordinatorFinishDelegate?
     weak var bottomSheetDelegate: BottomSheetViewControllerDelegate?
@@ -26,33 +27,41 @@ final class ReportCoordinator: Coordinator {
     
     init(
         navigationController: BaseNavigationController = BaseNavigationController(),
-        reportType: ReportType,
-        reportedToken: String
+        reportPresentType: ReportPresentType,
+        boardToken: String?,
+        userToken: String?
     ) {
         self.navigationController = navigationController
-        self.reportType = reportType
-        self.reportedToken = reportedToken
+        self.reportPresentType = reportPresentType
+        self.userToken = userToken
+        self.boardToken = boardToken
     }
     
     func start() {
-        let viewController = makeReportViewController(reportType: reportType)
+        let viewController = makeReportViewController(
+            reportPresentType: reportPresentType,
+            userToken: userToken,
+            boardToken: boardToken
+        )
         navigationController.pushViewController(viewController, animated: true)
         navigationController.setNavigationBarHidden(true, animated: false)
     }
 }
 
 private extension ReportCoordinator {
     
-    func makeReportViewController(reportType: ReportType) -> UIViewController {
+    func makeReportViewController(reportPresentType: ReportPresentType, userToken: String?, boardToken: String?) -> UIViewController {
         let viewController = ReportViewController(
             coordinator: self,
-            reportType: reportType
+            reportPresentType: reportPresentType,
+            userToken: userToken,
+            boardToken: boardToken
         )
         return viewController
     }
     
-    func makeDetailReportViewController() -> UIViewController {
-        let coordinator = DetailReportCoordinator(reportedToken: reportedToken, reportType: reportType)
+    func makeDetailReportViewController(reportType: ReportType, userToken: String?, boardToken: String?) -> UIViewController {
+        let coordinator = DetailReportCoordinator(reportType: reportType, boardToken: boardToken, userToken: userToken)
         coordinator.parentCoordinator = self
         childCoordinators.append(coordinator)
         coordinator.start()
@@ -70,8 +79,8 @@ private extension ReportCoordinator {
 
 extension ReportCoordinator: ReportCoordinatorInterface {
     
-    func showDetailReport() {
-        let viewController = makeDetailReportViewController()
+    func showDetailReport(_ reportType: ReportType, userToken: String?, boardToken: String?) {
+        let viewController = makeDetailReportViewController(reportType: reportType, userToken: userToken, boardToken: boardToken)
         viewController.modalPresentationStyle = .overFullScreen
         navigationController.present(viewController, animated: false)
     }
diff --git a/Fitfty/Projects/Profile/Sources/CoordinatorInterfaces/PostCoordinatorInterface.swift b/Fitfty/Projects/Profile/Sources/CoordinatorInterfaces/PostCoordinatorInterface.swift
@@ -14,7 +14,7 @@ public protocol PostCoordinatorInterface: AnyObject {
     func showProfile(profileType: ProfileType, nickname: String)
     func showBottomSheet(boardToken: String, filepath: String)
     func showModifyMyFitfty(boardToken: String)
-    func showReport(reportedToken: String)
+    func showReport(userToken: String, boardToken: String)
     func dismiss()
     func popToRoot()
     func finished()
diff --git a/Fitfty/Projects/Profile/Sources/CoordinatorInterfaces/ReportCoordinatorInterface.swift b/Fitfty/Projects/Profile/Sources/CoordinatorInterfaces/ReportCoordinatorInterface.swift
@@ -7,10 +7,11 @@
 //
 
 import Foundation
+import Common
 
 public protocol ReportCoordinatorInterface: AnyObject {
     
-    func showDetailReport()
+    func showDetailReport(_ reportType: ReportType, userToken: String?, boardToken: String?)
     func dismiss()
     
 }
diff --git a/Fitfty/Projects/Profile/Sources/Post/ViewControllers/PostViewController.swift b/Fitfty/Projects/Profile/Sources/Post/ViewControllers/PostViewController.swift
@@ -18,6 +18,7 @@ final public class PostViewController: UIViewController {
     private var cancellables: Set<AnyCancellable> = .init()
     private var viewModel: PostViewModel
     private var boardToken: String
+    private var userToken: String?
     private var filepath: String?
     
     private let postView = PostView()
@@ -137,6 +138,7 @@ final public class PostViewController: UIViewController {
         )
         self.nickname = data.nickname
         self.filepath = data.filePath
+        self.userToken = data.userToken
     }
     
     private func setNavigationBar() {
@@ -205,7 +207,10 @@ final public class PostViewController: UIViewController {
         case .myProfile:
             coordinator.showBottomSheet(boardToken: boardToken, filepath: filepath)
         case .userProfile:
-            coordinator.showReport(reportedToken: boardToken)
+            guard let userToken = userToken else {
+                return
+            }
+            coordinator.showReport(userToken: userToken, boardToken: boardToken)
         }
         
     }
diff --git a/Fitfty/Projects/Profile/Sources/Report/ViewControllers/ReportViewController.swift b/Fitfty/Projects/Profile/Sources/Report/ViewControllers/ReportViewController.swift
@@ -12,15 +12,17 @@ import Common
 final public class ReportViewController: UIViewController {
     
     let coordinator: ReportCoordinatorInterface
-    let reportType: ReportType
+    let reportPresentType: ReportPresentType
+    var userToken: String?
+    var boardToken: String?
     
     private lazy var userReportButton: UIButton = {
         let button = UIButton()
         button.setTitleColor(CommonAsset.Colors.error.color, for: .normal)
         button.setTitle("계정 신고", for: .normal)
         button.titleLabel?.font = FitftyFont.appleSDSemiBold(size: 18).font
         button.contentHorizontalAlignment = .left
-        button.addTarget(self, action: #selector(didTapReportButton), for: .touchUpInside)
+        button.addTarget(self, action: #selector(didTapUserReportButton), for: .touchUpInside)
         return button
     }()
     
@@ -36,9 +38,16 @@ final public class ReportViewController: UIViewController {
         setUp()
     }
     
-    public init(coordinator: ReportCoordinatorInterface, reportType: ReportType) {
+    public init(
+        coordinator: ReportCoordinatorInterface,
+        reportPresentType: ReportPresentType,
+        userToken: String?,
+        boardToken: String?
+    ) {
         self.coordinator = coordinator
-        self.reportType = reportType
+        self.reportPresentType = reportPresentType
+        self.userToken = userToken
+        self.boardToken = boardToken
         super.init(nibName: nil, bundle: nil)
     }
     
@@ -48,11 +57,11 @@ final public class ReportViewController: UIViewController {
     
     private func setUp() {
         setConstraintsLayout()
-        myPostBottomSheetView.setUpUserPost()
+        
     }
     
     private func setConstraintsLayout() {
-        switch reportType {
+        switch reportPresentType {
         case .userReport:
             view.addSubviews(userReportButton)
             NSLayoutConstraint.activate([
@@ -67,11 +76,19 @@ final public class ReportViewController: UIViewController {
                 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))
         }
     
     }
     
-    @objc func didTapReportButton(_ sender: Any?) {
-        coordinator.showDetailReport()
+    @objc func didTapUserReportButton(_ sender: Any?) {
+        coordinator.showDetailReport(.userReport, userToken: userToken, boardToken: boardToken)
     }
+    
+    @objc func didTapPostReportButton(_ sender: Any?) {
+        coordinator.showDetailReport(.postReport, userToken: userToken, boardToken: boardToken)
+    }
+    
 }
diff --git a/Fitfty/Projects/Profile/Sources/Report/ViewModel/DetailReportViewModel.swift b/Fitfty/Projects/Profile/Sources/Report/ViewModel/DetailReportViewModel.swift
@@ -24,7 +24,8 @@ public final class DetailReportViewModel {
     private var currentState: CurrentValueSubject<ViewModelState?, Never> = .init(nil)
     private var cancellables: Set<AnyCancellable> = .init()
     private var userManager: UserManager
-    private var reportedToken: String
+    private var userToken: String?
+    private var boardToken: String?
     private var reportType: ReportType
     private var fitftyRepository: FitftyRepository
     private var reports: [(detailReportType: DetailReportType, isSelected: Bool)] = [
@@ -38,12 +39,14 @@ public final class DetailReportViewModel {
     
     public init(
         userManager: UserManager,
-        reportedToken: String,
+        userToken: String?,
+        boardToken: String?,
         reportType: ReportType,
         fitftyRepository: FitftyRepository
     ) {
         self.userManager = userManager
-        self.reportedToken = reportedToken
+        self.userToken = userToken
+        self.boardToken = boardToken
         self.reportType = reportType
         self.fitftyRepository = fitftyRepository
     }
@@ -122,9 +125,12 @@ private extension DetailReportViewModel {
             }
             do {
                 switch reportType {
-                case .postUserReport:
+                case .postReport:
+                    guard let boardToken = boardToken else {
+                        return
+                    }
                     let request = PostReportRequest(
-                        reportedBoardToken: self.reportedToken,
+                        reportedBoardToken: boardToken,
                         type: getSelectedReport()
                     )
                     let response = try await self.fitftyRepository.report(request)
@@ -134,8 +140,11 @@ private extension DetailReportViewModel {
                     self.currentState.send(.completed(true))
                     
                 case .userReport:
+                    guard let userToken = userToken else {
+                        return
+                    }
                     let request = UserReportRequest(
-                        reportedUserToken: self.reportedToken,
+                        reportedUserToken: userToken,
                         type: getSelectedReport()
                     )
                     let response = try await self.fitftyRepository.report(request)

Original file line number	Diff line number	Diff line change
`@@ -91,10 +91,11 @@ private extension PostCoordinator {`
`91`	`91`	`return coordinator`
`92`	`92`	`}`
`93`	`93`
`94`		`- func makeReportViewController(reportedToken: String) -> UIViewController {`
	`94`	`+ func makeReportViewController(userToken: String, boardToken: String) -> UIViewController {`
`95`	`95`	`let coordinator = ReportCoordinator(`
`96`		`- reportType: .postUserReport,`
`97`		`- reportedToken: reportedToken`
	`96`	`+ reportPresentType: .postUserReport,`
	`97`	`+ boardToken: boardToken,`
	`98`	`+ userToken: userToken`
`98`	`99`	`)`
`99`	`100`	`coordinator.parentCoordinator = self`
`100`	`101`	`childCoordinators.append(coordinator)`
`@@ -132,8 +133,8 @@ extension PostCoordinator: PostCoordinatorInterface {`
`132`	`133`	`navigationController.present(coordinator.navigationController, animated: true)`
`133`	`134`	`}`
`134`	`135`
`135`		`- func showReport(reportedToken: String) {`
`136`		`- let viewController = makeReportViewController(reportedToken: reportedToken)`
	`136`	`+ func showReport(userToken: String, boardToken: String) {`
	`137`	`+ let viewController = makeReportViewController(userToken: userToken, boardToken: boardToken)`
`137`	`138`	`viewController.modalPresentationStyle = .overFullScreen`
`138`	`139`	`navigationController.present(viewController, animated: false)`
`139`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,11 @@`
`7`	`7`	`//`
`8`	`8`
`9`	`9`	`import Foundation`
	`10`	`+import Common`
`10`	`11`
`11`	`12`	`public protocol ReportCoordinatorInterface: AnyObject {`
`12`	`13`
`13`		`- func showDetailReport()`
	`14`	`+ func showDetailReport(_ reportType: ReportType, userToken: String?, boardToken: String?)`
`14`	`15`	`func dismiss()`
`15`	`16`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ final public class PostViewController: UIViewController {`
`18`	`18`	`private var cancellables: Set<AnyCancellable> = .init()`
`19`	`19`	`private var viewModel: PostViewModel`
`20`	`20`	`private var boardToken: String`
	`21`	`+ private var userToken: String?`
`21`	`22`	`private var filepath: String?`
`22`	`23`
`23`	`24`	`private let postView = PostView()`
`@@ -137,6 +138,7 @@ final public class PostViewController: UIViewController {`
`137`	`138`	`)`
`138`	`139`	`self.nickname = data.nickname`
`139`	`140`	`self.filepath = data.filePath`
	`141`	`+ self.userToken = data.userToken`
`140`	`142`	`}`
`141`	`143`
`142`	`144`	`private func setNavigationBar() {`
`@@ -205,7 +207,10 @@ final public class PostViewController: UIViewController {`
`205`	`207`	`case .myProfile:`
`206`	`208`	`coordinator.showBottomSheet(boardToken: boardToken, filepath: filepath)`
`207`	`209`	`case .userProfile:`
`208`		`- coordinator.showReport(reportedToken: boardToken)`
	`210`	`+ guard let userToken = userToken else {`
	`211`	`+ return`
	`212`	`+ }`
	`213`	`+ coordinator.showReport(userToken: userToken, boardToken: boardToken)`
`209`	`214`	`}`
`210`	`215`
`211`	`216`	`}`