[feat] 계정 신고 리스트 조회 API, 게시글 신고 리스트 조회 API 구현

dudtjs1021ej · dudtjs1021ej · commit a7a9e518fd84 · 2023-02-16T22:30:59.000+09:00
diff --git a/Fitfty/Projects/Coordinator/Sources/Setting/ReportListCoordinator.swift b/Fitfty/Projects/Coordinator/Sources/Setting/ReportListCoordinator.swift
@@ -10,6 +10,7 @@ import Foundation
 import UIKit
 import Common
 import Setting
+import Core
 
 final class ReportListCoordinator: Coordinator {
     
@@ -33,7 +34,10 @@ final class ReportListCoordinator: Coordinator {
 private extension ReportListCoordinator {
     
     func makeReportListViewController() -> UIViewController {
-        let viewController = ReportListViewController(coordinator: self)
+        let viewController = ReportListViewController(
+            coordinator: self,
+            viewModel: ReportListViewModel(reportType: .userReport, fitftyRepository: DefaultFitftyRepository())
+        )
         return viewController
     }
     
diff --git a/Fitfty/Projects/Core/Sources/Network/Response/Setting/PostReportListResponse.swift b/Fitfty/Projects/Core/Sources/Network/Response/Setting/PostReportListResponse.swift
@@ -8,16 +8,16 @@
 
 import Foundation
 
-struct PostReportListResponse: Codable {
-    let result: String
-    let data: [PostReportListData]?
-    let message, errorCode: String?
+public struct PostReportListResponse: Codable {
+    public let result: String
+    public let data: [PostReportListData]?
+    public let message, errorCode: String?
 }
 
-struct PostReportListData: Codable {
-    let reportToken, reportUserToken, reportUserEmail, reportedBoardToken: String
-    let reportedBoardFilePath: String
-    let reportedCount: Int
-    let type: [String]
-    let isConfirmed: Bool
+public struct PostReportListData: Codable {
+    public let reportToken, reportUserToken, reportUserEmail, reportedBoardToken: String
+    public let reportedBoardFilePath: String
+    public let reportedCount: Int
+    public let type: [String]
+    public let isConfirmed: Bool
 }
diff --git a/Fitfty/Projects/Core/Sources/Network/Response/Setting/UserReportListResponse.swift b/Fitfty/Projects/Core/Sources/Network/Response/Setting/UserReportListResponse.swift
@@ -8,16 +8,16 @@
 
 import Foundation
 
-struct UserReportListResponse: Codable {
-    let result: String
-    let data: [UserReportListData]?
-    let message, errorCode: String?
+public struct UserReportListResponse: Codable {
+    public let result: String
+    public let data: [UserReportListData]?
+    public let message, errorCode: String?
 }
 
-struct UserReportListData: Codable {
-    let reportToken, reportUserToken, reportUserEmail, reportedUserToken: String
-    let reportedUserEmail: String
-    let reportedCount: Int
-    let type: [String]
-    let isConfirmed: Bool
+public struct UserReportListData: Codable {
+    public let reportToken, reportUserToken, reportUserEmail, reportedUserToken: String
+    public let reportedUserEmail: String
+    public let reportedCount: Int
+    public let type: [String]
+    public let isConfirmed: Bool
 }
diff --git a/Fitfty/Projects/Core/Sources/Repositories/FitftyRepository.swift b/Fitfty/Projects/Core/Sources/Repositories/FitftyRepository.swift
@@ -23,6 +23,10 @@ public protocol FitftyRepository {
     
     func report(_ request: UserReportRequest) async throws -> FitftyResponse
     
+    func getUserReportList() async throws -> UserReportListResponse
+    
+    func getPostReportList() async throws -> PostReportListResponse
+    
 }
 
 public final class DefaultFitftyRepository: FitftyRepository {
@@ -64,4 +68,12 @@ public final class DefaultFitftyRepository: FitftyRepository {
         return try await FitftyAPI.request(target: .reportUser(parameters: request), dataType: FitftyResponse.self)
     }
     
+    public func getUserReportList() async throws -> UserReportListResponse {
+        return try await FitftyAPI.request(target: .getUserReportList, dataType: UserReportListResponse.self)
+    }
+    
+    public func getPostReportList() async throws -> PostReportListResponse {
+        return try await FitftyAPI.request(target: .getPostReportList, dataType: PostReportListResponse.self)
+    }
+    
 }
diff --git a/Fitfty/Projects/Setting/Sources/Admin/VewController/ReportListViewController.swift b/Fitfty/Projects/Setting/Sources/Admin/VewController/ReportListViewController.swift
@@ -8,11 +8,14 @@
 
 import UIKit
 import Common
+import Combine
 
 final public class ReportListViewController: UIViewController {
     
     private let menuView = ReportMenuView()
     private var coordinator: ReportListCoordinatorInterface
+    let viewModel: ReportListViewModel
+    private var cancellables: Set<AnyCancellable> = .init()
     
     private lazy var tableView: UITableView = {
         let tableView = UITableView()
@@ -24,8 +27,12 @@ final public class ReportListViewController: UIViewController {
     
     private var dataSource: UITableViewDiffableDataSource<ReportListSectionKind, ReportListCellModel>?
     
-    public init(coordinator: ReportListCoordinatorInterface) {
+    public init(
+        coordinator: ReportListCoordinatorInterface,
+        viewModel: ReportListViewModel
+    ) {
         self.coordinator = coordinator
+        self.viewModel = viewModel
         super.init(nibName: nil, bundle: nil)
     }
     
@@ -36,15 +43,14 @@ final public class ReportListViewController: UIViewController {
     public override func viewDidLoad() {
         super.viewDidLoad()
         setUp()
+        viewModel.input.viewDidLoad()
     }
-  
+    
     private func setUp() {
+        bind()
         setConstraintsLayout()
         setNavigationBar()
         setDataSource()
-        applySnapshot([
-            ReportListSection(sectionKind: .report, items: [ReportListCellModel.report("a", true), ReportListCellModel.report("aa", true)])
-        ])
     }
     
     @objc func didTapBackButton(_ sender: Any?) {
@@ -55,6 +61,19 @@ final public class ReportListViewController: UIViewController {
 
 private extension ReportListViewController {
     
+    func bind() {
+        viewModel.state.compactMap { $0 }
+            .sinkOnMainThread(receiveValue: { [weak self] state in
+                switch state {
+                case .errorMessage(let message):
+                    self?.showAlert(message: message)
+                    
+                case .sections(let sections):
+                    self?.applySnapshot(sections)
+                }
+            }).store(in: &cancellables)
+    }
+    
     func setConstraintsLayout() {
         view.addSubviews(menuView, tableView)
         NSLayoutConstraint.activate([
@@ -72,12 +91,12 @@ private extension ReportListViewController {
     func setNavigationBar() {
         navigationController?.navigationBar.prefersLargeTitles = false
         navigationController?.navigationBar.isHidden = false
-       
+        
         let cancelButton = UIBarButtonItem(
-                image: CommonAsset.Images.btnArrowleft.image,
-                style: .plain,
-                target: self,
-                action: #selector(didTapBackButton(_:))
+            image: CommonAsset.Images.btnArrowleft.image,
+            style: .plain,
+            target: self,
+            action: #selector(didTapBackButton(_:))
         )
         navigationItem.leftBarButtonItem = cancelButton
     }
@@ -86,9 +105,10 @@ private extension ReportListViewController {
         dataSource = UITableViewDiffableDataSource<ReportListSectionKind, ReportListCellModel>(
             tableView: tableView, cellProvider: { tableView, indexPath, item in
                 switch item {
-                case .report(let title, let isSelected):
+                case .report(let account, let detailReport, let count):
                     let cell = tableView.dequeueReusableCell(withIdentifier: ReportListCell.className, for: indexPath) as? ReportListCell
                     cell?.selectionStyle = .none
+                    cell?.setUp(account: account, detailReport: detailReport, count: count)
                     return cell
                 }
             })
@@ -102,7 +122,7 @@ private extension ReportListViewController {
         }
         dataSource?.apply(snapshot, animatingDifferences: false)
     }
-
+    
 }
 
 extension ReportListViewController: UITableViewDelegate {
diff --git a/Fitfty/Projects/Setting/Sources/Admin/ViewModel/ReportListViewModel.swift b/Fitfty/Projects/Setting/Sources/Admin/ViewModel/ReportListViewModel.swift
@@ -0,0 +1,95 @@
+//
+//  ReportListViewModel.swift
+//  Setting
+//
+//  Created by 임영선 on 2023/02/16.
+//  Copyright © 2023 Fitfty. All rights reserved.
+//
+
+import Foundation
+import UIKit
+import Common
+import Combine
+import Core
+
+protocol ReportListViewModelInput {
+    
+    var input: ReportListViewModelInput { get }
+    func viewDidLoad()
+  
+}
+
+public final class ReportListViewModel {
+    private var currentState: CurrentValueSubject<ViewModelState?, Never> = .init(nil)
+    private var cancellables: Set<AnyCancellable> = .init()
+    private var reportType: ReportType
+    private var fitftyRepository: FitftyRepository
+    
+    public init(reportType: ReportType, fitftyRepository: FitftyRepository) {
+        self.reportType = reportType
+        self.fitftyRepository = fitftyRepository
+    }
+    
+}
+
+extension ReportListViewModel: ReportListViewModelInput {
+    var input: ReportListViewModelInput { self }
+    
+    func viewDidLoad() {
+        getReportList()
+    }
+    
+}
+
+extension ReportListViewModel: ViewModelType {
+    
+    public enum ViewModelState {
+        case errorMessage(String)
+        case sections([ReportListSection])
+    }
+    
+    public var state: AnyPublisher<ViewModelState, Never> { currentState.compactMap { $0 }.eraseToAnyPublisher() }
+    
+}
+
+extension ReportListViewModel {
+    
+    func getReportList() {
+        Task { [weak self] in
+            guard let self = self else {
+                return
+            }
+            do {
+                switch reportType {
+                case .postReport:
+                    let response = try await self.fitftyRepository.getPostReportList()
+                    print(response)
+                    guard response.result == "SUCCESS",
+                          let data = response.data else {
+                        return
+                    }
+                    var cellModels = [ReportListCellModel]()
+                    for i in 0..<data.count {
+                        cellModels.append(ReportListCellModel.report(data[i].reportUserEmail, data[i].type[0], String(data[i].reportedCount)))
+                    }
+                    self.currentState.send(.sections([ReportListSection(sectionKind: .report, items: cellModels)]))
+                case .userReport:
+                    let response = try await self.fitftyRepository.getUserReportList()
+                    print(response)
+                    guard response.result == "SUCCESS",
+                          let data = response.data else {
+                        return
+                    }
+                    var cellModels = [ReportListCellModel]()
+                    for i in 0..<data.count {
+                        cellModels.append(ReportListCellModel.report(data[i].reportedUserEmail, data[i].type[0], String(data[i].reportedCount)))
+                    }
+                    self.currentState.send(.sections([ReportListSection(sectionKind: .report, items: cellModels)]))
+                }
+            } catch {
+                Logger.debug(error: error, message: "신고 리스트 조회 실패")
+                self.currentState.send(.errorMessage("신고 리스트 조회에 알 수 없는 에러가 발생했습니다."))
+            }
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,10 @@ public protocol FitftyRepository {`
`23`	`23`
`24`	`24`	`func report(_ request: UserReportRequest) async throws -> FitftyResponse`
`25`	`25`
	`26`	`+ func getUserReportList() async throws -> UserReportListResponse`
	`27`	`+`
	`28`	`+ func getPostReportList() async throws -> PostReportListResponse`
	`29`	`+`
`26`	`30`	`}`
`27`	`31`
`28`	`32`	`public final class DefaultFitftyRepository: FitftyRepository {`
`@@ -64,4 +68,12 @@ public final class DefaultFitftyRepository: FitftyRepository {`
`64`	`68`	`return try await FitftyAPI.request(target: .reportUser(parameters: request), dataType: FitftyResponse.self)`
`65`	`69`	`}`
`66`	`70`
	`71`	`+ public func getUserReportList() async throws -> UserReportListResponse {`
	`72`	`+ return try await FitftyAPI.request(target: .getUserReportList, dataType: UserReportListResponse.self)`
	`73`	`+ }`
	`74`	`+`
	`75`	`+ public func getPostReportList() async throws -> PostReportListResponse {`
	`76`	`+ return try await FitftyAPI.request(target: .getPostReportList, dataType: PostReportListResponse.self)`
	`77`	`+ }`
	`78`	`+`
`67`	`79`	`}`