wip

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

@@ -14,8 +14,8 @@ import TeamStandings from '@/components/teams/TeamStandings';
 import TeamAdmin from '@/components/teams/TeamAdmin';
 import JoinTeamButton from '@/components/teams/JoinTeamButton';
 import {
-  getGetTeamDetailsQuery,
-  getGetTeamMembersQuery,
+  getGetTeamDetailsUseCase,
+  getGetTeamMembersUseCase,
   getTeamMembershipRepository,
 } from '@/lib/di-container';
 import { useEffectiveDriverId } from '@/lib/currentDriver';
@@ -39,11 +39,15 @@ export default function TeamDetailPage() {
   const loadTeamData = useCallback(async () => {
     setLoading(true);
     try {
-      const detailsQuery = getGetTeamDetailsQuery();
-      const membersQuery = getGetTeamMembersQuery();
+      const detailsUseCase = getGetTeamDetailsUseCase();
+      const membersUseCase = getGetTeamMembersUseCase();
 
-      const details = await detailsQuery.execute({ teamId, driverId: currentDriverId });
-      const teamMemberships = await membersQuery.execute({ teamId });
+      await detailsUseCase.execute({ teamId, driverId: currentDriverId });
+      const detailsViewModel = detailsUseCase.presenter.getViewModel();
+      
+      await membersUseCase.execute({ teamId });
+      const membersViewModel = membersUseCase.presenter.getViewModel();
+      const teamMemberships = membersViewModel.members;
 
       const adminStatus =
         teamMemberships.some(
@@ -52,7 +56,7 @@ export default function TeamDetailPage() {
             (m.role === 'owner' || m.role === 'manager'),
         ) ?? false;
 
-      setTeam(details.team);
+      setTeam(detailsViewModel.team);
       setMemberships(teamMemberships);
       setIsAdmin(adminStatus);
     } finally {

apps/website/app/teams/leaderboard/page.tsx

@@ -22,7 +22,7 @@ import {
 import Button from '@/components/ui/Button';
 import Input from '@/components/ui/Input';
 import Heading from '@/components/ui/Heading';
-import { getGetAllTeamsQuery, getGetTeamMembersQuery, getDriverStats } from '@/lib/di-container';
+import { getGetAllTeamsUseCase, getGetTeamMembersUseCase, getDriverStats } from '@/lib/di-container';
 import type { Team } from '@gridpilot/racing';
 
 // ============================================================================
@@ -260,15 +260,19 @@ export default function TeamLeaderboardPage() {
 
   const loadTeams = async () => {
     try {
-      const allTeamsQuery = getGetAllTeamsQuery();
-      const teamMembersQuery = getGetTeamMembersQuery();
+      const allTeamsUseCase = getGetAllTeamsUseCase();
+      const teamMembersUseCase = getGetTeamMembersUseCase();
 
-      const allTeams = await allTeamsQuery.execute();
+      await allTeamsUseCase.execute();
+      const allTeamsViewModel = allTeamsUseCase.presenter.getViewModel();
+      const allTeams = allTeamsViewModel.teams;
       const teamData: TeamDisplayData[] = [];
 
       await Promise.all(
         allTeams.map(async (team: Team) => {
-          const memberships = await teamMembersQuery.execute({ teamId: team.id });
+          await teamMembersUseCase.execute({ teamId: team.id });
+          const membershipsViewModel = teamMembersUseCase.presenter.getViewModel();
+          const memberships = membershipsViewModel.members;
           const memberCount = memberships.length;
 
           let ratingSum = 0;

apps/website/app/teams/page.tsx

@@ -28,30 +28,14 @@ import Card from '@/components/ui/Card';
 import Input from '@/components/ui/Input';
 import Heading from '@/components/ui/Heading';
 import CreateTeamForm from '@/components/teams/CreateTeamForm';
-import { getGetAllTeamsQuery, getGetTeamMembersQuery, getDriverStats } from '@/lib/di-container';
-import type { Team } from '@gridpilot/racing';
+import { getGetTeamsLeaderboardUseCase } from '@/lib/di-container';
+import type { TeamLeaderboardItemViewModel, SkillLevel } from '@gridpilot/racing/application/presenters/ITeamsLeaderboardPresenter';
 
 // ============================================================================
 // TYPES
 // ============================================================================
 
-type SkillLevel = 'beginner' | 'intermediate' | 'advanced' | 'pro';
-
-interface TeamDisplayData {
-  id: string;
-  name: string;
-  memberCount: number;
-  rating: number | null;
-  totalWins: number;
-  totalRaces: number;
-  performanceLevel: SkillLevel;
-  isRecruiting: boolean;
-  createdAt: Date;
-  description?: string;
-  specialization?: 'endurance' | 'sprint' | 'mixed';
-  region?: string;
-  languages?: string[];
-}
+type TeamDisplayData = TeamLeaderboardItemViewModel;
 
 // ============================================================================
 // SKILL LEVEL CONFIG
@@ -463,59 +447,10 @@ export default function TeamsPage() {
 
   const loadTeams = async () => {
     try {
-      const allTeamsQuery = getGetAllTeamsQuery();
-      const teamMembersQuery = getGetTeamMembersQuery();
-
-      const allTeams = await allTeamsQuery.execute();
-      const teamData: TeamDisplayData[] = [];
-
-      await Promise.all(
-        allTeams.map(async (team: Team) => {
-          const memberships = await teamMembersQuery.execute({ teamId: team.id });
-          const memberCount = memberships.length;
-
-          let ratingSum = 0;
-          let ratingCount = 0;
-          let totalWins = 0;
-          let totalRaces = 0;
-
-          for (const membership of memberships) {
-            const stats = getDriverStats(membership.driverId);
-            if (!stats) continue;
-
-            if (typeof stats.rating === 'number') {
-              ratingSum += stats.rating;
-              ratingCount += 1;
-            }
-
-            totalWins += stats.wins ?? 0;
-            totalRaces += stats.totalRaces ?? 0;
-          }
-
-          const averageRating = ratingCount > 0 ? ratingSum / ratingCount : null;
-
-          let performanceLevel: TeamDisplayData['performanceLevel'] = 'beginner';
-          if (averageRating !== null) {
-            if (averageRating >= 4500) performanceLevel = 'pro';
-            else if (averageRating >= 3000) performanceLevel = 'advanced';
-            else if (averageRating >= 2000) performanceLevel = 'intermediate';
-          }
-
-          teamData.push({
-            id: team.id,
-            name: team.name,
-            memberCount,
-            rating: averageRating,
-            totalWins,
-            totalRaces,
-            performanceLevel,
-            isRecruiting: true,
-            createdAt: new Date(),
-          });
-        }),
-      );
-
-      setRealTeams(teamData);
+      const useCase = getGetTeamsLeaderboardUseCase();
+      await useCase.execute();
+      const viewModel = useCase.presenter.getViewModel();
+      setRealTeams(viewModel.teams);
     } catch (error) {
       console.error('Failed to load teams:', error);
     } finally {