[Feat-T3-202] 제보 상세화면 API 연동 #71
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // | ||
| // ReportDTO.swift | ||
| // DataSource | ||
| // | ||
| // Created by 최정인 on 11/20/25. | ||
| // | ||
|
|
||
| import Domain | ||
|
|
||
| struct ReportDTO: Decodable { | ||
| let reportId: Int? | ||
| let reportDate: String? | ||
| let reportTitle: String | ||
| let reportContent: String? | ||
| let reportLocation: String | ||
| let reportStatus: String | ||
| let reportCategory: String | ||
| let reportImageUrl: String? | ||
| let reportImageUrls: [String]? | ||
| let latitude: Double? | ||
| let longitude: Double? | ||
|
|
||
| func toReportEntity() throws -> ReportEntity { | ||
| guard let reportId else { throw NetworkError.decodingError } | ||
| return ReportEntity( | ||
| id: reportId, | ||
| title: reportTitle, | ||
| date: reportDate, | ||
| type: ReportType(rawValue: reportCategory) ?? .transportation, | ||
| progress: ReportProgress(rawValue: reportStatus) ?? .received, | ||
| content: reportContent, | ||
| location: LocationEntity( | ||
| longitude: longitude, | ||
| latitude: latitude, | ||
| address: reportLocation), | ||
| photoUrls: reportImageUrls ?? []) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // | ||
| // ReportEndpoint.swift | ||
| // DataSource | ||
| // | ||
| // Created by 최정인 on 11/20/25. | ||
| // | ||
|
|
||
| enum ReportEndpoint { | ||
| case fetchReportDetail(reportId: Int) | ||
| } | ||
|
|
||
| extension ReportEndpoint: Endpoint { | ||
| var baseURL: String { | ||
| switch self { | ||
| case .fetchReportDetail: | ||
| return AppProperties.baseURL + "/api/v2/reports" | ||
| } | ||
| } | ||
|
|
||
| var path: String { | ||
| switch self { | ||
| case .fetchReportDetail(let reportId): | ||
| "\(baseURL)/\(reportId)" | ||
| } | ||
| } | ||
|
|
||
| var method: HTTPMethod { | ||
| switch self { | ||
| case .fetchReportDetail: | ||
| .get | ||
| } | ||
| } | ||
|
|
||
| var headers: [String : String] { | ||
| let headers: [String: String] = [ | ||
| "Content-Type": "application/json", | ||
| "accept": "*/*" | ||
| ] | ||
| return headers | ||
| } | ||
|
|
||
| var queryParameters: [String : String] { | ||
| return [:] | ||
| } | ||
|
|
||
| var bodyParameters: [String : Any] { | ||
| return [:] | ||
| } | ||
|
|
||
| var isAuthorized: Bool { | ||
| return true | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ import Domain | |
|
|
||
| final class ReportDetailViewModel: ViewModel { | ||
| enum Input { | ||
| case fetchReportDetail(reportId: Int) | ||
| } | ||
|
|
||
| struct Output { | ||
|
|
@@ -19,28 +19,40 @@ final class ReportDetailViewModel: ViewModel { | |
|
|
||
| private(set) var output: Output | ||
| private let reportDetailSubject = CurrentValueSubject<ReportDetail?, Never>(nil) | ||
| private let reportRepository: ReportRepositoryProtocol | ||
|
|
||
| init(reportRepository: ReportRepositoryProtocol) { | ||
| self.reportRepository = reportRepository | ||
| self.output = Output( | ||
| reportDetailPublisher: reportDetailSubject.eraseToAnyPublisher() | ||
| ) | ||
| } | ||
|
|
||
| func action(input: Input) { | ||
| switch input { | ||
| case .fetchReportDetail(let reportId): | ||
| fetchReportDetail(reportId: reportId) | ||
| } | ||
| } | ||
|
|
||
| private func fetchReportDetail(reportId: Int) { | ||
| Task { | ||
| do { | ||
| if let reportEntity = try await reportRepository.fetchReportDetail(reportId: reportId) { | ||
| let reportDetail = ReportDetail( | ||
| date: reportEntity.date ?? "", | ||
| title: reportEntity.title, | ||
| status: reportEntity.progress, | ||
| category: reportEntity.type, | ||
| description: reportEntity.content ?? "", | ||
| location: reportEntity.location.address ?? "", | ||
| photoUrls: reportEntity.photoUrls) | ||
| reportDetailSubject.send(reportDetail) | ||
| } | ||
| reportDetailSubject.send(nil) | ||
| } catch { | ||
| reportDetailSubject.send(nil) | ||
| } | ||
| } | ||
| } | ||
|
Comment on lines
+38
to
57
There was a problem hiding this comment. 🧩 Analysis chain
현재 구현에는 두 가지 문제가 있습니다.
아래처럼 성공/실패/데이터없음 케이스를 명확히 나누고, - private func fetchReportDetail(reportId: Int) {
- Task {
- do {
- if let reportEntity = try await reportRepository.fetchReportDetail(reportId: reportId) {
- let reportDetail = ReportDetail(
- date: reportEntity.date ?? "",
- title: reportEntity.title,
- status: reportEntity.progress,
- category: reportEntity.type,
- description: reportEntity.content ?? "",
- location: reportEntity.location.address ?? "",
- photoUrls: reportEntity.photoUrls)
- reportDetailSubject.send(reportDetail)
- }
- reportDetailSubject.send(nil)
- } catch {
- reportDetailSubject.send(nil)
- }
- }
- }
+ private func fetchReportDetail(reportId: Int) {
+ Task { [weak self] in
+ guard let self else { return }
+
+ do {
+ if let reportEntity = try await self.reportRepository.fetchReportDetail(reportId: reportId) {
+ let reportDetail = ReportDetail(
+ date: reportEntity.date ?? "",
+ title: reportEntity.title,
+ status: reportEntity.progress,
+ category: reportEntity.type,
+ description: reportEntity.content ?? "",
+ location: reportEntity.location.address ?? "",
+ photoUrls: reportEntity.photoUrls)
+ self.reportDetailSubject.send(reportDetail)
+ } else {
+ self.reportDetailSubject.send(nil)
+ }
+ } catch {
+ self.reportDetailSubject.send(nil)
+ }
+ }
+ }이렇게 하면:
🏁 Script executed: #!/bin/bash
# Find ReportDetailViewModel.swift and verify the code
find . -name "ReportDetailViewModel.swift" -type f 2>/dev/null | head -5Length of output: 76 🏁 Script executed: #!/bin/bash
# Extract and display the fetchReportDetail method around lines 38-57
if [ -f "Projects/Presentation/Sources/Report/ViewModel/ReportDetailViewModel.swift" ]; then
sed -n '38,57p' "Projects/Presentation/Sources/Report/ViewModel/ReportDetailViewModel.swift"
else
echo "File not found at expected path"
fiLength of output: 871 🏁 Script executed: #!/bin/bash
# Search for ReportDetailViewController and fillReportContent method
find . -name "ReportDetailViewController.swift" -type f 2>/dev/nullLength of output: 76 🏁 Script executed: #!/bin/bash
# Check reportDetailSubject type and usage
rg -n "reportDetailSubject" "Projects/Presentation/Sources/Report/ViewModel/ReportDetailViewModel.swift" -A 2 -B 2 2>/dev/null || echo "File not found or no matches"Length of output: 761 🏁 Script executed: #!/bin/bash
# Look for fillReportContent in ReportDetailViewController
rg -n "fillReportContent\|reportDetailSubject" "Projects/Presentation/Sources/Report/View/Controller/" -A 3 -B 1 2>/dev/null | head -30Length of output: 0 Length of output: 661 🏁 Script executed: #!/bin/bash
# Search for reportDetailPublisher subscription in ReportDetailViewController.swift
rg -n "reportDetailPublisher\|\.sink\|\.assign\|\.receive" "Projects/Presentation/Sources/Report/View/ReportDetailViewController.swift" -B 2 -A 3Length of output: 0 🏁 Script executed: #!/bin/bash
# Get the whole ReportDetailViewController to understand how reportDetailPublisher is used
cat "Projects/Presentation/Sources/Report/View/ReportDetailViewController.swift" | head -100Length of output: 3298
현재 구현에는 두 가지 문제가 있습니다.
- private func fetchReportDetail(reportId: Int) {
- Task {
- do {
- if let reportEntity = try await reportRepository.fetchReportDetail(reportId: reportId) {
- let reportDetail = ReportDetail(
- date: reportEntity.date ?? "",
- title: reportEntity.title,
- status: reportEntity.progress,
- category: reportEntity.type,
- description: reportEntity.content ?? "",
- location: reportEntity.location.address ?? "",
- photoUrls: reportEntity.photoUrls)
- reportDetailSubject.send(reportDetail)
- }
- reportDetailSubject.send(nil)
- } catch {
- reportDetailSubject.send(nil)
- }
- }
- }
+ private func fetchReportDetail(reportId: Int) {
+ Task { [weak self] in
+ guard let self else { return }
+
+ do {
+ if let reportEntity = try await self.reportRepository.fetchReportDetail(reportId: reportId) {
+ let reportDetail = ReportDetail(
+ date: reportEntity.date ?? "",
+ title: reportEntity.title,
+ status: reportEntity.progress,
+ category: reportEntity.type,
+ description: reportEntity.content ?? "",
+ location: reportEntity.location.address ?? "",
+ photoUrls: reportEntity.photoUrls)
+ self.reportDetailSubject.send(reportDetail)
+ } else {
+ self.reportDetailSubject.send(nil)
+ }
+ } catch {
+ self.reportDetailSubject.send(nil)
+ }
+ }
+ }🤖 Prompt for AI Agents |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,6 @@ import ProjectDescription | |
|
|
||
| let tuist = Tuist( | ||
| project: .tuist( | ||
| compatibleXcodeVersions: .all | ||
| ) | ||
| ) | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
엔티티 변환 실패 가능성을 염두에 두셨군요!
추후에 다른 DTO -> Entity 에도 throw를 할 수 있게 하고, 따로 Error를 정의해서 로그를 찍는것도 좋을 것 같습니다!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
조아유 !!!!!!!!!