website refactor

apps/website/hooks/league/useLeagueScheduleAdminPageData.ts

@@ -5,7 +5,6 @@ import { LeagueRoleUtility } from '@/lib/utilities/LeagueRoleUtility';
 import { LeagueAdminScheduleViewModel } from '@/lib/view-models/LeagueAdminScheduleViewModel';
 import { LeagueScheduleRaceViewModel } from '@/lib/view-models/LeagueScheduleViewModel';
 import { LeagueSeasonSummaryViewModel } from '@/lib/view-models/LeagueSeasonSummaryViewModel';
-import type { LeagueScheduleDTO } from '@/lib/types/generated/LeagueScheduleDTO';
 import type { RaceDTO } from '@/lib/types/generated/RaceDTO';
 import type { LeagueSeasonSummaryDTO } from '@/lib/types/generated/LeagueSeasonSummaryDTO';
 
@@ -13,14 +12,13 @@ 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,
@@ -49,7 +47,11 @@ export function useLeagueSeasons(leagueId: string, isAdmin: boolean) {
   return usePageData({
     queryKey: ['leagueSeasons', leagueId],
     queryFn: async (): Promise<LeagueSeasonSummaryViewModel[]> => {
-      const dtos = await leagueService.getLeagueSeasonSummaries(leagueId);
+      const result = await leagueService.getLeagueSeasonSummaries(leagueId);
+      if (result.isErr()) {
+        throw new Error(result.getError().message);
+      }
+      const dtos = result.unwrap();
       return dtos.map((dto: LeagueSeasonSummaryDTO) => new LeagueSeasonSummaryViewModel(dto));
     },
     enabled: !!leagueId && !!isAdmin,
@@ -62,7 +64,11 @@ export function useLeagueAdminSchedule(leagueId: string, selectedSeasonId: strin
   return usePageData({
     queryKey: ['adminSchedule', leagueId, selectedSeasonId],
     queryFn: async (): Promise<LeagueAdminScheduleViewModel> => {
-      const dto = await leagueService.getAdminSchedule(leagueId, selectedSeasonId);
+      const result = await leagueService.getAdminSchedule(leagueId, selectedSeasonId);
+      if (result.isErr()) {
+        throw new Error(result.getError().message);
+      }
+      const dto = result.unwrap();
       const races = dto.races.map(mapRaceDtoToViewModel);
       return new LeagueAdminScheduleViewModel({
         seasonId: dto.seasonId,
@@ -72,4 +78,4 @@ export function useLeagueAdminSchedule(leagueId: string, selectedSeasonId: strin
     },
     enabled: !!leagueId && !!selectedSeasonId && !!isAdmin,
   });
-}
+}