refactor

core/racing/domain/entities/Team.ts

@@ -8,24 +8,30 @@
 
 import type { IEntity } from '@core/shared/domain';
 import { RacingDomainValidationError } from '../errors/RacingDomainError';
+import { TeamName } from '../value-objects/TeamName';
+import { TeamTag } from '../value-objects/TeamTag';
+import { TeamDescription } from '../value-objects/TeamDescription';
+import { DriverId } from './DriverId';
+import { LeagueId } from './LeagueId';
+import { TeamCreatedAt } from '../value-objects/TeamCreatedAt';
 
 export class Team implements IEntity<string> {
   readonly id: string;
-  readonly name: string;
-  readonly tag: string;
-  readonly description: string;
-  readonly ownerId: string;
-  readonly leagues: string[];
-  readonly createdAt: Date;
+  readonly name: TeamName;
+  readonly tag: TeamTag;
+  readonly description: TeamDescription;
+  readonly ownerId: DriverId;
+  readonly leagues: LeagueId[];
+  readonly createdAt: TeamCreatedAt;
 
   private constructor(props: {
     id: string;
-    name: string;
-    tag: string;
-    description: string;
-    ownerId: string;
-    leagues: string[];
-    createdAt: Date;
+    name: TeamName;
+    tag: TeamTag;
+    description: TeamDescription;
+    ownerId: DriverId;
+    leagues: LeagueId[];
+    createdAt: TeamCreatedAt;
   }) {
     this.id = props.id;
     this.name = props.name;
@@ -48,16 +54,22 @@ export class Team implements IEntity<string> {
     leagues: string[];
     createdAt?: Date;
   }): Team {
-    this.validate(props);
+    if (!props.id || props.id.trim().length === 0) {
+      throw new RacingDomainValidationError('Team ID is required');
+    }
+
+    if (!Array.isArray(props.leagues)) {
+      throw new RacingDomainValidationError('Team leagues must be an array');
+    }
 
     return new Team({
       id: props.id,
-      name: props.name,
-      tag: props.tag,
-      description: props.description,
-      ownerId: props.ownerId,
-      leagues: [...props.leagues],
-      createdAt: props.createdAt ?? new Date(),
+      name: TeamName.create(props.name),
+      tag: TeamTag.create(props.tag),
+      description: TeamDescription.create(props.description),
+      ownerId: DriverId.create(props.ownerId),
+      leagues: props.leagues.map(leagueId => LeagueId.create(leagueId)),
+      createdAt: TeamCreatedAt.create(props.createdAt ?? new Date()),
     });
   }
 
@@ -71,58 +83,21 @@ export class Team implements IEntity<string> {
     ownerId: string;
     leagues: string[];
   }>): Team {
-    const next: Team = new Team({
+    const nextName = 'name' in props ? TeamName.create(props.name!) : this.name;
+    const nextTag = 'tag' in props ? TeamTag.create(props.tag!) : this.tag;
+    const nextDescription = 'description' in props ? TeamDescription.create(props.description!) : this.description;
+    const nextOwnerId = 'ownerId' in props ? DriverId.create(props.ownerId!) : this.ownerId;
+    const nextLeagues = 'leagues' in props ? props.leagues!.map(leagueId => LeagueId.create(leagueId)) : this.leagues;
+
+    return new Team({
       id: this.id,
-      name: props.name ?? this.name,
-      tag: props.tag ?? this.tag,
-      description: props.description ?? this.description,
-      ownerId: props.ownerId ?? this.ownerId,
-      leagues: props.leagues ? [...props.leagues] : [...this.leagues],
+      name: nextName,
+      tag: nextTag,
+      description: nextDescription,
+      ownerId: nextOwnerId,
+      leagues: nextLeagues,
       createdAt: this.createdAt,
     });
-
-    // Re-validate updated aggregate
-    Team.validate({
-      id: next.id,
-      name: next.name,
-      tag: next.tag,
-      description: next.description,
-      ownerId: next.ownerId,
-      leagues: next.leagues,
-    });
-
-    return next;
   }
 
-  /**
-   * Domain validation logic for core invariants.
-   */
-  private static validate(props: {
-    id: string;
-    name: string;
-    tag: string;
-    description: string;
-    ownerId: string;
-    leagues: string[];
-  }): void {
-    if (!props.id || props.id.trim().length === 0) {
-      throw new RacingDomainValidationError('Team ID is required');
-    }
-
-    if (!props.name || props.name.trim().length === 0) {
-      throw new RacingDomainValidationError('Team name is required');
-    }
-
-    if (!props.tag || props.tag.trim().length === 0) {
-      throw new RacingDomainValidationError('Team tag is required');
-    }
-
-    if (!props.ownerId || props.ownerId.trim().length === 0) {
-      throw new RacingDomainValidationError('Team owner ID is required');
-    }
-
-    if (!Array.isArray(props.leagues)) {
-      throw new RacingDomainValidationError('Team leagues must be an array');
-    }
-  }
 }