website refactor

apps/website/lib/page-queries/AdminDashboardPageQuery.ts

@@ -0,0 +1,50 @@
+import { AdminApiClient } from '@/lib/api/admin/AdminApiClient';
+import { PageQuery } from '@/lib/contracts/page-queries/PageQuery';
+import { PageQueryResult } from '@/lib/contracts/page-queries/PageQueryResult';
+import { EnhancedErrorReporter } from '@/lib/infrastructure/EnhancedErrorReporter';
+import { ConsoleLogger } from '@/lib/infrastructure/logging/ConsoleLogger';
+import { AdminService } from '@/lib/services/admin/AdminService';
+import { AdminDashboardViewDataBuilder } from '@/lib/builders/view-data/AdminDashboardViewDataBuilder';
+import { AdminDashboardViewData } from '@/lib/view-data/AdminDashboardViewData';
+
+/**
+ * AdminDashboardPageQuery
+ *
+ * Server-side composition for admin dashboard page.
+ * Fetches dashboard statistics from API and transforms to View Data using builders.
+ * 
+ * Follows Clean Architecture: DTOs never leak into application code.
+ */
+export class AdminDashboardPageQuery implements PageQuery<AdminDashboardViewData, void> {
+  async execute(): Promise<PageQueryResult<AdminDashboardViewData>> {
+    try {
+      // Create required dependencies
+      const logger = new ConsoleLogger();
+      const errorReporter = new EnhancedErrorReporter(logger, {
+        showUserNotifications: false,
+        logToConsole: true,
+        reportToExternal: process.env.NODE_ENV === 'production',
+      });
+
+      const baseUrl = process.env.NEXT_PUBLIC_API_BASE_URL || 'http://localhost:3001';
+      const apiClient = new AdminApiClient(baseUrl, errorReporter, logger);
+      const adminService = new AdminService(apiClient);
+
+      // Fetch dashboard stats (API DTO)
+      const apiDto = await adminService.getDashboardStats();
+
+      // Transform API DTO to View Data using builder
+      const viewData = AdminDashboardViewDataBuilder.build(apiDto);
+
+      return { status: 'ok', dto: viewData };
+    } catch (error) {
+      console.error('AdminDashboardPageQuery failed:', error);
+      
+      if (error instanceof Error && (error.message.includes('403') || error.message.includes('401'))) {
+        return { status: 'notFound' };
+      }
+      
+      return { status: 'error', errorId: 'admin_dashboard_fetch_failed' };
+    }
+  }
+}

apps/website/lib/page-queries/AdminUsersPageQuery.ts

@@ -0,0 +1,93 @@
+import { AdminApiClient } from '@/lib/api/admin/AdminApiClient';
+import { PageQueryResult } from '@/lib/contracts/page-queries/PageQueryResult';
+import { EnhancedErrorReporter } from '@/lib/infrastructure/EnhancedErrorReporter';
+import { ConsoleLogger } from '@/lib/infrastructure/logging/ConsoleLogger';
+import { AdminService } from '@/lib/services/admin/AdminService';
+
+export interface AdminUsersPageDto {
+  users: Array<{
+    id: string;
+    email: string;
+    displayName: string;
+    roles: string[];
+    status: string;
+    isSystemAdmin: boolean;
+    createdAt: string;
+    updatedAt: string;
+    lastLoginAt?: string;
+    primaryDriverId?: string;
+  }>;
+  total: number;
+  page: number;
+  limit: number;
+  totalPages: number;
+}
+
+/**
+ * AdminUsersPageQuery
+ * 
+ * Server-side composition for admin users page.
+ * Fetches user list from API with filtering and assembles Page DTO.
+ */
+export class AdminUsersPageQuery {
+  async execute(query: {
+    search?: string;
+    role?: string;
+    status?: string;
+    page?: number;
+    limit?: number;
+  }): Promise<PageQueryResult<AdminUsersPageDto>> {
+    try {
+      // Create required dependencies
+      const logger = new ConsoleLogger();
+      const errorReporter = new EnhancedErrorReporter(logger, {
+        showUserNotifications: false,
+        logToConsole: true,
+        reportToExternal: process.env.NODE_ENV === 'production',
+      });
+
+      const baseUrl = process.env.NEXT_PUBLIC_API_BASE_URL || 'http://localhost:3001';
+      const apiClient = new AdminApiClient(baseUrl, errorReporter, logger);
+      const adminService = new AdminService(apiClient);
+
+      // Fetch user list via service
+      const apiDto = await adminService.listUsers({
+        search: query.search,
+        role: query.role,
+        status: query.status,
+        page: query.page || 1,
+        limit: query.limit || 50,
+      });
+
+      // Assemble Page DTO (raw values only)
+      const pageDto: AdminUsersPageDto = {
+        users: apiDto.users.map(user => ({
+          id: user.id,
+          email: user.email,
+          displayName: user.displayName,
+          roles: user.roles,
+          status: user.status,
+          isSystemAdmin: user.isSystemAdmin,
+          createdAt: user.createdAt.toISOString(),
+          updatedAt: user.updatedAt.toISOString(),
+          lastLoginAt: user.lastLoginAt?.toISOString(),
+          primaryDriverId: user.primaryDriverId,
+        })),
+        total: apiDto.total,
+        page: apiDto.page,
+        limit: apiDto.limit,
+        totalPages: apiDto.totalPages,
+      };
+
+      return { status: 'ok', dto: pageDto };
+    } catch (error) {
+      console.error('AdminUsersPageQuery failed:', error);
+      
+      if (error instanceof Error && (error.message.includes('403') || error.message.includes('401'))) {
+        return { status: 'notFound' };
+      }
+      
+      return { status: 'error', errorId: 'admin_users_fetch_failed' };
+    }
+  }
+}

apps/website/lib/page-queries/page-query-result/PageQueryResult.ts

@@ -1,18 +0,0 @@
-/**
- * PageQueryResult discriminated union
- * 
- * Canonical result type for all server-side page queries.
- * Defines the explicit outcome of a page query execution.
- * 
- * Based on WEBSITE_PAGE_QUERIES.md:
- * - ok with { dto }
- * - notFound
- * - redirect with { to }
- * - error with { errorId }
- */
-
-export type PageQueryResult<TPageDto> =
-  | { status: 'ok'; dto: TPageDto }
-  | { status: 'notFound' }
-  | { status: 'redirect'; to: string }
-  | { status: 'error'; errorId: string };