website refactor

apps/website/app/leaderboards/page.tsx

@@ -1,71 +1,61 @@
 import { PageWrapper } from '@/components/shared/state/PageWrapper';
-import { PageDataFetcher } from '@/lib/page/PageDataFetcher';
-import { DRIVER_SERVICE_TOKEN, TEAM_SERVICE_TOKEN } from '@/lib/di/tokens';
-import { DriverService } from '@/lib/services/drivers/DriverService';
-import { TeamService } from '@/lib/services/teams/TeamService';
 import { Trophy } from 'lucide-react';
 import { redirect } from 'next/navigation';
-import type { DriverLeaderboardViewModel } from '@/lib/view-models/DriverLeaderboardViewModel';
-import type { TeamSummaryViewModel } from '@/lib/view-models/TeamSummaryViewModel';
+import { LeaderboardsPageQuery } from '@/lib/page-queries/page-queries/LeaderboardsPageQuery';
+import { LeaderboardsViewDataBuilder } from '@/lib/builders/view-data/LeaderboardsViewDataBuilder';
 import { LeaderboardsPageWrapper } from './LeaderboardsPageWrapper';
 
-// ============================================================================
-// TYPES
-// ============================================================================
-
-interface LeaderboardsPageData {
-  drivers: DriverLeaderboardViewModel | null;
-  teams: TeamSummaryViewModel[] | null;
-}
-
 // ============================================================================
 // MAIN PAGE COMPONENT
 // ============================================================================
 
 export default async function LeaderboardsPage() {
-  // Fetch data using PageDataFetcher with proper type annotations
-  const [driverData, teamsData] = await Promise.all([
-    PageDataFetcher.fetch<DriverService, 'getDriverLeaderboard'>(
-      DRIVER_SERVICE_TOKEN,
-      'getDriverLeaderboard'
-    ),
-    PageDataFetcher.fetch<TeamService, 'getAllTeams'>(
-      TEAM_SERVICE_TOKEN,
-      'getAllTeams'
-    ),
-  ]);
+  // Execute the page query
+  const result = await LeaderboardsPageQuery.execute();
 
-  // Prepare data for template
-  const data: LeaderboardsPageData = {
-    drivers: driverData,
-    teams: teamsData,
-  };
+  // Handle different result statuses
+  switch (result.status) {
+    case 'notFound':
+      redirect('/404');
+    case 'redirect':
+      redirect(result.to);
+    case 'error':
+      // Show empty state with error
+      return (
+        <PageWrapper
+          data={null}
+          isLoading={false}
+          error={new Error(result.errorId)}
+          retry={async () => redirect('/leaderboards')}
+          Template={LeaderboardsPageWrapper}
+          loading={{ variant: 'full-screen', message: 'Loading leaderboards...' }}
+          errorConfig={{ variant: 'full-screen' }}
+          empty={{
+            icon: Trophy,
+            title: 'No leaderboard data',
+            description: 'There is no leaderboard data available at the moment.',
+          }}
+        />
+      );
+    case 'ok':
+      const viewData = LeaderboardsViewDataBuilder.build(result.dto.drivers, result.dto.teams);
+      const hasData = (viewData.drivers?.length ?? 0) > 0 || (viewData.teams?.length ?? 0) > 0;
 
-  const hasData = (driverData?.drivers?.length ?? 0) > 0 || (teamsData?.length ?? 0) > 0;
-
-  // Handle loading state (should be fast since we're using async/await)
-  const isLoading = false;
-  const error = null;
-  const retry = async () => {
-    // In server components, we can't retry without a reload
-    // This would typically trigger a page reload
-    redirect('/leaderboards');
-  };
-
-  return (
-    <PageWrapper
-      data={hasData ? data : null}
-      isLoading={isLoading}
-      error={error}
-      retry={retry}
-      Template={LeaderboardsPageWrapper}
-      loading={{ variant: 'full-screen', message: 'Loading leaderboards...' }}
-      errorConfig={{ variant: 'full-screen' }}
-      empty={{
-        icon: Trophy,
-        title: 'No leaderboard data',
-        description: 'There is no leaderboard data available at the moment.',
-      }}
-    />
-  );
+      return (
+        <PageWrapper
+          data={hasData ? viewData : null}
+          isLoading={false}
+          error={null}
+          retry={async () => redirect('/leaderboards')}
+          Template={LeaderboardsPageWrapper}
+          loading={{ variant: 'full-screen', message: 'Loading leaderboards...' }}
+          errorConfig={{ variant: 'full-screen' }}
+          empty={{
+            icon: Trophy,
+            title: 'No leaderboard data',
+            description: 'There is no leaderboard data available at the moment.',
+          }}
+        />
+      );
+  }
 }