diff --git a/src/app/api/f1/championships/route.spec.ts b/src/app/api/f1/championships/route.spec.ts index bc8ba04..68fba27 100644 --- a/src/app/api/f1/championships/route.spec.ts +++ b/src/app/api/f1/championships/route.spec.ts @@ -13,7 +13,7 @@ describe('GET /api/f1/championships', () => { const upstreamPayload = { data: { year: 2024, - races: [], + events: [], drivers: [], }, }; diff --git a/src/components/championships/ChampionshipsExplorer.spec.tsx b/src/components/championships/ChampionshipsExplorer.spec.tsx index 7edf8e6..4b64df5 100644 --- a/src/components/championships/ChampionshipsExplorer.spec.tsx +++ b/src/components/championships/ChampionshipsExplorer.spec.tsx @@ -26,7 +26,7 @@ const yearPayload = { availableYears: [2024, 2023, 2022], data: { year: 2024, - races: [ + events: [ { round: 1, name: 'Bahrain GP' }, { round: 2, name: 'Saudi Arabian GP' }, ], diff --git a/src/components/championships/PointsProgressChart.tsx b/src/components/championships/PointsProgressChart.tsx index 301be44..815c519 100644 --- a/src/components/championships/PointsProgressChart.tsx +++ b/src/components/championships/PointsProgressChart.tsx @@ -92,9 +92,9 @@ function CustomLegend({ } function toChartData(progress: ChampionshipProgress): ChartRow[] { - return progress.races.map((race, index) => { + return progress.events.map((event, index) => { const row: ChartRow = { - round: `R${race.round}`, + round: `R${event.round}`, }; for (const competitor of progress.series) { @@ -106,7 +106,7 @@ function toChartData(progress: ChampionshipProgress): ChartRow[] { } function getSortedSeries(series: ChampionshipSeries[]): ChampionshipSeries[] { - // Sort by final race points (last element) in descending order + // Sort by final event points (last element) in descending order return [...series].sort((a, b) => { const aFinalPoints = a.points[a.points.length - 1] ?? 0; const bFinalPoints = b.points[b.points.length - 1] ?? 0; diff --git a/src/components/championships/championshipTransforms.ts b/src/components/championships/championshipTransforms.ts index cb06387..3c96d45 100644 --- a/src/components/championships/championshipTransforms.ts +++ b/src/components/championships/championshipTransforms.ts @@ -15,7 +15,7 @@ export function toDriversProgress(data: ChampionshipYearData): ChampionshipProgr return { year: data.year, category: 'drivers', - races: data.races, + events: data.events, series, }; } @@ -23,7 +23,7 @@ export function toDriversProgress(data: ChampionshipYearData): ChampionshipProgr export function toConstructorsProgress( data: ChampionshipYearData, ): ChampionshipProgress { - const rounds = data.races.length; + const rounds = data.events.length; const constructorMap = new Map< string, { id: string; name: string; color: string; points: number[]; total: number } @@ -73,7 +73,7 @@ export function toConstructorsProgress( return { year: data.year, category: 'constructors', - races: data.races, + events: data.events, series, }; } diff --git a/src/lib/services/f1DataClient.spec.ts b/src/lib/services/f1DataClient.spec.ts index f395155..3cb8205 100644 --- a/src/lib/services/f1DataClient.spec.ts +++ b/src/lib/services/f1DataClient.spec.ts @@ -74,7 +74,7 @@ describe('f1DataClient cache', () => { availableYears: [2024], data: { year: 2024, - races: [], + events: [], drivers: [], }, }; diff --git a/src/types/championship.ts b/src/types/championship.ts index ae1c9bf..8b01bb4 100644 --- a/src/types/championship.ts +++ b/src/types/championship.ts @@ -1,6 +1,6 @@ export type ChampionshipCategory = 'drivers' | 'constructors'; -export interface ChampionshipRace { +export interface ChampionshipEvent { round: number; name: string; } @@ -29,14 +29,14 @@ export interface ChampionshipDriverSeries { export interface ChampionshipYearData { year: number; - races: ChampionshipRace[]; + events: ChampionshipEvent[]; drivers: ChampionshipDriverSeries[]; } export interface ChampionshipProgress { year: number; category: ChampionshipCategory; - races: ChampionshipRace[]; + events: ChampionshipEvent[]; series: ChampionshipSeries[]; }