wip

apps/website/components/leagues/LeagueSchedule.tsx

@@ -3,13 +3,13 @@
 import { useState, useEffect } from 'react';
 import { useRouter } from 'next/navigation';
 import { Race } from '@gridpilot/racing/domain/entities/Race';
-import { getRaceRepository } from '@/lib/di-container';
 import {
-  getCurrentDriverId,
-  isRegistered,
-  registerForRace,
-  withdrawFromRace,
-} from '@/lib/racingLegacyFacade';
+  getRaceRepository,
+  getIsDriverRegisteredForRaceQuery,
+  getRegisterForRaceUseCase,
+  getWithdrawFromRaceUseCase,
+} from '@/lib/di-container';
+import { useEffectiveDriverId } from '@/lib/currentDriver';
 
 interface LeagueScheduleProps {
   leagueId: string;
@@ -23,7 +23,7 @@ export default function LeagueSchedule({ leagueId }: LeagueScheduleProps) {
   const [registrationStates, setRegistrationStates] = useState<Record<string, boolean>>({});
   const [processingRace, setProcessingRace] = useState<string | null>(null);
 
-  const currentDriverId = getCurrentDriverId();
+  const currentDriverId = useEffectiveDriverId();
 
   useEffect(() => {
     loadRaces();
@@ -35,15 +35,24 @@ export default function LeagueSchedule({ leagueId }: LeagueScheduleProps) {
       const raceRepo = getRaceRepository();
       const allRaces = await raceRepo.findAll();
       const leagueRaces = allRaces
-        .filter(race => race.leagueId === leagueId)
-        .sort((a, b) => new Date(a.scheduledAt).getTime() - new Date(b.scheduledAt).getTime());
+        .filter((race) => race.leagueId === leagueId)
+        .sort(
+          (a, b) =>
+            new Date(a.scheduledAt).getTime() - new Date(b.scheduledAt).getTime(),
+        );
       setRaces(leagueRaces);
 
-      // Load registration states
+      const isRegisteredQuery = getIsDriverRegisteredForRaceQuery();
       const states: Record<string, boolean> = {};
-      leagueRaces.forEach(race => {
-        states[race.id] = isRegistered(race.id, currentDriverId);
-      });
+      await Promise.all(
+        leagueRaces.map(async (race) => {
+          const registered = await isRegisteredQuery.execute({
+            raceId: race.id,
+            driverId: currentDriverId,
+          });
+          states[race.id] = registered;
+        }),
+      );
       setRegistrationStates(states);
     } catch (error) {
       console.error('Failed to load races:', error);
@@ -63,8 +72,13 @@ export default function LeagueSchedule({ leagueId }: LeagueScheduleProps) {
 
     setProcessingRace(race.id);
     try {
-      registerForRace(race.id, currentDriverId, leagueId);
-      setRegistrationStates(prev => ({ ...prev, [race.id]: true }));
+      const useCase = getRegisterForRaceUseCase();
+      await useCase.execute({
+        raceId: race.id,
+        leagueId,
+        driverId: currentDriverId,
+      });
+      setRegistrationStates((prev) => ({ ...prev, [race.id]: true }));
     } catch (err) {
       alert(err instanceof Error ? err.message : 'Failed to register');
     } finally {
@@ -83,8 +97,12 @@ export default function LeagueSchedule({ leagueId }: LeagueScheduleProps) {
 
     setProcessingRace(race.id);
     try {
-      withdrawFromRace(race.id, currentDriverId);
-      setRegistrationStates(prev => ({ ...prev, [race.id]: false }));
+      const useCase = getWithdrawFromRaceUseCase();
+      await useCase.execute({
+        raceId: race.id,
+        driverId: currentDriverId,
+      });
+      setRegistrationStates((prev) => ({ ...prev, [race.id]: false }));
     } catch (err) {
       alert(err instanceof Error ? err.message : 'Failed to withdraw');
     } finally {