Feat: 제보기능 완료

* feat: 제보완료 VC 뷰 모델 추가

* Feat: 제보하기 로직 구현, 제보 히스토리 로직 구현 (#T3-204)

* feat: NetworkService 로직 수정

- request 생성로직 수정. body에 jsonData 뿐 아니라, rawdata도 들어갈 수 있도록 수정 (s3 업로드 위함)
- response body가 empty여도 error를 throw 하지 않도록 수정

* feat: 제보하기 로직 구현

* refactor: 제보하기 수정된 디자인 적용

* feat: 제보하기 필터링 로직 구현

* feat: 제보히스토리 -> 제보상세 플로우 미비사항 구현

- 진행상황 collectionView cell에 진행상황 별 갯수 표시
- ReportEntity id 값을 옵셔널로 변경
- ReportDetail 날짜 포멧 변경

* fix: 제보하기 로직 수정

* refactor: 코드래빗 리뷰 반영

* feat: 제보완료 VC 뷰 모델 추가

* Fix: UI 일부 레이아웃 수정 및 서버 Enum 값 수정

* Fix: PhotoURL 딕셔너리 제거

* Fix: Report UI Date 형식 수정

* Feat: 추천 루틴 탭 플로팅 버튼에 '제보하기' 진입점 추가

* Feat: ReportRegistrationViewController 키보드 내려가기 및 이미지 선택 일부 수정

---------

Co-authored-by: 최정인 <[email protected]>

Author: taipaise

Projects/Domain/Sources/Entity/Enum/ReportType.swift

@@ -6,10 +6,10 @@
 //
 
 public enum ReportType: String, CaseIterable {
-    case transportation
-    case lamp
-    case water
-    case convenience
+    case transportation = "TRANSPORTATION"
+    case lamp = "LIGHTING"
+    case water = "WATERFACILITY"
+    case convenience = "AMENITY"
 }
 
 extension ReportType: CustomStringConvertible {

Projects/Domain/Sources/UseCase/Report/ReportUseCase.swift

@@ -53,19 +53,15 @@ public final class ReportUseCase: ReportUseCaseProtocol {
             presignedDict.count == photos.count
         else { return nil }
 
-        let presignedURLs = fileNames.compactMap { fileName in
-            presignedDict[fileName]
-        }
-
-        for (url, photo) in zip(presignedURLs, photos) {
+        for (url, photo) in zip(presignedDict.values, photos) {
             do {
                 try await fileRepository.uploadFile(url: url, data: photo)
             } catch {
                 print(error.localizedDescription)
             }
         }
 
-        let publicImageURLs = presignedURLs.map { url in
+        let publicImageURLs = presignedDict.values.map { url in
             url.split(separator: "?", maxSplits: 1)
                 .map(String.init)
                 .first ?? url

Projects/Presentation/Sources/RecommendedRoutine/View/RecommendedRoutineViewController.swift

@@ -337,7 +337,14 @@ extension RecommendedRoutineViewController: SelectableItemTableViewDelegate {
 extension RecommendedRoutineViewController: FloatingMenuViewDelegate {
     func floatingMenuDidTapReportButton(_ sender: FloatingMenuView) {
         toggleFloatingButton()
-        // TODO: 제보하기 뷰로 이동
+
+        guard let reportRegistrationViewModel = DIContainer.shared.resolve(type: ReportRegistrationViewModel.self)
+        else { fatalError("reportRegistrationViewController 의존성이 등록되지 않았습니다.") }
+
+        let reportRegistrationViewController = ReportRegistrationViewController(viewModel: reportRegistrationViewModel)
+        reportRegistrationViewController.hidesBottomBarWhenPushed = true
+
+        self.navigationController?.pushViewController(reportRegistrationViewController, animated: true)
     }
 
     func floatingMenuDidTapRegisterRoutineButton(_ sender: FloatingMenuView) {

Projects/Presentation/Sources/Report/View/ReportCompleteViewController.swift

@@ -5,10 +5,12 @@
 //  Created by 최정인 on 11/19/25.
 //
 
+import Combine
+import Shared
 import SnapKit
 import UIKit
 
-final class ReportCompleteViewController: UIViewController {
+final class ReportCompleteViewController: BaseViewController<ReportDetailViewModel> {
     private enum Layout {
         static let horizontalMargin: CGFloat = 20
         static let completeImageViewTopSpacing: CGFloat = 78
@@ -65,15 +67,27 @@ final class ReportCompleteViewController: UIViewController {
     private let descriptionLabel = UILabel()
     private let photoStackView = UIStackView()
     private let confirmButton = PrimaryButton(buttonState: .default, buttonTitle: "확인")
+    private let reportId: Int
+    private var cancellables: Set<AnyCancellable> = []
+
+    init(viewModel: ReportDetailViewModel, reportId: Int) {
+        self.reportId = reportId
+
+        super.init(viewModel: viewModel)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()
         configureAttribute()
         configureLayout()
-        fetchReport()
+        viewModel.action(input: .fetchReportDetail(reportId: reportId))
     }
 
-    private func configureAttribute() {
+    override func configureAttribute() {
         view.backgroundColor = .white
         scrollView.showsVerticalScrollIndicator = false
 
@@ -106,12 +120,28 @@ final class ReportCompleteViewController: UIViewController {
 
         confirmButton.addAction(
             UIAction { [weak self] _ in
-                self?.navigationController?.popToRootViewController(animated: true)
+                if
+                    let self,
+                    let tabBarController = self.tabBarController,
+                    let homeViewController = tabBarController.viewControllers?[0] as? UINavigationController,
+                    let recommendedRoutineViewController = tabBarController.viewControllers?[1] as? UINavigationController,
+                    let mypageViewController = tabBarController.viewControllers?[2] as? UINavigationController,
+                    let reportHistoryViewModel = DIContainer.shared.resolve(type: ReportHistoryViewModel.self) {
+
+                    homeViewController.popToRootViewController(animated: false)
+                    recommendedRoutineViewController.popToRootViewController(animated: false)
+
+                    tabBarController.selectedIndex = 2
+                    let reportHistoryViewController = ReportHistoryViewController(viewModel: reportHistoryViewModel)
+                    mypageViewController.pushViewController(reportHistoryViewController, animated: true)
+                } else {
+                    self?.navigationController?.popToRootViewController(animated: true)
+                }
             },
             for: .touchUpInside)
     }
 
-    private func configureLayout() {
+    override func configureLayout() {
         let safeArea = view.safeAreaLayoutGuide
 
         view.addSubview(scrollView)
@@ -123,10 +153,6 @@ final class ReportCompleteViewController: UIViewController {
 
         backgroudView.addSubview(summaryStackView)
         summaryStackView.addArrangedSubview(summaryLabel)
-        ReportCompleteContent.allCases.forEach { reportCompleteContentType in
-            let contentStackView = makeContentView(contentType: reportCompleteContentType)
-            summaryStackView.addArrangedSubview(contentStackView)
-        }
 
         scrollView.snp.makeConstraints { make in
             make.edges.equalTo(safeArea)
@@ -177,8 +203,37 @@ final class ReportCompleteViewController: UIViewController {
         }
     }
 
-    private func bind() {
-        fetchReport()
+    override func bind() {
+        viewModel.output.reportDetailPublisher
+            .receive(on: DispatchQueue.main)
+            .sink(receiveValue: { [weak self] reportDetail in
+                guard let reportDetail else { return }
+
+                self?.titleLabel.text = reportDetail.title
+                self?.categoryLabel.text = reportDetail.category.name
+                self?.locationLabel.text = reportDetail.location
+                let descriptionText = reportDetail.description
+                self?.descriptionLabel.numberOfLines = 0
+                self?.descriptionLabel.attributedText = BitnagilFont(style: .body1, weight: .medium)
+                    .attributedString(text: descriptionText, alignment: .right)
+
+                ReportCompleteContent.allCases.forEach { reportCompleteContentType in
+                    let contentStackView = self?.makeContentView(contentType: reportCompleteContentType)
+                    self?.summaryStackView.addArrangedSubview(contentStackView ?? UIView())
+                }
+
+                self?.photoStackView.arrangedSubviews.forEach { $0.removeFromSuperview() }
+                for photoURL in reportDetail.photoUrls {
+                    guard
+                        let photoView = self?.makePhotoView(),
+                        let url = URL(string: photoURL)
+                    else { continue }
+
+                    photoView.kf.setImage(with: url)
+                    self?.photoStackView.addArrangedSubview(photoView)
+                }
+            })
+            .store(in: &cancellables)
     }
 
     private func makeContentView(contentType: ReportCompleteContent) -> UIView {
@@ -200,7 +255,6 @@ final class ReportCompleteViewController: UIViewController {
             contentView = photoStackView
         } else {
             var contentLabel = UILabel()
-            contentLabel.text = " "
             switch contentType {
             case .title:
                 contentLabel = titleLabel
@@ -229,25 +283,8 @@ final class ReportCompleteViewController: UIViewController {
         return contentContainerView
     }
 
-    // TODO: 추후 ViewModel로 옮기기
-    private func fetchReport() {
-        titleLabel.text = "가로등이 깜박거려요."
-        categoryLabel.text = "교통시설"
-        locationLabel.text = "서울특별시 강남구 삼성동"
-        let descriptionText = "150자 내용 채우기"
-        descriptionLabel.attributedText = BitnagilFont(style: .body1, weight: .medium)
-            .attributedString(text: descriptionText, alignment: .right)
-
-        let photoView1 = makePhotoView()
-        let photoView2 = makePhotoView()
-        let photoView3 = makePhotoView()
-        [photoView1, photoView2, photoView3].forEach {
-            photoStackView.addArrangedSubview($0)
-        }
-    }
-
-    private func makePhotoView() -> UIView {
-        let photoView = UIView()
+    private func makePhotoView() -> UIImageView {
+        let photoView = UIImageView()
         photoView.backgroundColor = BitnagilColor.gray30
         photoView.layer.masksToBounds = true
         photoView.layer.cornerRadius = 6

Projects/Presentation/Sources/Report/View/ReportLoadingViewController.swift

@@ -5,6 +5,7 @@
 //  Created by 최정인 on 11/18/25.
 //
 
+import Shared
 import SnapKit
 import UIKit
 
@@ -82,7 +83,10 @@ final class ReportLoadingViewController: UIViewController {
 extension ReportLoadingViewController: ReportRegistrationViewControllerDelegate {
     func reportRegistrationViewController(_ sender: ReportRegistrationViewController, completeRegistration reportId: Int?) {
         if let reportId {
-            let reportCompleteViewController = ReportCompleteViewController()
+            guard let reportDetailViewModel = DIContainer.shared.resolve(type: ReportDetailViewModel.self)
+            else { fatalError("reportDetailViewModel 의존성이 등록되지 않았습니다.") }
+
+            let reportCompleteViewController = ReportCompleteViewController(viewModel: reportDetailViewModel, reportId: reportId)
             // TODO: - reportCompleteViewController에 제보id 전달 (또는 생성한 제보 객체 자체를 넘기기. 논의 필요)
             self.navigationController?.pushViewController(reportCompleteViewController, animated: true)
         } else {

Projects/Presentation/Sources/Report/View/ReportRegistrationViewController.swift

@@ -101,7 +101,7 @@ final class ReportRegistrationViewController: BaseViewController<ReportRegistrat
         cameraButton.layer.masksToBounds = true
         cameraButton.addAction(
             UIAction { [weak self] _ in
-                self?.showCameraBottomSheet()
+                self?.viewModel.action(input: .checkSelectedPhotoCount)
             },
             for: .touchUpInside)
 
@@ -129,6 +129,10 @@ final class ReportRegistrationViewController: BaseViewController<ReportRegistrat
 
         photoSelectionView.delegate = self
         applySnapshot(items: [], animating: false)
+
+        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(dismissKeyboard))
+        tapGesture.cancelsTouchesInView = false
+        view.addGestureRecognizer(tapGesture)
     }
 
     override func configureLayout() {
@@ -404,6 +408,21 @@ final class ReportRegistrationViewController: BaseViewController<ReportRegistrat
             }
             .store(in: &cancellables)
 
+        viewModel.output.selectedPhotoCountPublisher
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] photoCount in
+                guard let self else { return }
+                if photoCount >= self.viewModel.output.maxPhotoCount {
+                    let message = "사진은 최대 \(self.viewModel.output.maxPhotoCount)장까지 선택할 수 있습니다."
+                    let alertController = UIAlertController(title: "알림", message: message, preferredStyle: .alert)
+                    alertController.addAction(UIAlertAction(title: "확인", style: .default))
+                    self.present(alertController, animated: true)
+                } else {
+                    self.showCameraBottomSheet()
+                }
+            }
+            .store(in: &cancellables)
+
         viewModel.output.isReportValid
             .receive(on: DispatchQueue.main)
             .sink { [weak self] isReportValid in
@@ -514,6 +533,10 @@ final class ReportRegistrationViewController: BaseViewController<ReportRegistrat
             }
         }
     }
+
+    @objc private func dismissKeyboard() {
+        view.endEditing(true)
+    }
 }
 
 extension ReportRegistrationViewController: ReportTextViewDelegate {
@@ -595,19 +618,21 @@ extension ReportRegistrationViewController: UIImagePickerControllerDelegate, UIN
 extension ReportRegistrationViewController: PHPickerViewControllerDelegate {
     func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
         picker.dismiss(animated: true, completion: nil)
-        guard
-            let itemProvider = results.first?.itemProvider,
-            itemProvider.canLoadObject(ofClass: UIImage.self)
-        else { return }
+        guard !results.isEmpty else { return }
+
+        for result in results {
+            guard result.itemProvider.canLoadObject(ofClass: UIImage.self)
+            else { continue }
 
-        itemProvider.loadObject(ofClass: UIImage.self) { image, _ in
-            guard
-                let selectedImage = image as? UIImage,
-                let imageData = selectedImage.jpegData(compressionQuality: 0.5)
-            else { return }
+            result.itemProvider.loadObject(ofClass: UIImage.self) { image, _ in
+                guard
+                    let selectedImage = image as? UIImage,
+                    let imageData = selectedImage.jpegData(compressionQuality: 0.5)
+                else { return }
 
-            DispatchQueue.main.async {
-                self.viewModel.action(input: .selectPhoto(photoData: imageData))
+                DispatchQueue.main.async {
+                    self.viewModel.action(input: .selectPhoto(photoData: imageData))
+                }
             }
         }
     }

Projects/Presentation/Sources/Report/ViewModel/ReportRegistrationViewModel.swift

@@ -17,6 +17,7 @@ final class ReportRegistrationViewModel: ViewModel {
         case configureLocation
         case selectPhoto(photoData: Data)
         case removePhoto(id: UUID)
+        case checkSelectedPhotoCount
         case register
     }
 
@@ -26,6 +27,7 @@ final class ReportRegistrationViewModel: ViewModel {
         let contentPublisher: AnyPublisher<String?, Never>
         let locationPublisher: AnyPublisher<String?, Never>
         let selectedPhotoPublisher: AnyPublisher<[PhotoItem], Never>
+        let selectedPhotoCountPublisher: AnyPublisher<Int, Never>
         let isReportValid: AnyPublisher<Bool, Never>
         let exceptionPublisher: AnyPublisher<String, Never>
         let reportRegistrationCompletePublisher: AnyPublisher<Int?, Never>
@@ -39,6 +41,7 @@ final class ReportRegistrationViewModel: ViewModel {
     private let contentSubject = CurrentValueSubject<String?, Never>(nil)
     private let locationSubject = CurrentValueSubject<String?, Never>(nil)
     private let selectedPhotoSubject = CurrentValueSubject<[PhotoItem], Never>([])
+    private let selectedPhotoCountSubject = PassthroughSubject<Int, Never>()
     private let reportVerificationSubject = PassthroughSubject<Bool, Never>()
     private let reportRegistrationCompleteSubject = PassthroughSubject<Int?, Never>()
     private let exceptionSubject = PassthroughSubject<String, Never>()
@@ -55,6 +58,7 @@ final class ReportRegistrationViewModel: ViewModel {
             contentPublisher: contentSubject.eraseToAnyPublisher(),
             locationPublisher: locationSubject.eraseToAnyPublisher(),
             selectedPhotoPublisher: selectedPhotoSubject.eraseToAnyPublisher(),
+            selectedPhotoCountPublisher: selectedPhotoCountSubject.eraseToAnyPublisher(),
             isReportValid: reportVerificationSubject.eraseToAnyPublisher(),
             exceptionPublisher: exceptionSubject.eraseToAnyPublisher(),
             reportRegistrationCompletePublisher: reportRegistrationCompleteSubject.eraseToAnyPublisher(),
@@ -75,6 +79,8 @@ final class ReportRegistrationViewModel: ViewModel {
             selectPhoto(photoData: photoData)
         case .removePhoto(let id):
             removePhoto(id: id)
+        case .checkSelectedPhotoCount:
+            selectedPhotoCountSubject.send(selectedPhotoSubject.value.count)
         case .register:
             register()
         }

Projects/Shared/Sources/Extension/Date+.swift

@@ -46,8 +46,8 @@ extension Date {
             switch self {
             case .yearMonthDate: "yyyy-MM-dd"
             case .yearMonthDateShort: "yy.MM.dd"
-            case .yearMonthDateWeek: "yyyy-MM-dd E"
-            case .yearMonthDateWeek2: "yyyy-MM-dd (E)"
+            case .yearMonthDateWeek: "yy.MM.dd E"
+            case .yearMonthDateWeek2: "yyyy.MM.dd (E)"
             case .yearMonth: "yyyy년 M월"
             case .dayOfWeek: "E"
             case .date: "d"