simonfranken/timetracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix iOS list response decoding to match plain-array backend responses

Browse Source 
GET /clients and GET /projects return bare arrays, not wrapped objects.
Remove ClientListResponse and ProjectListResponse wrapper structs and
update ClientsViewModel, ProjectsViewModel, and TimerViewModel to decode
[Client] and [Project] directly.
This commit is contained in:
Simon Franken
2026-02-19 19:05:43 +01:00
parent 48cd82ab4f
commit 39d6ea00d9
5 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ios/TimeTracker/TimeTracker/Features/Clients/ClientsViewModel.swift
View File

@@ -15,11 +15,10 @@ final class ClientsViewModel: ObservableObject {
error = nil error = nil
do { do {
let response: ClientListResponse = try await apiClient.request( clients = try await apiClient.request(
endpoint: APIEndpoint.clients, endpoint: APIEndpoint.clients,
authenticated: true authenticated: true
) )
clients = response.clients
try await database.saveClients(clients) try await database.saveClients(clients)

6
ios/TimeTracker/TimeTracker/Features/Projects/ProjectsViewModel.swift
View File

@@ -16,17 +16,15 @@ final class ProjectsViewModel: ObservableObject {
error = nil error = nil
do { do {
let clientsResponse: ClientListResponse = try await apiClient.request( clients = try await apiClient.request(
endpoint: APIEndpoint.clients, endpoint: APIEndpoint.clients,
authenticated: true authenticated: true
) )
clients = clientsResponse.clients
let projectsResponse: ProjectListResponse = try await apiClient.request( projects = try await apiClient.request(
endpoint: APIEndpoint.projects, endpoint: APIEndpoint.projects,
authenticated: true authenticated: true
) )
projects = projectsResponse.projects
try await database.saveProjects(projects) try await database.saveProjects(projects)

3
ios/TimeTracker/TimeTracker/Features/Timer/TimerViewModel.swift
View File

@@ -37,11 +37,10 @@ final class TimerViewModel: ObservableObject {
try await database.cacheTimer(activeTimer) try await database.cacheTimer(activeTimer)
// Fetch projects // Fetch projects
let response: ProjectListResponse = try await apiClient.request( projects = try await apiClient.request(
endpoint: APIEndpoint.projects, endpoint: APIEndpoint.projects,
authenticated: true authenticated: true
) )
projects = response.projects
// Set selected project if timer has one // Set selected project if timer has one
if let timerProject = activeTimer?.project { if let timerProject = activeTimer?.project {

4
ios/TimeTracker/TimeTracker/Models/Client.swift
View File

@@ -8,10 +8,6 @@ struct Client: Codable, Identifiable, Equatable, Hashable {
let updatedAt: String let updatedAt: String
} }
struct ClientListResponse: Codable {
let clients: [Client]
}
struct CreateClientInput: Codable { struct CreateClientInput: Codable {
let name: String let name: String
let description: String? let description: String?

4
ios/TimeTracker/TimeTracker/Models/Project.swift
View File

@@ -16,10 +16,6 @@ struct ClientReference: Codable, Equatable, Hashable {
let name: String let name: String
} }
struct ProjectListResponse: Codable {
let projects: [Project]
}
struct CreateProjectInput: Codable { struct CreateProjectInput: Codable {
let name: String let name: String
let description: String? let description: String?