website refactor

apps/website/hooks/league/useLeagueSchedule.ts

@@ -3,21 +3,19 @@ import { useInject } from '@/lib/di/hooks/useInject';
 import { LEAGUE_SERVICE_TOKEN } from '@/lib/di/tokens';
 import { enhanceQueryResult } from '@/lib/di/hooks/useReactQueryWithApiError';
 import { LeagueScheduleViewModel, LeagueScheduleRaceViewModel } from '@/lib/view-models/LeagueScheduleViewModel';
-import type { LeagueScheduleDTO } from '@/lib/types/generated/LeagueScheduleDTO';
 import type { RaceDTO } from '@/lib/types/generated/RaceDTO';
 
 function mapRaceDtoToViewModel(race: RaceDTO): LeagueScheduleRaceViewModel {
   const scheduledAt = race.date ? new Date(race.date) : new Date(0);
   const now = new Date();
   const isPast = scheduledAt.getTime() < now.getTime();
-  const isUpcoming = !isPast;
 
   return {
     id: race.id,
     name: race.name,
     scheduledAt,
     isPast,
-    isUpcoming,
+    isUpcoming: !isPast,
     status: isPast ? 'completed' : 'scheduled',
     track: undefined,
     car: undefined,
@@ -32,7 +30,11 @@ export function useLeagueSchedule(leagueId: string) {
   const queryResult = useQuery({
     queryKey: ['leagueSchedule', leagueId],
     queryFn: async (): Promise<LeagueScheduleViewModel> => {
-      const dto = await leagueService.getLeagueSchedule(leagueId);
+      const result = await leagueService.getLeagueSchedule(leagueId);
+      if (result.isErr()) {
+        throw new Error(result.getError().message);
+      }
+      const dto = result.unwrap();
       const races = dto.races.map(mapRaceDtoToViewModel);
       return new LeagueScheduleViewModel(races);
     },
@@ -40,4 +42,4 @@ export function useLeagueSchedule(leagueId: string) {
   });
 
   return enhanceQueryResult(queryResult);
-}
+}