fix: 제보하기 로직 수정

Author: taipaise

Projects/DataSource/Sources/Repository/ReportRepository.swift

@@ -17,7 +17,7 @@ final class ReportRepository: ReportRepositoryProtocol {
         category: ReportType,
         location: LocationEntity?,
         photoURLs: [String]
-    ) async throws {
+    ) async throws -> Int? {
         let reportDTO = ReportDTO(
             reportId: nil,
             reportDate: nil,
@@ -33,7 +33,9 @@ final class ReportRepository: ReportRepositoryProtocol {
         )
 
         let endpoint = ReportEndpoint.register(report: reportDTO)
-        guard let response = try await networkService.request(endpoint: endpoint, type: EmptyResponseDTO.self) else { return }
+        guard let id = try await networkService.request(endpoint: endpoint, type: Int.self) else { return nil }
+
+        return id
     }
 
     func fetchReports() async throws -> [ReportEntity] {

Projects/Domain/Sources/Protocol/Repository/ReportRepositoryProtocol.swift

@@ -16,13 +16,14 @@ public protocol ReportRepositoryProtocol {
     ///   - category: 제보 카테고리
     ///   - location: 제보 위치
     ///   - photos: 업로드한 사진의 presigned urls
+    /// - Returns: 제보 id
     func report(
         title: String,
         content: String?,
         category: ReportType,
         location: LocationEntity?,
         photoURLs: [String]
-    ) async throws
+    ) async throws -> Int?
 
     /// 제보 목록을 조회합니다.
     /// - Returns: 조회된 제보 목록

Projects/Domain/Sources/Protocol/UseCase/ReportUseCaseProtocol.swift

@@ -8,17 +8,32 @@
 import Foundation
 
 public protocol ReportUseCaseProtocol {
+    /// 현위치를 가져옵니다.
+    /// - Returns: 현재 위치
     func fetchCurrentLocation() async throws -> LocationEntity?
 
+    /// 제보 목록을 가져옵니다.
+    /// - Returns: 제보 목록
     func fetchReports() async throws -> [ReportEntity]
 
+    /// 제보 단건의 상세 정보를 조회합니다.
+    /// - Parameter reportId: 제보 id
+    /// - Returns: 제보 상세 정보
     func fetchReport(reportId: Int) async throws -> ReportEntity?
 
+    /// 제보를 등록합니다.
+    /// - Parameters:
+    ///   - title: 제보 제목
+    ///   - content: 제보 내용
+    ///   - category: 제보 카테고리 (교통, 상하수도 등)
+    ///   - location: 제보 위치
+    ///   - photos: 제보 사진 배열
+    /// - Returns: 등록한 제보 id
     func report(
         title: String,
         content: String?,
         category: ReportType,
         location: LocationEntity?,
         photos: [Data]
-    ) async throws
+    ) async throws -> Int?
 }

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

@@ -42,14 +42,14 @@ public final class ReportUseCase: ReportUseCaseProtocol {
         category: ReportType,
         location: LocationEntity?,
         photos: [Data]
-    ) async throws {
+    ) async throws -> Int? {
         let fileNames = (1...photos.count).map { "\($0).jpg" }
 
         // TODO: - 사진 업로드 실패 시 에러 처리 필요
         guard
             let presignedDict = try await fileRepository.fetchPresignedURL(prefix: "report", fileNames: fileNames),
             presignedDict.count == photos.count
-        else { return }
+        else { return nil }
 
         let presignedURLs = Array(presignedDict.values)
 
@@ -67,7 +67,7 @@ public final class ReportUseCase: ReportUseCaseProtocol {
                 .first ?? url
         }
 
-        try await reportRepository.report(
+        return try await reportRepository.report(
             title: title,
             content: content,
             category: category,

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

@@ -80,9 +80,10 @@ final class ReportLoadingViewController: UIViewController {
 }
 
 extension ReportLoadingViewController: ReportRegistrationViewControllerDelegate {
-    func reportRegistrationViewController(_ sender: ReportRegistrationViewController, completeRegistration: Bool) {
-        if completeRegistration {
+    func reportRegistrationViewController(_ sender: ReportRegistrationViewController, completeRegistration reportId: Int?) {
+        if let reportId {
             let reportCompleteViewController = ReportCompleteViewController()
+            // TODO: - reportCompleteViewController에 제보id 전달 (또는 생성한 제보 객체 자체를 넘기기. 논의 필요)
             self.navigationController?.pushViewController(reportCompleteViewController, animated: true)
         } else {
             navigationController?.popViewController(animated: true)

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

@@ -12,7 +12,7 @@ import SnapKit
 import UIKit
 
 protocol ReportRegistrationViewControllerDelegate: AnyObject {
-    func reportRegistrationViewController(_ sender: ReportRegistrationViewController, completeRegistration: Bool)
+    func reportRegistrationViewController(_ sender: ReportRegistrationViewController, completeRegistration reportId: Int?)
 }
 
 final class ReportRegistrationViewController: BaseViewController<ReportRegistrationViewModel> {
@@ -417,13 +417,10 @@ final class ReportRegistrationViewController: BaseViewController<ReportRegistrat
 
         viewModel.output.reportRegistrationCompletePublisher
             .receive(on: DispatchQueue.main)
-            .sink { [weak self] isCompleted in
-                guard
-                    let self,
-                    isCompleted
-                else { return }
+            .sink { [weak self] reportId in
+                guard let self else { return }
 
-                delegate?.reportRegistrationViewController(self, completeRegistration: isCompleted)
+                delegate?.reportRegistrationViewController(self, completeRegistration: reportId)
             }
             .store(in: &cancellables)
     }

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

@@ -28,7 +28,7 @@ final class ReportRegistrationViewModel: ViewModel {
         let selectedPhotoPublisher: AnyPublisher<[PhotoItem], Never>
         let isReportValid: AnyPublisher<Bool, Never>
         let exceptionPublisher: AnyPublisher<String, Never>
-        let reportRegistrationCompletePublisher: AnyPublisher<Bool, Never>
+        let reportRegistrationCompletePublisher: AnyPublisher<Int?, Never>
         let maxPhotoCount: Int
     }
 
@@ -40,7 +40,7 @@ final class ReportRegistrationViewModel: ViewModel {
     private let locationSubject = CurrentValueSubject<String?, Never>(nil)
     private let selectedPhotoSubject = CurrentValueSubject<[PhotoItem], Never>([])
     private let reportVerificationSubject = PassthroughSubject<Bool, Never>()
-    private let reportRegistrationCompleteSubject = PassthroughSubject<Bool, Never>()
+    private let reportRegistrationCompleteSubject = PassthroughSubject<Int?, Never>()
     private let exceptionSubject = PassthroughSubject<String, Never>()
     private let maxPhotoCount = 3
     private var location: LocationEntity? = nil
@@ -146,19 +146,17 @@ final class ReportRegistrationViewModel: ViewModel {
         Task {
             let minimumDuration: TimeInterval = 0.7
             let startTime = Date()
-            let result: Bool
+            let reportId: Int?
 
             do {
-                try await reportUseCase.report(
+                reportId = try await reportUseCase.report(
                     title: name,
                     content: content,
                     category: category,
                     location: location,
                     photos: selectedPhotos)
-                result = true
             } catch {
-
-                result = false
+                reportId = nil
             }
 
             let elapsed = Date().timeIntervalSince(startTime)
@@ -169,7 +167,7 @@ final class ReportRegistrationViewModel: ViewModel {
                 )
             }
 
-            reportRegistrationCompleteSubject.send(result)
+            reportRegistrationCompleteSubject.send(reportId)
         }
     }