Mike/FrenoCorp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix P0-P3 code review issues for clubs and challenges (FRE-4664)

Browse Source 
P0: Fix variable shadowing in ClubService.createClub/updateClub and
    ChallengeService.createChallenge/updateChallenge — renamed local
    'var request' to 'var urlRequest' so JSONEncoder encodes the
    typed parameter, not the URLRequest.

P1: Wire CreateClubSheet and CreateChallengeSheet to parent ViewModel —
    sheets now receive viewModel and call createClub/createChallenge
    before dismissing.

P2: Extract HTTPMethod enum to shared Utils/HTTPMethod.swift (was
    defined in NotificationService). Remove dead 'body' parameter from
    buildRequest in all three services. Add error alert UI to
    ClubsView and ChallengesView.

P3: Replace forced URL unwrap with static let defaultBaseURL in all
    three services. Fix MockChallengeService.updateChallenge to track
    updateCalled instead of always throwing notFound.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
Michael Freno
2026-05-10 06:42:00 -04:00
parent b8c14ef8a7
commit bc7bf124f5
8 changed files with 81 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Lendair/Services/ChallengeService.swift
View File

@@ -20,8 +20,10 @@ class ChallengeService: ChallengeServiceProtocol {
private let session: URLSession
private let authToken: String?
static let defaultBaseURL: URL = URL(string: "http://localhost:3000")!
init(
baseURL: URL = URL(string: "http://localhost:3000")!,
baseURL: URL = defaultBaseURL,
session: URLSession = .shared,
authToken: String? = nil
) {
@@ -62,10 +64,10 @@ class ChallengeService: ChallengeServiceProtocol {
func createChallenge(request: CreateChallengeRequest) async throws -> Challenge {
let url = baseURL.appendingPathComponent("/api/challenges")
var request = try buildRequest(url: url, method: .post)
request.httpBody = try JSONEncoder().encode(request)
var urlRequest = try buildRequest(url: url, method: .post)
urlRequest.httpBody = try JSONEncoder().encode(request)
let (data, response) = try await session.data(for: request)
let (data, response) = try await session.data(for: urlRequest)
try validateResponse(response)
let decoded = try JSONDecoder().decode(CreateChallengeResponse.self, from: data)
@@ -74,10 +76,10 @@ class ChallengeService: ChallengeServiceProtocol {
func updateChallenge(id: String, request: UpdateChallengeRequest) async throws -> Challenge {
let url = baseURL.appendingPathComponent("/api/challenges/\(id)")
var request = try buildRequest(url: url, method: .patch)
request.httpBody = try JSONEncoder().encode(request)
var urlRequest = try buildRequest(url: url, method: .patch)
urlRequest.httpBody = try JSONEncoder().encode(request)
let (data, response) = try await session.data(for: request)
let (data, response) = try await session.data(for: urlRequest)
try validateResponse(response)
let decoded = try JSONDecoder().decode(UpdateChallengeResponse.self, from: data)
@@ -124,7 +126,7 @@ class ChallengeService: ChallengeServiceProtocol {
// MARK: - Helpers
private func buildRequest(url: URL, method: HTTPMethod = .get, body: Data? = nil) throws -> URLRequest {
private func buildRequest(url: URL, method: HTTPMethod = .get) throws -> URLRequest {
var request = URLRequest(url: url)
request.httpMethod = method.rawValue
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
@@ -133,10 +135,6 @@ class ChallengeService: ChallengeServiceProtocol {
request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
}
if let body = body {
request.httpBody = body
}
return request
}