website refactor

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

@@ -1,57 +1,24 @@
-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 { PageQuery } from '@/lib/contracts/page-queries/PageQuery';
+import { Result } from '@/lib/contracts/Result';
 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;
-}
+import { AdminUsersViewDataBuilder } from '@/lib/builders/view-data/AdminUsersViewDataBuilder';
+import type { AdminUsersViewData } from '@/lib/view-data/AdminUsersViewData';
+import { PresentationError, mapToPresentationError } from '@/lib/contracts/page-queries/PresentationError';
 
 /**
  * AdminUsersPageQuery
- * 
+ *
  * Server-side composition for admin users page.
- * Fetches user list from API with filtering and assembles Page DTO.
+ * Fetches user list from API and transforms to ViewData.
  */
-export class AdminUsersPageQuery {
-  async execute(query: {
-    search?: string;
-    role?: string;
-    status?: string;
-    page?: number;
-    limit?: number;
-  }): Promise<PageQueryResult<AdminUsersPageDto>> {
+export class AdminUsersPageQuery implements PageQuery<AdminUsersViewData, { search?: string; role?: string; status?: string; page?: number; limit?: number }> {
+  async execute(query: { search?: string; role?: string; status?: string; page?: number; limit?: number }): Promise<Result<AdminUsersViewData, PresentationError>> {
     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);
+      // Manual construction: Service creates its own dependencies
+      const adminService = new AdminService();
 
       // Fetch user list via service
-      const apiDto = await adminService.listUsers({
+      const apiDtoResult = await adminService.listUsers({
         search: query.search,
         role: query.role,
         status: query.status,
@@ -59,35 +26,28 @@ export class AdminUsersPageQuery {
         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,
-      };
+      if (apiDtoResult.isErr()) {
+        return Result.err(mapToPresentationError(apiDtoResult.getError()));
+      }
 
-      return { status: 'ok', dto: pageDto };
+      // Transform to ViewData using builder
+      const viewData = AdminUsersViewDataBuilder.build(apiDtoResult.unwrap());
+
+      return Result.ok(viewData);
     } catch (error) {
       console.error('AdminUsersPageQuery failed:', error);
       
       if (error instanceof Error && (error.message.includes('403') || error.message.includes('401'))) {
-        return { status: 'notFound' };
+        return Result.err('notFound');
       }
       
-      return { status: 'error', errorId: 'admin_users_fetch_failed' };
+      return Result.err('serverError');
     }
   }
+
+  // Static method to avoid object construction in server code
+  static async execute(query: { search?: string; role?: string; status?: string; page?: number; limit?: number }): Promise<Result<AdminUsersViewData, PresentationError>> {
+    const queryInstance = new AdminUsersPageQuery();
+    return queryInstance.execute(query);
+  }
 }