wip

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

@@ -40,11 +40,11 @@ import {
   getDriverRepository,
   getDriverStats,
   getAllDriverRankings,
-  getGetDriverTeamQuery,
+  getGetDriverTeamUseCase,
   getSocialRepository,
   getImageService,
-  getGetAllTeamsQuery,
-  getGetTeamMembersQuery,
+  getGetAllTeamsUseCase,
+  getGetTeamMembersUseCase,
 } from '@/lib/di-container';
 import { Driver, EntityMappers, type Team } from '@gridpilot/racing';
 import type { DriverDTO } from '@gridpilot/racing';
@@ -382,18 +382,23 @@ export default function DriverDetailPage({
       setDriver(driverDto);
 
       // Load team data
-      const teamQuery = getGetDriverTeamQuery();
-      const teamResult = await teamQuery.execute({ driverId });
-      setTeamData(teamResult);
+      const teamUseCase = getGetDriverTeamUseCase();
+      await teamUseCase.execute({ driverId });
+      const teamViewModel = teamUseCase.presenter.getViewModel();
+      setTeamData(teamViewModel.result);
 
       // Load ALL team memberships
-      const allTeamsQuery = getGetAllTeamsQuery();
-      const allTeams = await allTeamsQuery.execute();
-      const membershipsQuery = getGetTeamMembersQuery();
+      const allTeamsUseCase = getGetAllTeamsUseCase();
+      await allTeamsUseCase.execute();
+      const allTeamsViewModel = allTeamsUseCase.presenter.getViewModel();
+      const allTeams = allTeamsViewModel.teams;
+      const membershipsUseCase = getGetTeamMembersUseCase();
 
       const memberships: TeamMembershipInfo[] = [];
       for (const team of allTeams) {
-        const members = await membershipsQuery.execute({ teamId: team.id });
+        await membershipsUseCase.execute({ teamId: team.id });
+        const membersViewModel = membershipsUseCase.presenter.getViewModel();
+        const members = membersViewModel.members;
         const membership = members.find((m) => m.driverId === driverId);
         if (membership) {
           memberships.push({