wip

apps/website/lib/presenters/RacePenaltiesPresenter.ts

@@ -1,60 +1,55 @@
 import type {
   IRacePenaltiesPresenter,
   RacePenaltyViewModel,
+  RacePenaltiesResultDTO,
   RacePenaltiesViewModel,
 } from '@gridpilot/racing/application/presenters/IRacePenaltiesPresenter';
-import type { PenaltyType, PenaltyStatus } from '@gridpilot/racing/domain/entities/Penalty';
 
 export class RacePenaltiesPresenter implements IRacePenaltiesPresenter {
   private viewModel: RacePenaltiesViewModel | null = null;
 
-  present(
-    penalties: Array<{
-      id: string;
-      raceId: string;
-      driverId: string;
-      type: PenaltyType;
-      value?: number;
-      reason: string;
-      protestId?: string;
-      issuedBy: string;
-      status: PenaltyStatus;
-      issuedAt: Date;
-      appliedAt?: Date;
-      notes?: string;
-      getDescription(): string;
-    }>,
-    driverMap: Map<string, string>
-  ): RacePenaltiesViewModel {
-    const penaltyViewModels: RacePenaltyViewModel[] = penalties.map(penalty => ({
-      id: penalty.id,
-      raceId: penalty.raceId,
-      driverId: penalty.driverId,
-      driverName: driverMap.get(penalty.driverId) || 'Unknown',
-      type: penalty.type,
-      value: penalty.value,
-      reason: penalty.reason,
-      protestId: penalty.protestId,
-      issuedBy: penalty.issuedBy,
-      issuedByName: driverMap.get(penalty.issuedBy) || 'Unknown',
-      status: penalty.status,
-      description: penalty.getDescription(),
-      issuedAt: penalty.issuedAt.toISOString(),
-      appliedAt: penalty.appliedAt?.toISOString(),
-      notes: penalty.notes,
-    }));
+  reset(): void {
+    this.viewModel = null;
+  }
+
+  present(dto: RacePenaltiesResultDTO): void {
+    const { penalties, driverMap } = dto;
+
+    const penaltyViewModels: RacePenaltyViewModel[] = penalties.map((penalty) => {
+      const value = typeof penalty.value === 'number' ? penalty.value : 0;
+      const protestId = penalty.protestId;
+      const appliedAt = penalty.appliedAt ? penalty.appliedAt.toISOString() : undefined;
+      const notes = penalty.notes;
+
+      const base: RacePenaltyViewModel = {
+        id: penalty.id,
+        raceId: penalty.raceId,
+        driverId: penalty.driverId,
+        driverName: driverMap.get(penalty.driverId) || 'Unknown',
+        type: penalty.type,
+        value,
+        reason: penalty.reason,
+        issuedBy: penalty.issuedBy,
+        issuedByName: driverMap.get(penalty.issuedBy) || 'Unknown',
+        status: penalty.status,
+        description: penalty.getDescription(),
+        issuedAt: penalty.issuedAt.toISOString(),
+      };
+
+      return {
+        ...base,
+        ...(protestId ? { protestId } : {}),
+        ...(appliedAt ? { appliedAt } : {}),
+        ...(typeof notes === 'string' && notes.length > 0 ? { notes } : {}),
+      };
+    });
 
     this.viewModel = {
       penalties: penaltyViewModels,
     };
-
-    return this.viewModel;
   }
 
-  getViewModel(): RacePenaltiesViewModel {
-    if (!this.viewModel) {
-      throw new Error('Presenter has not been called yet');
-    }
+  getViewModel(): RacePenaltiesViewModel | null {
     return this.viewModel;
   }
 }