Add host XUID to session object

AdrianCassar · Jul 18, 2024 · cd48eef · cd48eef
1 parent b7f7734
commit cd48eef
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 3 deletions.
diff --git a/src/application/commandHandlers/CreateSessionCommandHandler.ts b/src/application/commandHandlers/CreateSessionCommandHandler.ts
@@ -18,6 +18,7 @@ export class CreateSessionCommandHandler
   async execute(command: CreateSessionCommand) {
     const session = Session.create({
       id: command.sessionId,
+      xuid: command.xuid,
       titleId: command.titleId,
       title: command.title,
       mediaId: command.mediaId,

diff --git a/src/application/commands/CreateSessionCommand.ts b/src/application/commands/CreateSessionCommand.ts
@@ -3,10 +3,12 @@ import MacAddress from 'src/domain/value-objects/MacAddress';
 import SessionFlags from 'src/domain/value-objects/SessionFlags';
 import SessionId from 'src/domain/value-objects/SessionId';
 import TitleId from 'src/domain/value-objects/TitleId';
+import Xuid from 'src/domain/value-objects/Xuid';
 
 export class CreateSessionCommand {
   constructor(
     public readonly titleId: TitleId,
+    public readonly xuid: Xuid,
     public readonly title: string,
     public readonly mediaId: string,
     public readonly version: string,

diff --git a/src/domain/aggregates/Session.ts b/src/domain/aggregates/Session.ts
@@ -9,6 +9,7 @@ import Xuid from '../value-objects/Xuid';
 interface SessionProps {
   id: SessionId;
   titleId: TitleId;
+  xuid: Xuid;
   title: string;
   mediaId: string;
   version: string;
@@ -27,6 +28,7 @@ interface SessionProps {
 interface CreateProps {
   id: SessionId;
   titleId: TitleId;
+  xuid: Xuid;
   title: string;
   mediaId: string;
   version: string;
@@ -115,6 +117,11 @@ export default class Session {
   }
 
   public static createMigration(props: CreateMigrationProps) {
+    if (props.session.players.size > 0) {
+      // Remove old host from migrated session
+      props.session.players.delete(props.session.xuid.value);
+    }
+
     const newSession = new Session({
       ...props.session.props,
       id: new SessionId(this.GenerateSessionId()),
@@ -240,6 +247,10 @@ export default class Session {
     return this.props.titleId;
   }
 
+  get xuid() {
+    return this.props.xuid;
+  }
+
   get title() {
     return this.props.title;
   }

diff --git a/src/infrastructure/persistance/mappers/SessionDomainMapper.ts b/src/infrastructure/persistance/mappers/SessionDomainMapper.ts
@@ -6,6 +6,7 @@ import IpAddress from 'src/domain/value-objects/IpAddress';
 import SessionFlags from 'src/domain/value-objects/SessionFlags';
 import MacAddress from 'src/domain/value-objects/MacAddress';
 import SessionId from 'src/domain/value-objects/SessionId';
+import Xuid from 'src/domain/value-objects/Xuid';
 
 @Injectable()
 export default class SessionDomainMapper {
@@ -14,8 +15,9 @@ export default class SessionDomainMapper {
   public mapToDomainModel(session: SessionModel): Session {
     return new Session({
       id: new SessionId(session.id),
-      title: session.title,
       titleId: new TitleId(session.titleId),
+      xuid: session.xuid ? new Xuid(session.xuid) : undefined,
+      title: session.title,
       mediaId: session.mediaId,
       version: session.version,
       flags: new SessionFlags(session.flags),

diff --git a/src/infrastructure/persistance/mappers/SessionPersistanceMapper.ts b/src/infrastructure/persistance/mappers/SessionPersistanceMapper.ts
@@ -7,8 +7,9 @@ export default class SessionPersistanceMapper {
   public mapToDataModel(session: Session, updatedAt: Date): SessionModel {
     return {
       id: session.id.value,
-      title: session.title,
       titleId: session.titleId.toString(),
+      xuid: session.xuid ? session.xuid.value : undefined,
+      title: session.title,
       mediaId: session.mediaId,
       version: session.version,
       hostAddress: session.hostAddress.value,

diff --git a/src/infrastructure/persistance/models/SessionSchema.ts b/src/infrastructure/persistance/models/SessionSchema.ts
@@ -10,6 +10,8 @@ export class Session {
   @Prop({ required: true })
   titleId: string;
   @Prop({ required: true })
+  xuid: string;
+  @Prop({ required: true })
   title: string;
   @Prop({ required: true })
   mediaId: string;

diff --git a/src/infrastructure/presentation/controllers/session.controller.ts b/src/infrastructure/presentation/controllers/session.controller.ts
@@ -81,6 +81,7 @@ export class SessionController {
       await this.commandBus.execute(
         new CreateSessionCommand(
           new TitleId(titleId),
+          request.xuid ? new Xuid(request.xuid) : undefined,
           request.title,
           request.mediaId,
           request.version,
@@ -345,7 +346,7 @@ export class SessionController {
         : false;
 
       if (!request.privateSlots) {
-        this.logger.warn('Defaulting to public slot');
+        this.logger.debug('Defaulting to public slot');
       }
 
       members.set(new Xuid(xuid), is_private);

diff --git a/src/infrastructure/presentation/requests/CreateSessionRequest.ts b/src/infrastructure/presentation/requests/CreateSessionRequest.ts
@@ -1,4 +1,5 @@
 export interface CreateSessionRequest {
+  xuid: string;
   title: string;
   mediaId: string;
   version: string;