letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Refactor reportUrl to reportURL.

Browse Source
This commit is contained in:
Doug
2025-06-18 12:38:21 +01:00
committed by Doug
parent d22761a25a
commit 1f6f8b8f4c
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ElementX/Sources/Screens/BugReportScreen/BugReportScreenViewModel.swift
View File

@@ -89,7 +89,7 @@ class BugReportScreenViewModel: BugReportScreenViewModelType, BugReportScreenVie
switch await bugReportService.submitBugReport(bugReport,
progressListener: progressSubject) {
case .success(let response):
MXLog.info("Submission uploaded to: \(response.reportUrl)")
MXLog.info("Submission uploaded: \(response.reportURL ?? "The server didn't generate a report URL")")
actionsSubject.send(.submitFinished)
case .failure(let error):
MXLog.error("Submission failed: \(error)")

1
ElementX/Sources/Services/BugReport/BugReportService.swift
View File

@@ -137,7 +137,6 @@ class BugReportService: NSObject, BugReportServiceProtocol {
// Parse the JSON data
let decoder = JSONDecoder()
decoder.keyDecodingStrategy = .convertFromSnakeCase
let uploadResponse = try decoder.decode(SubmitBugReportResponse.self, from: data)
lastCrashEventID = nil

6
ElementX/Sources/Services/BugReport/BugReportServiceProtocol.swift
View File

@@ -22,7 +22,11 @@ struct BugReport: Equatable {
}
struct SubmitBugReportResponse: Decodable {
var reportUrl: String?
var reportURL: String?
enum CodingKeys: String, CodingKey {
case reportURL = "report_url"
}
}
enum BugReportServiceError: LocalizedError {

2
UnitTests/Sources/BugReportScreenViewModelTests.swift
View File

@@ -55,7 +55,7 @@ class BugReportScreenViewModelTests: XCTestCase {
let mockService = BugReportServiceMock()
mockService.submitBugReportProgressListenerClosure = { _, _ in
await Task.yield()
return .success(SubmitBugReportResponse(reportUrl: "https://test.test"))
return .success(SubmitBugReportResponse(reportURL: "https://test.test"))
}
let clientProxy = ClientProxyMock(.init(userID: "@mock.client.com", deviceID: "ABCDEFGH"))

7
UnitTests/Sources/BugReportServiceTests.swift
View File

@@ -17,7 +17,7 @@ class BugReportServiceTests: XCTestCase {
override func setUpWithError() throws {
let bugReportServiceMock = BugReportServiceMock()
bugReportServiceMock.underlyingCrashedLastRun = false
bugReportServiceMock.submitBugReportProgressListenerReturnValue = .success(SubmitBugReportResponse(reportUrl: "https://www.example.com/123"))
bugReportServiceMock.submitBugReportProgressListenerReturnValue = .success(SubmitBugReportResponse(reportURL: "https://www.example.com/123"))
bugReportService = bugReportServiceMock
}
@@ -37,7 +37,8 @@ class BugReportServiceTests: XCTestCase {
files: [])
let progressSubject = CurrentValueSubject<Double, Never>(0.0)
let response = try await bugReportService.submitBugReport(bugReport, progressListener: progressSubject).get()
XCTAssertFalse(response.reportUrl.isEmpty)
let reportURL = try XCTUnwrap(response.reportURL)
XCTAssertFalse(reportURL.isEmpty)
}
func testInitialStateWithRealService() throws {
@@ -82,7 +83,7 @@ class BugReportServiceTests: XCTestCase {
let progressSubject = CurrentValueSubject<Double, Never>(0.0)
let response = try await service.submitBugReport(bugReport, progressListener: progressSubject).get()
XCTAssertEqual(response.reportUrl, "https://example.com/123")
XCTAssertEqual(response.reportURL, "https://example.com/123")
}
func testLogsMaxSize() {