✨ [feat] 게시글 신고 리스트엔 사진이 보이게 구현

dudtjs1021ej · dudtjs1021ej · commit 469a8a0fef68 · 2023-02-17T00:15:41.000+09:00
diff --git a/Fitfty/Projects/Coordinator/Sources/Setting/ReportListCoordinator.swift b/Fitfty/Projects/Coordinator/Sources/Setting/ReportListCoordinator.swift
@@ -15,28 +15,34 @@ import Core
 final class ReportListCoordinator: Coordinator {
     
     var type: CoordinatorType { .reportList }
+    var reportType: ReportType
     weak var finishDelegate: CoordinatorFinishDelegate?
     
     var parentCoordinator: Coordinator?
     var childCoordinators: [Coordinator] = []
     var navigationController: BaseNavigationController
     
-    init(navigationController: BaseNavigationController = BaseNavigationController()) {
+    init(
+        navigationController: BaseNavigationController = BaseNavigationController(),
+        reportType: ReportType
+    ) {
         self.navigationController = navigationController
+        self.reportType = reportType
     }
     
     func start() {
-        let viewController = makeReportListViewController()
+        let viewController = makeReportListViewController(reportType: reportType)
         navigationController.pushViewController(viewController, animated: true)
     }
 }
 
 private extension ReportListCoordinator {
     
-    func makeReportListViewController() -> UIViewController {
+    func makeReportListViewController(reportType: ReportType) -> UIViewController {
         let viewController = ReportListViewController(
             coordinator: self,
-            viewModel: ReportListViewModel(reportType: .userReport, fitftyRepository: DefaultFitftyRepository())
+            viewModel: ReportListViewModel(reportType: reportType, fitftyRepository: DefaultFitftyRepository()),
+            reportType: reportType
         )
         return viewController
     }
diff --git a/Fitfty/Projects/Coordinator/Sources/Setting/SettingCoordinator.swift b/Fitfty/Projects/Coordinator/Sources/Setting/SettingCoordinator.swift
@@ -76,8 +76,11 @@ private extension SettingCoordinator {
         return coordinator
     }
     
-    func makeReportListCoordinator() -> Coordinator {
-        let coordinator = ReportListCoordinator(navigationController: navigationController)
+    func makeReportListCoordinator(reportType: ReportType) -> Coordinator {
+        let coordinator = ReportListCoordinator(
+            navigationController: navigationController,
+            reportType: reportType
+        )
         coordinator.parentCoordinator = self
         coordinator.finishDelegate = self
         childCoordinators.append(coordinator)
@@ -115,8 +118,8 @@ extension SettingCoordinator: SettingCoordinatorInterface {
         navigationController.present(webViewController, animated: true)
     }
     
-    func showReportList() {
-        let coordinator = makeReportListCoordinator()
+    func showReportList(reportType: ReportType) {
+        let coordinator = makeReportListCoordinator(reportType: reportType)
         coordinator.start()
     }
     
diff --git a/Fitfty/Projects/Setting/Sources/Admin/VewController/ReportListViewController.swift b/Fitfty/Projects/Setting/Sources/Admin/VewController/ReportListViewController.swift
@@ -14,7 +14,8 @@ final public class ReportListViewController: UIViewController {
     
     private let menuView = ReportMenuView()
     private var coordinator: ReportListCoordinatorInterface
-    let viewModel: ReportListViewModel
+    private var viewModel: ReportListViewModel
+    private var reportType: ReportType
     private var cancellables: Set<AnyCancellable> = .init()
     
     private lazy var tableView: UITableView = {
@@ -29,10 +30,12 @@ final public class ReportListViewController: UIViewController {
     
     public init(
         coordinator: ReportListCoordinatorInterface,
-        viewModel: ReportListViewModel
+        viewModel: ReportListViewModel,
+        reportType: ReportType
     ) {
         self.coordinator = coordinator
         self.viewModel = viewModel
+        self.reportType = reportType
         super.init(nibName: nil, bundle: nil)
     }
     
@@ -51,6 +54,7 @@ final public class ReportListViewController: UIViewController {
         setConstraintsLayout()
         setNavigationBar()
         setDataSource()
+        menuView.setUp(reportType: reportType)
     }
     
     @objc func didTapBackButton(_ sender: Any?) {
@@ -105,10 +109,11 @@ private extension ReportListViewController {
         dataSource = UITableViewDiffableDataSource<ReportListSectionKind, ReportListCellModel>(
             tableView: tableView, cellProvider: { tableView, indexPath, item in
                 switch item {
-                case .report(let account, let detailReport, let count):
+                case .report(let account, let detailReport, let count, let filepath):
                     let cell = tableView.dequeueReusableCell(withIdentifier: ReportListCell.className, for: indexPath) as? ReportListCell
+                    cell?.setReportType(self.reportType)
                     cell?.selectionStyle = .none
-                    cell?.setUp(account: account, detailReport: detailReport, count: count)
+                    cell?.setUp(account: account, detailReport: detailReport, count: count, filePath: filepath)
                     return cell
                 }
             })
@@ -128,7 +133,12 @@ private extension ReportListViewController {
 extension ReportListViewController: UITableViewDelegate {
     
     public func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 44
+        switch reportType {
+        case .userReport:
+            return 44
+        case .postReport:
+            return 120
+        }
     }
     
 }
diff --git a/Fitfty/Projects/Setting/Sources/Admin/ViewModel/ReportListViewModel.swift b/Fitfty/Projects/Setting/Sources/Admin/ViewModel/ReportListViewModel.swift
@@ -20,6 +20,7 @@ protocol ReportListViewModelInput {
 }
 
 public final class ReportListViewModel {
+    
     private var currentState: CurrentValueSubject<ViewModelState?, Never> = .init(nil)
     private var cancellables: Set<AnyCancellable> = .init()
     private var reportType: ReportType
@@ -70,7 +71,7 @@ extension ReportListViewModel {
                     }
                     var cellModels = [ReportListCellModel]()
                     for i in 0..<data.count {
-                        cellModels.append(ReportListCellModel.report(data[i].reportUserEmail, data[i].type[0], String(data[i].reportedCount)))
+                        cellModels.append(ReportListCellModel.report(data[i].reportUserEmail, getKoreanDetailReport(data[i].type[0]), String(data[i].reportedCount+1), data[i].reportedBoardFilePath))
                     }
                     self.currentState.send(.sections([ReportListSection(sectionKind: .report, items: cellModels)]))
                 case .userReport:
@@ -82,7 +83,7 @@ extension ReportListViewModel {
                     }
                     var cellModels = [ReportListCellModel]()
                     for i in 0..<data.count {
-                        cellModels.append(ReportListCellModel.report(data[i].reportedUserEmail, data[i].type[0], String(data[i].reportedCount)))
+                        cellModels.append(ReportListCellModel.report(data[i].reportedUserEmail, getKoreanDetailReport(data[i].type[0]), String(data[i].reportedCount+1), nil))
                     }
                     self.currentState.send(.sections([ReportListSection(sectionKind: .report, items: cellModels)]))
                 }
@@ -92,4 +93,16 @@ extension ReportListViewModel {
             }
         }
     }
+    
+    private func getKoreanDetailReport(_ english: String) -> String {
+        switch english {
+        case "OBSCENE": return "음란성/선정성"
+        case "WEATHER": return "날씨와맞지않음"
+        case "COPYRIGHT": return "지적재산권침해"
+        case "INSULT": return "혐오/욕설/인신공격"
+        case "REPEAT": return "같은내용반복"
+        default: return "기타"
+        }
+    }
+    
 }
diff --git a/Fitfty/Projects/Setting/Sources/Admin/Views/ReportListCell.swift b/Fitfty/Projects/Setting/Sources/Admin/Views/ReportListCell.swift
@@ -8,6 +8,7 @@
 
 import UIKit
 import Common
+import Kingfisher
 
 final class ReportListCell: UITableViewCell {
     
@@ -23,26 +24,30 @@ final class ReportListCell: UITableViewCell {
         let label = UILabel()
         label.textColor = CommonAsset.Colors.gray06.color
         label.font = FitftyFont.appleSDMedium(size: 15).font
-        label.text = "dud@naver.com"
         return label
     }()
     
     private lazy var detailReportLabel: UILabel = {
         let label = UILabel()
         label.textColor = CommonAsset.Colors.gray06.color
         label.font = FitftyFont.appleSDMedium(size: 15).font
-        label.text = "불쾌"
         return label
     }()
     
     private lazy var countLabel: UILabel = {
         let label = UILabel()
         label.textColor = CommonAsset.Colors.gray06.color
         label.font = FitftyFont.appleSDMedium(size: 15).font
-        label.text = "13"
         return label
     }()
     
+    private lazy var postImageView: UIImageView = {
+        let imageView = UIImageView()
+        imageView.contentMode = .scaleAspectFill
+        imageView.clipsToBounds = true
+        return imageView
+    }()
+    
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         setConstraintsLayout()
@@ -53,24 +58,29 @@ final class ReportListCell: UITableViewCell {
     }
     
     private func setConstraintsLayout() {
-        addSubviews(checkBoxButton, accountLabel, detailReportLabel, countLabel)
+        addSubviews(checkBoxButton, accountLabel, detailReportLabel, countLabel, postImageView)
         NSLayoutConstraint.activate([
             checkBoxButton.centerYAnchor.constraint(equalTo: centerYAnchor),
             checkBoxButton.widthAnchor.constraint(equalToConstant: 20),
             checkBoxButton.heightAnchor.constraint(equalToConstant: 20),
-            checkBoxButton.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -20),
+            checkBoxButton.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -5),
             
             accountLabel.centerYAnchor.constraint(equalTo: centerYAnchor),
             accountLabel.leadingAnchor.constraint(equalTo: leadingAnchor),
-            accountLabel.widthAnchor.constraint(equalToConstant: 120),
+            accountLabel.widthAnchor.constraint(equalToConstant: 150),
             
             detailReportLabel.centerYAnchor.constraint(equalTo: centerYAnchor),
             detailReportLabel.leadingAnchor.constraint(equalTo: accountLabel.trailingAnchor, constant: 10),
             detailReportLabel.widthAnchor.constraint(equalToConstant: 120),
             
             countLabel.centerYAnchor.constraint(equalTo: centerYAnchor),
             countLabel.leadingAnchor.constraint(equalTo: detailReportLabel.trailingAnchor, constant: 10),
-            countLabel.widthAnchor.constraint(equalToConstant: 50)
+            countLabel.widthAnchor.constraint(equalToConstant: 10),
+            
+            postImageView.widthAnchor.constraint(equalToConstant: 100),
+            postImageView.heightAnchor.constraint(equalToConstant: 100),
+            postImageView.centerYAnchor.constraint(equalTo: centerYAnchor),
+            postImageView.leadingAnchor.constraint(equalTo: leadingAnchor)
         ])
     }
     
@@ -86,10 +96,25 @@ final class ReportListCell: UITableViewCell {
 
 extension ReportListCell {
     
-    func setUp(account: String, detailReport: String, count: String) {
+    func setUp(account: String, detailReport: String, count: String, filePath: String?) {
         accountLabel.text = account
         detailReportLabel.text = detailReport
         countLabel.text = count
+        guard let filePath = filePath else {
+            return
+        }
+        let url = URL(string: filePath)
+        postImageView.kf.setImage(with: url)
     }
     
+    func setReportType(_ reportType: ReportType) {
+        switch reportType {
+        case .userReport:
+            postImageView.isHidden = true
+        case.postReport:
+            accountLabel.isHidden = true
+        }
+        
+    }
+   
 }
diff --git a/Fitfty/Projects/Setting/Sources/Admin/Views/ReportMenuView.swift b/Fitfty/Projects/Setting/Sources/Admin/Views/ReportMenuView.swift
@@ -13,7 +13,6 @@ final class ReportMenuView: UIView {
     
     private lazy var emailLabel: UILabel = {
         let label = UILabel()
-        label.text = "계정"
         label.font = FitftyFont.SFProDisplayBlack(size: 15).font
         return label
     }()
@@ -47,9 +46,21 @@ final class ReportMenuView: UIView {
             emailLabel.centerYAnchor.constraint(equalTo: centerYAnchor),
             emailLabel.leadingAnchor.constraint(equalTo: leadingAnchor),
             detailReportLabel.centerYAnchor.constraint(equalTo: centerYAnchor),
-            detailReportLabel.leadingAnchor.constraint(equalTo: emailLabel.trailingAnchor, constant: 50),
+            detailReportLabel.leadingAnchor.constraint(equalTo: emailLabel.trailingAnchor, constant: 130),
             countLabel.centerYAnchor.constraint(equalTo: centerYAnchor),
-            countLabel.leadingAnchor.constraint(equalTo: detailReportLabel.trailingAnchor, constant: 40)
+            countLabel.leadingAnchor.constraint(equalTo: detailReportLabel.trailingAnchor, constant: 50)
         ])
     }
 }
+
+extension ReportMenuView {
+    
+    func setUp(reportType: ReportType) {
+        switch reportType {
+        case .postReport:
+            emailLabel.text = "사진"
+        case .userReport:
+            emailLabel.text = "계정"
+        }
+    }
+}
diff --git a/Fitfty/Projects/Setting/Sources/Home/ViewController/SettingViewController.swift b/Fitfty/Projects/Setting/Sources/Home/ViewController/SettingViewController.swift
@@ -156,9 +156,11 @@ extension SettingViewController: UICollectionViewDelegate {
         case .privacyRule:
             coordinator?.showPrivacyRule()
             
-        case .userReport,
-             .postReport:
-            coordinator?.showReportList()
+        case .userReport:
+            coordinator?.showReportList(reportType: .userReport)
+            
+        case .postReport:
+            coordinator?.showReportList(reportType: .postReport)
             
         default: break
         }
diff --git a/Fitfty/Projects/Setting/Sources/SettingCoordinatorInterface.swift b/Fitfty/Projects/Setting/Sources/SettingCoordinatorInterface.swift
@@ -7,13 +7,14 @@
 //
 
 import Foundation
+import Common
 
 public protocol SettingCoordinatorInterface: AnyObject {
     func showProfileSetting()
     func showFeedSetting()
     func showMyInfoSetting()
     func showTermsOfUse()
     func showPrivacyRule()
-    func showReportList()
+    func showReportList(reportType: ReportType)
     func finished()
 }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ protocol ReportListViewModelInput {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public final class ReportListViewModel {`
	`23`	`+`
`23`	`24`	`private var currentState: CurrentValueSubject<ViewModelState?, Never> = .init(nil)`
`24`	`25`	`private var cancellables: Set<AnyCancellable> = .init()`
`25`	`26`	`private var reportType: ReportType`
`@@ -70,7 +71,7 @@ extension ReportListViewModel {`
`70`	`71`	`}`
`71`	`72`	`var cellModels = [ReportListCellModel]()`
`72`	`73`	`for i in 0..<data.count {`
`73`		`- cellModels.append(ReportListCellModel.report(data[i].reportUserEmail, data[i].type[0], String(data[i].reportedCount)))`
	`74`	`+ cellModels.append(ReportListCellModel.report(data[i].reportUserEmail, getKoreanDetailReport(data[i].type[0]), String(data[i].reportedCount+1), data[i].reportedBoardFilePath))`
`74`	`75`	`}`
`75`	`76`	`self.currentState.send(.sections([ReportListSection(sectionKind: .report, items: cellModels)]))`
`76`	`77`	`case .userReport:`
`@@ -82,7 +83,7 @@ extension ReportListViewModel {`
`82`	`83`	`}`
`83`	`84`	`var cellModels = [ReportListCellModel]()`
`84`	`85`	`for i in 0..<data.count {`
`85`		`- cellModels.append(ReportListCellModel.report(data[i].reportedUserEmail, data[i].type[0], String(data[i].reportedCount)))`
	`86`	`+ cellModels.append(ReportListCellModel.report(data[i].reportedUserEmail, getKoreanDetailReport(data[i].type[0]), String(data[i].reportedCount+1), nil))`
`86`	`87`	`}`
`87`	`88`	`self.currentState.send(.sections([ReportListSection(sectionKind: .report, items: cellModels)]))`
`88`	`89`	`}`
`@@ -92,4 +93,16 @@ extension ReportListViewModel {`
`92`	`93`	`}`
`93`	`94`	`}`
`94`	`95`	`}`
	`96`	`+`
	`97`	`+ private func getKoreanDetailReport(_ english: String) -> String {`
	`98`	`+ switch english {`
	`99`	`+ case "OBSCENE": return "음란성/선정성"`
	`100`	`+ case "WEATHER": return "날씨와맞지않음"`
	`101`	`+ case "COPYRIGHT": return "지적재산권침해"`
	`102`	`+ case "INSULT": return "혐오/욕설/인신공격"`
	`103`	`+ case "REPEAT": return "같은내용반복"`
	`104`	`+ default: return "기타"`
	`105`	`+ }`
	`106`	`+ }`
	`107`	`+`
`95`	`108`	`}`