website cleanup

apps/website/lib/services/landing/LandingService.ts

@@ -1,31 +1,17 @@
 import { RacesApiClient } from '@/lib/api/races/RacesApiClient';
 import { LeaguesApiClient } from '@/lib/api/leagues/LeaguesApiClient';
 import { TeamsApiClient } from '@/lib/api/teams/TeamsApiClient';
+import type { AllLeaguesWithCapacityDTO } from '@/lib/types/generated/AllLeaguesWithCapacityDTO';
+import type { GetAllTeamsOutputDTO } from '@/lib/types/generated/GetAllTeamsOutputDTO';
+import type { RacesPageDataDTO } from '@/lib/types/generated/RacesPageDataDTO';
 import type { LeagueSummaryDTO } from '@/lib/types/generated/LeagueSummaryDTO';
-import type { GetAllTeamsOutputDTO, TeamListItemDTO } from '@/lib/types/generated/GetAllTeamsOutputDTO';
+import type { TeamListItemDTO } from '@/lib/types/generated/TeamListItemDTO';
 import { RacesPageViewModel } from '@/lib/view-models/RacesPageViewModel';
 import { HomeDiscoveryViewModel } from '@/lib/view-models/HomeDiscoveryViewModel';
 import { LeagueCardViewModel } from '@/lib/view-models/LeagueCardViewModel';
 import { TeamCardViewModel } from '@/lib/view-models/TeamCardViewModel';
 import { UpcomingRaceCardViewModel } from '@/lib/view-models/UpcomingRaceCardViewModel';
 
-// DTO matching backend RacesPageDataDTO for discovery usage
-interface RacesPageDataDTO {
-  races: {
-    id: string;
-    track: string;
-    car: string;
-    scheduledAt: string;
-    status: string;
-    leagueId: string;
-    leagueName: string;
-    strengthOfField: number | null;
-    isUpcoming: boolean;
-    isLive: boolean;
-    isPast: boolean;
-  }[];
-}
-
 export class LandingService {
   constructor(
     private readonly racesApi: RacesApiClient,
@@ -36,21 +22,21 @@ export class LandingService {
   async getHomeDiscovery(): Promise<HomeDiscoveryViewModel> {
     const [racesDto, leaguesDto, teamsDto] = await Promise.all([
       this.racesApi.getPageData() as Promise<RacesPageDataDTO>,
-      this.leaguesApi.getAllWithCapacity() as Promise<{ leagues: LeagueSummaryDTO[] }>,
-      this.teamsApi.getAll(),
+      this.leaguesApi.getAllWithCapacity() as Promise<AllLeaguesWithCapacityDTO>,
+      this.teamsApi.getAll() as Promise<GetAllTeamsOutputDTO>,
     ]);
 
     const racesVm = new RacesPageViewModel(racesDto);
 
     const topLeagues = leaguesDto.leagues.slice(0, 4).map(
-      league => new LeagueCardViewModel({
+      (league: LeagueSummaryDTO) => new LeagueCardViewModel({
         id: league.id,
         name: league.name,
         description: 'Competitive iRacing league',
       }),
     );
 
-    const teams = (teamsDto as GetAllTeamsOutputDTO).teams.slice(0, 4).map(
+    const teams = teamsDto.teams.slice(0, 4).map(
       (team: TeamListItemDTO) =>
         new TeamCardViewModel({
           id: team.id,