wip

packages/racing/domain/entities/Race.ts

@@ -16,14 +16,14 @@ export class Race implements IEntity<string> {
   readonly leagueId: string;
   readonly scheduledAt: Date;
   readonly track: string;
-  readonly trackId?: string;
+  readonly trackId: string | undefined;
   readonly car: string;
-  readonly carId?: string;
+  readonly carId: string | undefined;
   readonly sessionType: SessionType;
   readonly status: RaceStatus;
-  readonly strengthOfField?: number;
-  readonly registeredCount?: number;
-  readonly maxParticipants?: number;
+  readonly strengthOfField: number | undefined;
+  readonly registeredCount: number | undefined;
+  readonly maxParticipants: number | undefined;
 
   private constructor(props: {
     id: string;
@@ -127,10 +127,34 @@ export class Race implements IEntity<string> {
       throw new RacingDomainInvariantError('Only scheduled races can be started');
     }
 
-    return new Race({
-      ...this,
-      status: 'running',
-    });
+    const base = {
+      id: this.id,
+      leagueId: this.leagueId,
+      scheduledAt: this.scheduledAt,
+      track: this.track,
+      car: this.car,
+      sessionType: this.sessionType,
+      status: 'running' as RaceStatus,
+    };
+
+    const withTrackId =
+      this.trackId !== undefined ? { ...base, trackId: this.trackId } : base;
+    const withCarId =
+      this.carId !== undefined ? { ...withTrackId, carId: this.carId } : withTrackId;
+    const withSof =
+      this.strengthOfField !== undefined
+        ? { ...withCarId, strengthOfField: this.strengthOfField }
+        : withCarId;
+    const withRegistered =
+      this.registeredCount !== undefined
+        ? { ...withSof, registeredCount: this.registeredCount }
+        : withSof;
+    const props =
+      this.maxParticipants !== undefined
+        ? { ...withRegistered, maxParticipants: this.maxParticipants }
+        : withRegistered;
+
+    return Race.create(props);
   }
 
   /**
@@ -145,10 +169,34 @@ export class Race implements IEntity<string> {
       throw new RacingDomainInvariantError('Cannot complete a cancelled race');
     }
 
-    return new Race({
-      ...this,
-      status: 'completed',
-    });
+    const base = {
+      id: this.id,
+      leagueId: this.leagueId,
+      scheduledAt: this.scheduledAt,
+      track: this.track,
+      car: this.car,
+      sessionType: this.sessionType,
+      status: 'completed' as RaceStatus,
+    };
+
+    const withTrackId =
+      this.trackId !== undefined ? { ...base, trackId: this.trackId } : base;
+    const withCarId =
+      this.carId !== undefined ? { ...withTrackId, carId: this.carId } : withTrackId;
+    const withSof =
+      this.strengthOfField !== undefined
+        ? { ...withCarId, strengthOfField: this.strengthOfField }
+        : withCarId;
+    const withRegistered =
+      this.registeredCount !== undefined
+        ? { ...withSof, registeredCount: this.registeredCount }
+        : withSof;
+    const props =
+      this.maxParticipants !== undefined
+        ? { ...withRegistered, maxParticipants: this.maxParticipants }
+        : withRegistered;
+
+    return Race.create(props);
   }
 
   /**
@@ -163,21 +211,62 @@ export class Race implements IEntity<string> {
       throw new RacingDomainInvariantError('Race is already cancelled');
     }
 
-    return new Race({
-      ...this,
-      status: 'cancelled',
-    });
+    const base = {
+      id: this.id,
+      leagueId: this.leagueId,
+      scheduledAt: this.scheduledAt,
+      track: this.track,
+      car: this.car,
+      sessionType: this.sessionType,
+      status: 'cancelled' as RaceStatus,
+    };
+
+    const withTrackId =
+      this.trackId !== undefined ? { ...base, trackId: this.trackId } : base;
+    const withCarId =
+      this.carId !== undefined ? { ...withTrackId, carId: this.carId } : withTrackId;
+    const withSof =
+      this.strengthOfField !== undefined
+        ? { ...withCarId, strengthOfField: this.strengthOfField }
+        : withCarId;
+    const withRegistered =
+      this.registeredCount !== undefined
+        ? { ...withSof, registeredCount: this.registeredCount }
+        : withSof;
+    const props =
+      this.maxParticipants !== undefined
+        ? { ...withRegistered, maxParticipants: this.maxParticipants }
+        : withRegistered;
+
+    return Race.create(props);
   }
 
   /**
    * Update SOF and participant count
    */
   updateField(strengthOfField: number, registeredCount: number): Race {
-    return new Race({
-      ...this,
+    const base = {
+      id: this.id,
+      leagueId: this.leagueId,
+      scheduledAt: this.scheduledAt,
+      track: this.track,
+      car: this.car,
+      sessionType: this.sessionType,
+      status: this.status,
       strengthOfField,
       registeredCount,
-    });
+    };
+
+    const withTrackId =
+      this.trackId !== undefined ? { ...base, trackId: this.trackId } : base;
+    const withCarId =
+      this.carId !== undefined ? { ...withTrackId, carId: this.carId } : withTrackId;
+    const props =
+      this.maxParticipants !== undefined
+        ? { ...withCarId, maxParticipants: this.maxParticipants }
+        : withCarId;
+
+    return Race.create(props);
   }
 
   /**