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

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

Author: taipaise

Projects/DataSource/Sources/DTO/ReportDTO.swift

@@ -21,7 +21,6 @@ struct ReportDTO: Codable {
     let longitude: Double?
 
     func toReportEntity() throws -> ReportEntity {
-        guard let reportId else { throw NetworkError.decodingError }
         return ReportEntity(
             id: reportId,
             title: reportTitle,

Projects/Domain/Sources/Entity/ReportEntity.swift

@@ -6,7 +6,7 @@
 //
 
 public struct ReportEntity {
-    public let id: Int
+    public let id: Int?
     public let title: String
     public let date: String?
     public let type: ReportType
@@ -17,7 +17,7 @@ public struct ReportEntity {
     public let photoURLs: [String]
 
     public init(
-        id: Int,
+        id: Int?,
         title: String,
         date: String?,
         type: ReportType,

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

@@ -346,5 +346,4 @@ extension ReportHistoryViewController: ReportCategoryTableViewControllerDelegate
 
         viewModel.action(input: .filterCategory(type: selectedCategory))
     }
-
 }

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

@@ -7,6 +7,7 @@
 
 import Combine
 import Domain
+import Foundation
 
 final class ReportDetailViewModel: ViewModel {
     enum Input {
@@ -39,8 +40,11 @@ final class ReportDetailViewModel: ViewModel {
         Task {
             do {
                 if let reportEntity = try await reportRepository.fetchReportDetail(reportId: reportId) {
+                    let date = Date.convertToDate(from: reportEntity.date ?? "", dateType: .yearMonthDate)
+                    let dateString = date?.convertToString(dateType: .yearMonthDateWeek2)
+
                     let reportDetail = ReportDetail(
-                        date: reportEntity.date ?? "",
+                        date: dateString ?? "",
                         title: reportEntity.title,
                         status: reportEntity.progress,
                         category: reportEntity.type,
@@ -49,7 +53,6 @@ final class ReportDetailViewModel: ViewModel {
                         photoUrls: reportEntity.photoURLs)
                     reportDetailSubject.send(reportDetail)
                 }
-                reportDetailSubject.send(nil)
             } catch {
                 reportDetailSubject.send(nil)
             }

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

@@ -126,8 +126,10 @@ final class ReportHistoryViewModel: ViewModel {
                     let date = Date.convertToDate(from: reportEntity.date ?? "", dateType: .yearMonthDate)
                     let dateString = date?.convertToString(dateType: .yearMonthDateWeek)
 
+                    guard let id = reportEntity.id else { continue }
+
                     let reportHistoryItem = ReportHistoryItem(
-                        id: reportEntity.id,
+                        id: id,
                         title: reportEntity.title,
                         thumbnailUrl: reportEntity.thumbnailURL ?? "",
                         date: dateString ?? "",
@@ -139,6 +141,25 @@ final class ReportHistoryViewModel: ViewModel {
 
                 reports = reportHistoryItems
                 reportSubject.send(reportHistoryItems)
+
+                let progressItems: [ReportProgressItem] = ReportProgress.allCases.map { progress in
+                    let count: Int
+
+                    switch progress {
+                    case .entire:
+                        count = reports.count
+                    default:
+                        count = reports.filter { $0.progress == progress }.count
+                    }
+
+                    return ReportProgressItem(
+                        uuid: UUID(),
+                        progress: progress,
+                        count: count,
+                        isSelected: progress == .entire)
+                }
+
+                progressSubject.send(progressItems)
             } catch {
                 // TODO: 에러 처리
             }

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

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