From 6ecc36c02739da52844494d86de2315de6ba9726 Mon Sep 17 00:00:00 2001 From: Mathis Le Bonniec Date: Tue, 13 Jan 2026 13:53:28 +0100 Subject: [PATCH] refactor(mappers): make all mapper consistent --- .../Models/Mappers/CarMapper.swift | 2 +- .../Models/Mappers/DriverMapper.swift | 14 +++++++------- Sources/PodiumRequestsClient/RequestsClient.swift | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Sources/PodiumRequestsClient/Models/Mappers/CarMapper.swift b/Sources/PodiumRequestsClient/Models/Mappers/CarMapper.swift index 5b22f54..2e0c7d9 100644 --- a/Sources/PodiumRequestsClient/Models/Mappers/CarMapper.swift +++ b/Sources/PodiumRequestsClient/Models/Mappers/CarMapper.swift @@ -17,7 +17,7 @@ enum CarMapper { static func map(from domain: CarDomain) -> CarModel { CarModel( number: domain.number, - driver: DriverMapper.map(domain: domain.driver) + driver: DriverMapper.map(from: domain.driver) ) } diff --git a/Sources/PodiumRequestsClient/Models/Mappers/DriverMapper.swift b/Sources/PodiumRequestsClient/Models/Mappers/DriverMapper.swift index a6c5e57..fc85826 100644 --- a/Sources/PodiumRequestsClient/Models/Mappers/DriverMapper.swift +++ b/Sources/PodiumRequestsClient/Models/Mappers/DriverMapper.swift @@ -9,14 +9,14 @@ import Foundation enum DriverMapper { /// Map a `DriverDomain` into a `DriverDomain`. - static func map(domain from: DriverDomain) -> DriverModel { + static func map(from domain: DriverDomain) -> DriverModel { DriverModel( - firstname: from.firstname, - lastname: from.lastname, - acronym: from.acronym, - number: from.number, - team: TeamMapper.map(from: from.team), - image: from.image + firstname: domain.firstname, + lastname: domain.lastname, + acronym: domain.acronym, + number: domain.number, + team: TeamMapper.map(from: domain.team), + image: domain.image ) } } diff --git a/Sources/PodiumRequestsClient/RequestsClient.swift b/Sources/PodiumRequestsClient/RequestsClient.swift index 22943fc..a075d8a 100644 --- a/Sources/PodiumRequestsClient/RequestsClient.swift +++ b/Sources/PodiumRequestsClient/RequestsClient.swift @@ -212,7 +212,7 @@ public final class RequestsClient: Sendable { type: [DriverDomain].self ) - return domain.map { DriverMapper.map(domain: $0) } + return domain.map { DriverMapper.map(from: $0) } } /// Retrieves a specific driver by ID from a session. @@ -231,7 +231,7 @@ public final class RequestsClient: Sendable { type: DriverDomain.self ) - return DriverMapper.map(domain: domain) + return DriverMapper.map(from: domain) } /// Retrieves all the weather updates for a given session.