Check for null gamertags from older netplay builds

AdrianCassar · Jun 17, 2024 · e21ba47 · e21ba47
1 parent ba4f559
commit e21ba47
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/application/commands/CreatePlayerCommand.ts b/src/application/commands/CreatePlayerCommand.ts
@@ -6,9 +6,9 @@ import Gamertag from 'src/domain/value-objects/Gamertag';
 export class CreatePlayerCommand {
   constructor(
     public readonly xuid: Xuid,
-    public readonly gamertag: Gamertag,
     public readonly machineId: Xuid,
     public readonly hostAddress: IpAddress,
     public readonly macAddress: MacAddress,
+    public readonly gamertag?: Gamertag,
   ) {}
 }
diff --git a/src/application/queryHandlers/FindLeaderboardsQueryHandler.ts b/src/application/queryHandlers/FindLeaderboardsQueryHandler.ts
@@ -76,7 +76,7 @@ export class FindLeaderboardsQueryHandler
 
             leaderboardResponse.players.push({
               xuid: player.value,
-              gamertag: user.gamertag.value,
+              gamertag: user.gamertag?.value,
               stats,
             });
           }),

diff --git a/src/domain/aggregates/Player.ts b/src/domain/aggregates/Player.ts
@@ -6,7 +6,7 @@ import Gamertag from '../value-objects/Gamertag';
 
 interface PlayerProps {
   xuid: Xuid;
-  gamertag: Gamertag;
+  gamertag?: Gamertag;
   hostAddress: IpAddress;
   macAddress: MacAddress;
   machineId: Xuid;
@@ -16,7 +16,7 @@ interface PlayerProps {
 
 interface CreateProps {
   xuid: Xuid;
-  gamertag: Gamertag;
+  gamertag?: Gamertag;
   hostAddress: IpAddress;
   macAddress: MacAddress;
   machineId: Xuid;

diff --git a/src/infrastructure/persistance/mappers/PlayerDomainMapper.ts b/src/infrastructure/persistance/mappers/PlayerDomainMapper.ts
@@ -14,7 +14,7 @@ export default class PlayerDomainMapper {
   public mapToDomainModel(player: PlayerModel): Player {
     return new Player({
       xuid: new Xuid(player.xuid),
-      gamertag: new Gamertag(player.gamertag),
+      gamertag: player.gamertag ? new Gamertag(player.gamertag) : undefined,
       hostAddress: new IpAddress(player.hostAddress),
       macAddress: new MacAddress(player.macAddress),
       machineId: new Xuid(player.machineId),

diff --git a/src/infrastructure/persistance/mappers/PlayerPersistanceMapper.ts b/src/infrastructure/persistance/mappers/PlayerPersistanceMapper.ts
@@ -7,7 +7,7 @@ export default class PlayerPersistanceMapper {
   public mapToDataModel(player: Player): PlayerModel {
     return {
       xuid: player.xuid.value,
-      gamertag: player.gamertag.value,
+      gamertag: player.gamertag?.value,
       hostAddress: player.hostAddress.value,
       machineId: player.machineId.value,
       macAddress: player.macAddress.value,

diff --git a/src/infrastructure/presentation/controllers/player.controller.ts b/src/infrastructure/presentation/controllers/player.controller.ts
@@ -36,10 +36,10 @@ export class PlayerController {
     await this.commandBus.execute(
       new CreatePlayerCommand(
         new Xuid(request.xuid),
-        new Gamertag(request.gamertag),
         new Xuid(request.machineId),
         new IpAddress(request.hostAddress),
         new MacAddress(request.macAddress),
+        request.gamertag ? new Gamertag(request.gamertag) : undefined,
       ),
     );
   }
@@ -60,7 +60,7 @@ export class PlayerController {
 
     return {
       xuid: player.xuid.value,
-      gamertag: player.gamertag.value,
+      gamertag: player.gamertag ? player.gamertag.value : '',
       hostAddress: player.hostAddress.value,
       machineId: player.machineId.value,
       port: player.port,