wip

apps/website/app/races/[id]/page.tsx

@@ -8,15 +8,17 @@ import FeatureLimitationTooltip from '@/components/alpha/FeatureLimitationToolti
 import type { Race } from '@gridpilot/racing/domain/entities/Race';
 import type { League } from '@gridpilot/racing/domain/entities/League';
 import type { Driver } from '@gridpilot/racing/domain/entities/Driver';
-import { getRaceRepository, getLeagueRepository, getDriverRepository } from '@/lib/di-container';
 import {
-  getMembership,
-  getCurrentDriverId,
-  isRegistered,
-  registerForRace,
-  withdrawFromRace,
-  getRegisteredDrivers,
-} from '@/lib/racingLegacyFacade';
+  getRaceRepository,
+  getLeagueRepository,
+  getDriverRepository,
+  getGetRaceRegistrationsQuery,
+  getIsDriverRegisteredForRaceQuery,
+  getRegisterForRaceUseCase,
+  getWithdrawFromRaceUseCase,
+} from '@/lib/di-container';
+import { getMembership } from '@/lib/leagueMembership';
+import { useEffectiveDriverId } from '@/lib/currentDriver';
 import CompanionStatus from '@/components/alpha/CompanionStatus';
 import CompanionInstructions from '@/components/alpha/CompanionInstructions';
 import Breadcrumbs from '@/components/layout/Breadcrumbs';
@@ -36,7 +38,7 @@ export default function RaceDetailPage() {
   const [isUserRegistered, setIsUserRegistered] = useState(false);
   const [canRegister, setCanRegister] = useState(false);
 
-  const currentDriverId = getCurrentDriverId();
+  const currentDriverId = useEffectiveDriverId();
 
   const loadRaceData = async () => {
     try {
@@ -69,19 +71,22 @@ export default function RaceDetailPage() {
   const loadEntryList = async (raceId: string, leagueId: string) => {
     try {
       const driverRepo = getDriverRepository();
-      const registeredDriverIds = getRegisteredDrivers(raceId);
-      const drivers = await Promise.all(
-        registeredDriverIds.map((id: string) => driverRepo.findById(id))
-      );
-      setEntryList(
-        drivers.filter((d: Driver | null): d is Driver => d !== null)
-      );
 
-      // Check user registration status
-      const userIsRegistered = isRegistered(raceId, currentDriverId);
+      const raceRegistrationsQuery = getGetRaceRegistrationsQuery();
+      const registeredDriverIds = await raceRegistrationsQuery.execute({ raceId });
+
+      const drivers = await Promise.all(
+        registeredDriverIds.map((id: string) => driverRepo.findById(id)),
+      );
+      setEntryList(drivers.filter((d: Driver | null): d is Driver => d !== null));
+
+      const isRegisteredQuery = getIsDriverRegisteredForRaceQuery();
+      const userIsRegistered = await isRegisteredQuery.execute({
+        raceId,
+        driverId: currentDriverId,
+      });
       setIsUserRegistered(userIsRegistered);
 
-      // Check if user can register (is league member and race is upcoming)
       const membership = getMembership(leagueId, currentDriverId);
       const isUpcoming = race?.status === 'scheduled';
       setCanRegister(!!membership && membership.status === 'active' && !!isUpcoming);
@@ -128,7 +133,12 @@ export default function RaceDetailPage() {
 
     setRegistering(true);
     try {
-      registerForRace(race.id, currentDriverId, league.id);
+      const useCase = getRegisterForRaceUseCase();
+      await useCase.execute({
+        raceId: race.id,
+        leagueId: league.id,
+        driverId: currentDriverId,
+      });
       await loadEntryList(race.id, league.id);
     } catch (err) {
       alert(err instanceof Error ? err.message : 'Failed to register for race');
@@ -148,7 +158,11 @@ export default function RaceDetailPage() {
 
     setRegistering(true);
     try {
-      withdrawFromRace(race.id, currentDriverId);
+      const useCase = getWithdrawFromRaceUseCase();
+      await useCase.execute({
+        raceId: race.id,
+        driverId: currentDriverId,
+      });
       await loadEntryList(race.id, league.id);
     } catch (err) {
       alert(err instanceof Error ? err.message : 'Failed to withdraw from race');