services refactor

This commit is contained in:
2025-12-17 22:17:02 +01:00
parent 26f7a2b6aa
commit 055a7f67b5
93 changed files with 7434 additions and 659 deletions

View File

@@ -1,121 +1,256 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { getRaceResults, getRaceSOF, importRaceResults } from './RaceResultsService';
import { RaceResultsService } from './RaceResultsService';
import { RacesApiClient } from '../../api/races/RacesApiClient';
import { RaceResultsDetailPresenter } from '../../presenters/RaceResultsDetailPresenter';
import { RaceWithSOFPresenter } from '../../presenters/RaceWithSOFPresenter';
import { ImportRaceResultsPresenter } from '../../presenters/ImportRaceResultsPresenter';
import type { RaceResultsDetailDto, RaceWithSOFDto, ImportRaceResultsSummaryDto } from '../../dtos';
import type { RaceResultsDetailViewModel } from '../../view-models/RaceResultsDetailViewModel';
import type { RaceWithSOFViewModel } from '../../presenters/RaceWithSOFPresenter';
import type { ImportRaceResultsSummaryViewModel } from '../../presenters/ImportRaceResultsPresenter';
// Mock the API client
vi.mock('../../api', () => ({
apiClient: {
races: {
describe('RaceResultsService', () => {
let service: RaceResultsService;
let mockApiClient: RacesApiClient;
let mockResultsDetailPresenter: RaceResultsDetailPresenter;
let mockSOFPresenter: RaceWithSOFPresenter;
let mockImportPresenter: ImportRaceResultsPresenter;
beforeEach(() => {
mockApiClient = {
getResultsDetail: vi.fn(),
getWithSOF: vi.fn(),
importResults: vi.fn(),
},
},
}));
} as unknown as RacesApiClient;
// Mock the presenter
vi.mock('../../presenters', () => ({
presentRaceResultsDetail: vi.fn(),
}));
mockResultsDetailPresenter = {
present: vi.fn(),
} as unknown as RaceResultsDetailPresenter;
import { api } from '../../api';
import { presentRaceResultsDetail } from '../../presenters';
mockSOFPresenter = {
present: vi.fn(),
} as unknown as RaceWithSOFPresenter;
describe('RaceResultsService', () => {
beforeEach(() => {
vi.clearAllMocks();
mockImportPresenter = {
present: vi.fn(),
} as unknown as ImportRaceResultsPresenter;
service = new RaceResultsService(
mockApiClient,
mockResultsDetailPresenter,
mockSOFPresenter,
mockImportPresenter
);
});
describe('getRaceResults', () => {
it('should call API and presenter with correct parameters', async () => {
const mockDto: RaceResultsDetailDto = {
id: 'race-1',
name: 'Test Race',
results: [],
// ... other required fields
} as RaceResultsDetailDto;
const mockViewModel = {
id: 'race-1',
name: 'Test Race',
formattedResults: [],
};
describe('getResultsDetail', () => {
it('should fetch race results detail and transform via presenter', async () => {
// Arrange
const raceId = 'race-123';
const currentUserId = 'user-456';
// Mock API call
vi.mocked(api.races.getResultsDetail).mockResolvedValue(mockDto);
// Mock presenter
vi.mocked(presentRaceResultsDetail).mockReturnValue(mockViewModel);
const result = await getRaceResults(raceId, currentUserId);
expect(api.races.getResultsDetail).toHaveBeenCalledWith(raceId);
expect(presentRaceResultsDetail).toHaveBeenCalledWith(mockDto, currentUserId);
expect(result).toBe(mockViewModel);
});
it('should call presenter with undefined currentUserId when not provided', async () => {
const mockDto: RaceResultsDetailDto = {
id: 'race-1',
name: 'Test Race',
const mockDto: Partial<RaceResultsDetailDto> = {
raceId,
results: [],
};
const mockViewModel: Partial<RaceResultsDetailViewModel> = {
raceId,
results: [],
} as RaceResultsDetailDto;
const mockViewModel = {
id: 'race-1',
name: 'Test Race',
formattedResults: [],
};
vi.mocked(mockApiClient.getResultsDetail).mockResolvedValue(mockDto as RaceResultsDetailDto);
vi.mocked(mockResultsDetailPresenter.present).mockReturnValue(mockViewModel as RaceResultsDetailViewModel);
// Act
const result = await service.getResultsDetail(raceId, currentUserId);
// Assert
expect(mockApiClient.getResultsDetail).toHaveBeenCalledWith(raceId);
expect(mockResultsDetailPresenter.present).toHaveBeenCalledWith(mockDto, currentUserId);
expect(result).toEqual(mockViewModel);
});
it('should fetch race results detail without currentUserId', async () => {
// Arrange
const raceId = 'race-123';
const mockDto: Partial<RaceResultsDetailDto> = {
raceId,
results: [],
};
const mockViewModel: Partial<RaceResultsDetailViewModel> = {
raceId,
results: [],
};
vi.mocked(api.races.getResultsDetail).mockResolvedValue(mockDto);
vi.mocked(presentRaceResultsDetail).mockReturnValue(mockViewModel);
vi.mocked(mockApiClient.getResultsDetail).mockResolvedValue(mockDto as RaceResultsDetailDto);
vi.mocked(mockResultsDetailPresenter.present).mockReturnValue(mockViewModel as RaceResultsDetailViewModel);
await getRaceResults(raceId);
// Act
const result = await service.getResultsDetail(raceId);
expect(presentRaceResultsDetail).toHaveBeenCalledWith(mockDto, undefined);
// Assert
expect(mockApiClient.getResultsDetail).toHaveBeenCalledWith(raceId);
expect(mockResultsDetailPresenter.present).toHaveBeenCalledWith(mockDto, undefined);
expect(result).toEqual(mockViewModel);
});
it('should propagate errors from API client', async () => {
// Arrange
const raceId = 'race-123';
const error = new Error('API Error');
vi.mocked(mockApiClient.getResultsDetail).mockRejectedValue(error);
// Act & Assert
await expect(service.getResultsDetail(raceId)).rejects.toThrow('API Error');
expect(mockApiClient.getResultsDetail).toHaveBeenCalledWith(raceId);
expect(mockResultsDetailPresenter.present).not.toHaveBeenCalled();
});
});
describe('getRaceSOF', () => {
it('should call API and return DTO directly', async () => {
describe('getWithSOF', () => {
it('should fetch race with SOF and transform via presenter', async () => {
// Arrange
const raceId = 'race-123';
const mockDto: RaceWithSOFDto = {
id: 'race-1',
name: 'Test Race',
sof: 1500,
// ... other fields
} as RaceWithSOFDto;
id: raceId,
track: 'Spa-Francorchamps',
strengthOfField: 2500,
};
const mockViewModel: RaceWithSOFViewModel = {
id: raceId,
track: 'Spa-Francorchamps',
strengthOfField: 2500,
};
vi.mocked(mockApiClient.getWithSOF).mockResolvedValue(mockDto);
vi.mocked(mockSOFPresenter.present).mockReturnValue(mockViewModel);
// Act
const result = await service.getWithSOF(raceId);
// Assert
expect(mockApiClient.getWithSOF).toHaveBeenCalledWith(raceId);
expect(mockSOFPresenter.present).toHaveBeenCalledWith(mockDto);
expect(result).toEqual(mockViewModel);
});
it('should handle null strengthOfField', async () => {
// Arrange
const raceId = 'race-123';
const mockDto: RaceWithSOFDto = {
id: raceId,
track: 'Spa-Francorchamps',
strengthOfField: null,
};
const mockViewModel: RaceWithSOFViewModel = {
id: raceId,
track: 'Spa-Francorchamps',
strengthOfField: null,
};
vi.mocked(api.races.getWithSOF).mockResolvedValue(mockDto);
vi.mocked(mockApiClient.getWithSOF).mockResolvedValue(mockDto);
vi.mocked(mockSOFPresenter.present).mockReturnValue(mockViewModel);
const result = await getRaceSOF(raceId);
// Act
const result = await service.getWithSOF(raceId);
expect(api.races.getWithSOF).toHaveBeenCalledWith(raceId);
expect(result).toBe(mockDto);
// Assert
expect(mockApiClient.getWithSOF).toHaveBeenCalledWith(raceId);
expect(mockSOFPresenter.present).toHaveBeenCalledWith(mockDto);
expect(result).toEqual(mockViewModel);
});
it('should propagate errors from API client', async () => {
// Arrange
const raceId = 'race-123';
const error = new Error('SOF calculation failed');
vi.mocked(mockApiClient.getWithSOF).mockRejectedValue(error);
// Act & Assert
await expect(service.getWithSOF(raceId)).rejects.toThrow('SOF calculation failed');
expect(mockApiClient.getWithSOF).toHaveBeenCalledWith(raceId);
expect(mockSOFPresenter.present).not.toHaveBeenCalled();
});
});
describe('importRaceResults', () => {
it('should call API with correct parameters and return result', async () => {
const mockInput = { results: [] };
const mockSummary: ImportRaceResultsSummaryDto = {
totalImported: 10,
errors: [],
describe('importResults', () => {
it('should import race results and transform via presenter', async () => {
// Arrange
const raceId = 'race-123';
const input = {
sessionId: 'session-456',
results: [
{ position: 1, driverId: 'driver-1', finishTime: 120000 },
{ position: 2, driverId: 'driver-2', finishTime: 121000 },
],
};
const mockDto: ImportRaceResultsSummaryDto = {
success: true,
raceId,
driversProcessed: 2,
resultsRecorded: 2,
};
const mockViewModel: ImportRaceResultsSummaryViewModel = {
success: true,
raceId,
driversProcessed: 2,
resultsRecorded: 2,
};
vi.mocked(mockApiClient.importResults).mockResolvedValue(mockDto);
vi.mocked(mockImportPresenter.present).mockReturnValue(mockViewModel);
// Act
const result = await service.importResults(raceId, input);
// Assert
expect(mockApiClient.importResults).toHaveBeenCalledWith(raceId, input);
expect(mockImportPresenter.present).toHaveBeenCalledWith(mockDto);
expect(result).toEqual(mockViewModel);
});
it('should handle import with errors', async () => {
// Arrange
const raceId = 'race-123';
const input = { sessionId: 'session-456', results: [] };
const mockDto: ImportRaceResultsSummaryDto = {
success: false,
raceId,
driversProcessed: 5,
resultsRecorded: 3,
errors: ['Driver not found: driver-99', 'Invalid time for driver-88'],
};
const mockViewModel: ImportRaceResultsSummaryViewModel = {
success: false,
raceId,
driversProcessed: 5,
resultsRecorded: 3,
errors: ['Driver not found: driver-99', 'Invalid time for driver-88'],
};
vi.mocked(api.races.importResults).mockResolvedValue(mockSummary);
vi.mocked(mockApiClient.importResults).mockResolvedValue(mockDto);
vi.mocked(mockImportPresenter.present).mockReturnValue(mockViewModel);
const result = await importRaceResults(raceId, mockInput);
// Act
const result = await service.importResults(raceId, input);
expect(api.races.importResults).toHaveBeenCalledWith(raceId, mockInput);
expect(result).toBe(mockSummary);
// Assert
expect(mockApiClient.importResults).toHaveBeenCalledWith(raceId, input);
expect(mockImportPresenter.present).toHaveBeenCalledWith(mockDto);
expect(result).toEqual(mockViewModel);
expect(result.errors).toHaveLength(2);
});
it('should propagate errors from API client', async () => {
// Arrange
const raceId = 'race-123';
const input = { sessionId: 'session-456', results: [] };
const error = new Error('Import failed');
vi.mocked(mockApiClient.importResults).mockRejectedValue(error);
// Act & Assert
await expect(service.importResults(raceId, input)).rejects.toThrow('Import failed');
expect(mockApiClient.importResults).toHaveBeenCalledWith(raceId, input);
expect(mockImportPresenter.present).not.toHaveBeenCalled();
});
});
});

View File

@@ -1,46 +1,47 @@
import { api as api } from '../../api';
import { RaceResultsDetailPresenter, RaceWithSOFPresenter, ImportRaceResultsPresenter } from '../../presenters';
import { RaceResultsDetailViewModel } from '../../view-models';
import { RacesApiClient } from '../../api/races/RacesApiClient';
import { RaceResultsDetailPresenter } from '../../presenters/RaceResultsDetailPresenter';
import { RaceWithSOFPresenter } from '../../presenters/RaceWithSOFPresenter';
import type { RaceWithSOFViewModel } from '../../presenters/RaceWithSOFPresenter';
import { ImportRaceResultsPresenter } from '../../presenters/ImportRaceResultsPresenter';
import type { ImportRaceResultsSummaryViewModel } from '../../presenters/ImportRaceResultsPresenter';
import type { RaceResultsDetailViewModel } from '../../view-models/RaceResultsDetailViewModel';
import type { ImportRaceResultsInputDto } from '../../dtos';
/**
* Race Results Service
*
* Orchestrates race results operations including viewing, importing, and SOF calculations.
* All dependencies are injected via constructor.
*/
export class RaceResultsService {
constructor(
private readonly apiClient = api.races,
private readonly resultsDetailPresenter = new RaceResultsDetailPresenter(),
private readonly sofPresenter = new RaceWithSOFPresenter(),
private readonly importPresenter = new ImportRaceResultsPresenter()
private readonly apiClient: RacesApiClient,
private readonly resultsDetailPresenter: RaceResultsDetailPresenter,
private readonly sofPresenter: RaceWithSOFPresenter,
private readonly importPresenter: ImportRaceResultsPresenter
) {}
async importRaceResults(raceId: string, input: any): Promise<any> {
const dto = await this.apiClient.importResults(raceId, input);
return this.importPresenter.present(dto);
}
/**
* Get race results detail with presentation transformation
*/
async getResultsDetail(raceId: string, currentUserId?: string): Promise<RaceResultsDetailViewModel> {
const dto = await this.apiClient.getResultsDetail(raceId);
return this.resultsDetailPresenter.present(dto, currentUserId);
}
async getWithSOF(raceId: string): Promise<any> {
/**
* Get race with strength of field calculation
*/
async getWithSOF(raceId: string): Promise<RaceWithSOFViewModel> {
const dto = await this.apiClient.getWithSOF(raceId);
return this.sofPresenter.present(dto);
}
}
// Singleton instance
export const raceResultsService = new RaceResultsService();
// Backward compatibility functions
export async function getRaceResults(
raceId: string,
currentUserId?: string
): Promise<RaceResultsDetailViewModel> {
return raceResultsService.getResultsDetail(raceId, currentUserId);
}
export async function getRaceSOF(raceId: string): Promise<any> {
return raceResultsService.getWithSOF(raceId);
}
export async function importRaceResults(raceId: string, input: any): Promise<any> {
return raceResultsService.importRaceResults(raceId, input);
/**
* Import race results and get summary
*/
async importResults(raceId: string, input: ImportRaceResultsInputDto): Promise<ImportRaceResultsSummaryViewModel> {
const dto = await this.apiClient.importResults(raceId, input);
return this.importPresenter.present(dto);
}
}

View File

@@ -0,0 +1,235 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { RaceService } from './RaceService';
import { RacesApiClient } from '../../api/races/RacesApiClient';
import { RaceDetailPresenter } from '../../presenters/RaceDetailPresenter';
import type { RaceDetailDto, RacesPageDataDto, RaceStatsDto } from '../../dtos';
import type { RaceDetailViewModel } from '../../view-models/RaceDetailViewModel';
describe('RaceService', () => {
let mockApiClient: RacesApiClient;
let mockPresenter: RaceDetailPresenter;
let service: RaceService;
beforeEach(() => {
mockApiClient = {
getDetail: vi.fn(),
getPageData: vi.fn(),
getTotal: vi.fn(),
} as unknown as RacesApiClient;
mockPresenter = {
present: vi.fn(),
} as unknown as RaceDetailPresenter;
service = new RaceService(mockApiClient, mockPresenter);
});
describe('getRaceDetail', () => {
it('should fetch race detail from API and transform via presenter', async () => {
// Arrange
const mockDto: RaceDetailDto = {
race: {
id: 'race-1',
name: 'Test Race',
scheduledTime: '2025-12-17T20:00:00Z',
status: 'upcoming',
trackName: 'Spa-Francorchamps',
carClasses: ['GT3'],
},
league: null,
entryList: [],
registration: {
isRegistered: false,
canRegister: true,
},
userResult: null,
};
const mockViewModel: RaceDetailViewModel = {
race: mockDto.race,
league: mockDto.league,
entryList: mockDto.entryList,
registration: mockDto.registration,
userResult: mockDto.userResult,
isRegistered: false,
canRegister: true,
raceStatusDisplay: 'Upcoming',
formattedScheduledTime: expect.any(String),
entryCount: 0,
hasResults: false,
registrationStatusMessage: 'You can register for this race',
} as unknown as RaceDetailViewModel;
vi.mocked(mockApiClient.getDetail).mockResolvedValue(mockDto);
vi.mocked(mockPresenter.present).mockReturnValue(mockViewModel);
// Act
const result = await service.getRaceDetail('race-1', 'driver-1');
// Assert
expect(mockApiClient.getDetail).toHaveBeenCalledWith('race-1', 'driver-1');
expect(mockApiClient.getDetail).toHaveBeenCalledTimes(1);
expect(mockPresenter.present).toHaveBeenCalledWith(mockDto);
expect(mockPresenter.present).toHaveBeenCalledTimes(1);
expect(result).toBe(mockViewModel);
});
it('should propagate API client errors', async () => {
// Arrange
const error = new Error('API Error: Race not found');
vi.mocked(mockApiClient.getDetail).mockRejectedValue(error);
// Act & Assert
await expect(
service.getRaceDetail('invalid-race', 'driver-1')
).rejects.toThrow('API Error: Race not found');
expect(mockApiClient.getDetail).toHaveBeenCalledWith('invalid-race', 'driver-1');
expect(mockPresenter.present).not.toHaveBeenCalled();
});
it('should propagate presenter errors', async () => {
// Arrange
const mockDto: RaceDetailDto = {
race: null,
league: null,
entryList: [],
registration: {
isRegistered: false,
canRegister: false,
},
userResult: null,
};
const error = new Error('Presenter Error: Invalid DTO structure');
vi.mocked(mockApiClient.getDetail).mockResolvedValue(mockDto);
vi.mocked(mockPresenter.present).mockImplementation(() => {
throw error;
});
// Act & Assert
await expect(
service.getRaceDetail('race-1', 'driver-1')
).rejects.toThrow('Presenter Error: Invalid DTO structure');
expect(mockApiClient.getDetail).toHaveBeenCalledWith('race-1', 'driver-1');
expect(mockPresenter.present).toHaveBeenCalledWith(mockDto);
});
});
describe('getRacesPageData', () => {
it('should fetch races page data from API', async () => {
// Arrange
const mockPageData: RacesPageDataDto = {
races: [
{
id: 'race-1',
name: 'Test Race 1',
scheduledTime: '2025-12-17T20:00:00Z',
trackName: 'Spa-Francorchamps',
},
{
id: 'race-2',
name: 'Test Race 2',
scheduledTime: '2025-12-18T20:00:00Z',
trackName: 'Monza',
},
],
totalCount: 2,
};
vi.mocked(mockApiClient.getPageData).mockResolvedValue(mockPageData);
// Act
const result = await service.getRacesPageData();
// Assert
expect(mockApiClient.getPageData).toHaveBeenCalledTimes(1);
expect(result).toBe(mockPageData);
});
it('should propagate API client errors', async () => {
// Arrange
const error = new Error('API Error: Failed to fetch page data');
vi.mocked(mockApiClient.getPageData).mockRejectedValue(error);
// Act & Assert
await expect(service.getRacesPageData()).rejects.toThrow(
'API Error: Failed to fetch page data'
);
expect(mockApiClient.getPageData).toHaveBeenCalledTimes(1);
});
});
describe('getRacesTotal', () => {
it('should fetch race statistics from API', async () => {
// Arrange
const mockStats: RaceStatsDto = {
total: 42,
upcoming: 10,
live: 2,
finished: 30,
};
vi.mocked(mockApiClient.getTotal).mockResolvedValue(mockStats);
// Act
const result = await service.getRacesTotal();
// Assert
expect(mockApiClient.getTotal).toHaveBeenCalledTimes(1);
expect(result).toBe(mockStats);
});
it('should propagate API client errors', async () => {
// Arrange
const error = new Error('API Error: Failed to fetch statistics');
vi.mocked(mockApiClient.getTotal).mockRejectedValue(error);
// Act & Assert
await expect(service.getRacesTotal()).rejects.toThrow(
'API Error: Failed to fetch statistics'
);
expect(mockApiClient.getTotal).toHaveBeenCalledTimes(1);
});
});
describe('Constructor Dependency Injection', () => {
it('should require apiClient and raceDetailPresenter', () => {
// This test verifies the constructor signature
expect(() => {
new RaceService(mockApiClient, mockPresenter);
}).not.toThrow();
});
it('should use injected dependencies', async () => {
// Arrange
const customApiClient = {
getDetail: vi.fn().mockResolvedValue({
race: null,
league: null,
entryList: [],
registration: { isRegistered: false, canRegister: false },
userResult: null,
}),
getPageData: vi.fn(),
getTotal: vi.fn(),
} as unknown as RacesApiClient;
const customPresenter = {
present: vi.fn().mockReturnValue({} as RaceDetailViewModel),
} as unknown as RaceDetailPresenter;
const customService = new RaceService(customApiClient, customPresenter);
// Act
await customService.getRaceDetail('race-1', 'driver-1');
// Assert
expect(customApiClient.getDetail).toHaveBeenCalledWith('race-1', 'driver-1');
expect(customPresenter.present).toHaveBeenCalled();
});
});
});

View File

@@ -1,48 +1,44 @@
import { api as api } from '../../api';
import { RaceDetailPresenter } from '../../presenters';
import { RaceDetailViewModel } from '../../view-models';
import { RacesApiClient } from '../../api/races/RacesApiClient';
import { RaceDetailPresenter } from '../../presenters/RaceDetailPresenter';
import type { RaceDetailViewModel } from '../../view-models/RaceDetailViewModel';
import type { RacesPageDataDto, RaceStatsDto } from '../../dtos';
/**
* Race Service
*
* Orchestrates race operations by coordinating API calls and presentation logic.
* All dependencies are injected via constructor.
*/
export class RaceService {
constructor(
private readonly apiClient = api.races,
private readonly presenter = new RaceDetailPresenter()
private readonly apiClient: RacesApiClient,
private readonly raceDetailPresenter: RaceDetailPresenter
) {}
/**
* Get race detail with presentation transformation
*/
async getRaceDetail(
raceId: string,
driverId: string
): Promise<RaceDetailViewModel> {
const dto = await this.apiClient.getDetail(raceId, driverId);
return this.presenter.present(dto);
return this.raceDetailPresenter.present(dto);
}
async getRacesPageData(): Promise<any> {
const dto = await this.apiClient.getPageData();
// TODO: use presenter
return dto;
/**
* Get races page data
* TODO: Add presenter transformation when presenter is available
*/
async getRacesPageData(): Promise<RacesPageDataDto> {
return this.apiClient.getPageData();
}
async getRacesTotal(): Promise<any> {
const dto = await this.apiClient.getTotal();
return dto;
/**
* Get total races statistics
* TODO: Add presenter transformation when presenter is available
*/
async getRacesTotal(): Promise<RaceStatsDto> {
return this.apiClient.getTotal();
}
}
// Singleton instance
export const raceService = new RaceService();
// Backward compatibility functions
export async function getRaceDetail(
raceId: string,
driverId: string
): Promise<RaceDetailViewModel> {
return raceService.getRaceDetail(raceId, driverId);
}
export async function getRacesPageData(): Promise<any> {
return raceService.getRacesPageData();
}
export async function getRacesTotal(): Promise<any> {
return raceService.getRacesTotal();
}

View File

@@ -1,7 +0,0 @@
// Export the class-based service
export { RaceService, raceService } from './RaceService';
export { RaceResultsService, raceResultsService } from './RaceResultsService';
// Export backward compatibility functions
export { getRaceDetail, getRacesPageData, getRacesTotal } from './RaceService';
export { getRaceResults, getRaceSOF, importRaceResults } from './RaceResultsService';