website refactor

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

@@ -1,50 +1,49 @@
-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 { Result } from '@/lib/contracts/Result';
 import { AdminService } from '@/lib/services/admin/AdminService';
 import { AdminDashboardViewDataBuilder } from '@/lib/builders/view-data/AdminDashboardViewDataBuilder';
-import { AdminDashboardViewData } from '@/lib/view-data/AdminDashboardViewData';
+import type { AdminDashboardViewData } from '@/lib/view-data/AdminDashboardViewData';
+import { PresentationError, mapToPresentationError } from '@/lib/contracts/page-queries/PresentationError';
 
 /**
  * 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.
+ * Fetches dashboard statistics from API and transforms to ViewData.
+ *
+ * Follows Clean Architecture: Uses builders for transformation.
  */
 export class AdminDashboardPageQuery implements PageQuery<AdminDashboardViewData, void> {
-  async execute(): Promise<PageQueryResult<AdminDashboardViewData>> {
+  async execute(): Promise<Result<AdminDashboardViewData, PresentationError>> {
     try {
-      // Create required dependencies
-      const logger = new ConsoleLogger();
-      const errorReporter = new EnhancedErrorReporter(logger, {
-        showUserNotifications: false,
-        logToConsole: true,
-        reportToExternal: process.env.NODE_ENV === 'production',
-      });
+      // Manual construction: Service creates its own dependencies
+      const adminService = new AdminService();
 
-      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
+      const apiDtoResult = await adminService.getDashboardStats();
 
-      // Fetch dashboard stats (API DTO)
-      const apiDto = await adminService.getDashboardStats();
+      if (apiDtoResult.isErr()) {
+        return Result.err(mapToPresentationError(apiDtoResult.getError()));
+      }
 
-      // Transform API DTO to View Data using builder
-      const viewData = AdminDashboardViewDataBuilder.build(apiDto);
+      // Transform to ViewData using builder
+      const viewData = AdminDashboardViewDataBuilder.build(apiDtoResult.unwrap());
 
-      return { status: 'ok', dto: viewData };
-    } catch (error) {
-      console.error('AdminDashboardPageQuery failed:', error);
+      return Result.ok(viewData);
+    } catch (err) {
+      console.error('AdminDashboardPageQuery failed:', err);
       
-      if (error instanceof Error && (error.message.includes('403') || error.message.includes('401'))) {
-        return { status: 'notFound' };
+      if (err instanceof Error && (err.message.includes('403') || err.message.includes('401'))) {
+        return Result.err('notFound');
       }
       
-      return { status: 'error', errorId: 'admin_dashboard_fetch_failed' };
+      return Result.err('serverError');
     }
   }
-}
+
+  // Static method to avoid object construction in server code
+  static async execute(): Promise<Result<AdminDashboardViewData, PresentationError>> {
+    const query = new AdminDashboardPageQuery();
+    return query.execute();
+  }
+}