website refactor

apps/website/lib/services/races/RaceResultsService.ts

@@ -5,6 +5,9 @@ import { ConsoleLogger } from '@/lib/infrastructure/logging/ConsoleLogger';
 import { ConsoleErrorReporter } from '@/lib/infrastructure/logging/ConsoleErrorReporter';
 import { getWebsiteApiBaseUrl } from '@/lib/config/apiBaseUrl';
 import { ApiError } from '@/lib/api/base/ApiError';
+import { RaceResultsDetailViewModel } from '@/lib/view-models/RaceResultsDetailViewModel';
+import { RaceWithSOFViewModel } from '@/lib/view-models/RaceWithSOFViewModel';
+import { ImportRaceResultsSummaryViewModel } from '@/lib/view-models/ImportRaceResultsSummaryViewModel';
 
 /**
  * Race Results Service
@@ -15,13 +18,29 @@ import { ApiError } from '@/lib/api/base/ApiError';
 export class RaceResultsService implements Service {
   private apiClient: RacesApiClient;
 
-  constructor() {
-    // Service creates its own dependencies
-    const baseUrl = getWebsiteApiBaseUrl();
-    const logger = new ConsoleLogger();
-    const errorReporter = new ConsoleErrorReporter();
-    
-    this.apiClient = new RacesApiClient(baseUrl, errorReporter, logger);
+  constructor(apiClient?: RacesApiClient) {
+    if (apiClient) {
+      this.apiClient = apiClient;
+    } else {
+      // Service creates its own dependencies
+      const baseUrl = getWebsiteApiBaseUrl();
+      const logger = new ConsoleLogger();
+      const errorReporter = new ConsoleErrorReporter();
+      
+      this.apiClient = new RacesApiClient(baseUrl, errorReporter, logger);
+    }
+  }
+
+  async getResultsDetail(raceId: string, currentUserId?: string): Promise<any> {
+    const res = await this.getRaceResultsDetail(raceId);
+    if (res.isErr()) throw new Error((res as any).error.message);
+    const data = (res as any).value;
+    return new RaceResultsDetailViewModel({ ...data, currentUserId: (currentUserId === undefined || currentUserId === null) ? '' : currentUserId }, {} as any);
+  }
+
+  async importResults(raceId: string, input: any): Promise<any> {
+    const res = await this.apiClient.importResults(raceId, input);
+    return new ImportRaceResultsSummaryViewModel(res);
   }
 
   /**
@@ -50,21 +69,12 @@ export class RaceResultsService implements Service {
    * Get race with strength of field
    * Returns race data with SOF calculation
    */
-  async getWithSOF(raceId: string): Promise<Result<unknown, DomainError>> {
+  async getWithSOF(raceId: string): Promise<any> {
     try {
       const data = await this.apiClient.getWithSOF(raceId);
-      return Result.ok(data);
+      return new RaceWithSOFViewModel(data);
     } catch (error: unknown) {
-      if (error instanceof ApiError) {
-        return Result.err({
-          type: this.mapApiErrorType(error.type),
-          message: error.message
-        });
-      }
-      return Result.err({
-        type: 'unknown',
-        message: (error as Error).message || 'Failed to fetch race SOF'
-      });
+      throw error;
     }
   }
 

apps/website/lib/services/races/RaceStewardingService.ts

@@ -7,6 +7,7 @@ import { ConsoleLogger } from '@/lib/infrastructure/logging/ConsoleLogger';
 import { ConsoleErrorReporter } from '@/lib/infrastructure/logging/ConsoleErrorReporter';
 import { getWebsiteApiBaseUrl } from '@/lib/config/apiBaseUrl';
 import { ApiError } from '@/lib/api/base/ApiError';
+import { RaceStewardingViewModel } from '@/lib/view-models/RaceStewardingViewModel';
 
 /**
  * Race Stewarding Service
@@ -19,26 +20,52 @@ export class RaceStewardingService implements Service {
   private protestsApiClient: ProtestsApiClient;
   private penaltiesApiClient: PenaltiesApiClient;
 
-  constructor() {
-    // Service creates its own dependencies
-    const baseUrl = getWebsiteApiBaseUrl();
-    const logger = new ConsoleLogger();
-    const errorReporter = new ConsoleErrorReporter();
-    
-    this.racesApiClient = new RacesApiClient(baseUrl, errorReporter, logger);
-    this.protestsApiClient = new ProtestsApiClient(baseUrl, errorReporter, logger);
-    this.penaltiesApiClient = new PenaltiesApiClient(baseUrl, errorReporter, logger);
+  constructor(racesApiClient?: RacesApiClient, protestsApiClient?: ProtestsApiClient, penaltiesApiClient?: PenaltiesApiClient) {
+    if (racesApiClient && protestsApiClient && penaltiesApiClient) {
+      this.racesApiClient = racesApiClient;
+      this.protestsApiClient = protestsApiClient;
+      this.penaltiesApiClient = penaltiesApiClient;
+    } else {
+      // Service creates its own dependencies
+      const baseUrl = getWebsiteApiBaseUrl();
+      const logger = new ConsoleLogger();
+      const errorReporter = new ConsoleErrorReporter();
+      
+      this.racesApiClient = new RacesApiClient(baseUrl, errorReporter, logger);
+      this.protestsApiClient = new ProtestsApiClient(baseUrl, errorReporter, logger);
+      this.penaltiesApiClient = new PenaltiesApiClient(baseUrl, errorReporter, logger);
+    }
+  }
+
+  async getRaceStewardingData(raceId: string, driverId: string): Promise<any> {
+    const res = await this.getRaceStewarding(raceId, driverId);
+    if (res.isErr()) throw new Error((res as any).error.message);
+    const data = (res as any).value;
+    return new RaceStewardingViewModel({
+      raceDetail: {
+        race: data.race,
+        league: data.league,
+      },
+      protests: {
+        protests: data.protests,
+        driverMap: data.driverMap,
+      },
+      penalties: {
+        penalties: data.penalties,
+        driverMap: data.driverMap,
+      },
+    } as any);
   }
 
   /**
    * Get race stewarding data
    * Returns protests and penalties for a race
    */
-  async getRaceStewarding(raceId: string): Promise<Result<unknown, DomainError>> {
+  async getRaceStewarding(raceId: string, driverId: string = ''): Promise<Result<unknown, DomainError>> {
     try {
       // Fetch data in parallel
       const [raceDetail, protests, penalties] = await Promise.all([
-        this.racesApiClient.getDetail(raceId, ''),
+        this.racesApiClient.getDetail(raceId, driverId),
         this.protestsApiClient.getRaceProtests(raceId),
         this.penaltiesApiClient.getRacePenalties(raceId),
       ]);