add GameEndTurnEvent

dto/conceptresponse.dto.ts

@@ -5,6 +5,5 @@ export class ConceptResponseDTO {
   }
 
   id: number;
-
   value: string;
 }

dto/gameresponse.dto.ts

@@ -1,12 +1,16 @@
 import { UserResponseDTO } from './userresponse.dto';
 import { PlayerResponseDTO } from './playerresponse.dto';
 import { ConceptInTurnResponseDTO } from './conceptinturnresponse.dto';
+import { MessageResponseDTO } from './messageresponse.dto';
 
 export class GameResponseDTO {
   constructor(partial: Partial<GameResponseDTO>) {
     this.id = partial.id;
     this.started = partial.started;
-    this.owner = new UserResponseDTO(partial.owner);
+    this.ownerId = partial.ownerId;
+    if (partial.messages) {
+      this.messages = partial.messages.map((m) => new MessageResponseDTO(m));
+    }
     if (partial.players) {
       this.players = partial.players.map((p) => new PlayerResponseDTO(p));
     }
@@ -24,7 +28,7 @@ export class GameResponseDTO {
 
   id: number;
 
-  owner: UserResponseDTO;
+  ownerId: string;
 
   players: PlayerResponseDTO[] = [];
 
@@ -33,4 +37,6 @@ export class GameResponseDTO {
   started: boolean;
 
   currentConcepts: ConceptInTurnResponseDTO[] = [];
+
+  messages: MessageResponseDTO[] = [];
 }

dto/messageresponse.dto.ts

@@ -0,0 +1,11 @@
+export class MessageResponseDTO {
+  constructor(partial: Partial<MessageResponseDTO>) {
+    this.id = partial.id;
+    this.value = partial.value;
+    if (partial.authorId) this.authorId = partial.authorId;
+  }
+
+  id: number;
+  value: string;
+  authorId?: string;
+}

dto/playerresponse.dto.ts

@@ -1,12 +1,14 @@
-import { UserResponseDTO } from './userresponse.dto';
-
 export class PlayerResponseDTO {
   constructor(partial: Partial<PlayerResponseDTO>) {
     this.score = partial.score;
-    this.user = new UserResponseDTO(partial.user);
+    this.userId = partial.userId;
+    this.id = partial.id;
+    this.hasGuessed = partial.hasGuessed;
+    // this.user = new UserResponseDTO(partial.user);
   }
 
-  user: UserResponseDTO;
-
+  id: number;
+  userId: string;
   score: number;
+  hasGuessed: boolean;
 }

game.events.ts

@@ -1,7 +1,11 @@
+import { MessageResponseDTO } from './dto/messageresponse.dto';
 import { PlayerResponseDTO } from './dto/playerresponse.dto';
 
 export class GameStartEvent {
   type = 'start';
+  constructor(public currentPlayer: PlayerResponseDTO) {
+    this.currentPlayer = new PlayerResponseDTO(currentPlayer);
+  }
 }
 
 export class GameDeleteEvent {
@@ -17,8 +21,26 @@ export class GameJoinEvent {
 
 export class GameLeaveEvent {
   type = 'leavegame';
-  gameId?: number;
   constructor(public player: PlayerResponseDTO) {
     this.player = new PlayerResponseDTO(player);
   }
 }
+
+export class GameMessageEvent {
+  type = 'message';
+  constructor(public message: MessageResponseDTO) {
+    this.message = new MessageResponseDTO(message);
+  }
+}
+
+export class GameMessageDeleteEvent {
+  type = 'deleteMessage';
+  constructor(public messageId: number) {}
+}
+
+export class GameEndTurnEvent {
+  type = 'endTurn';
+  constructor(public currentPlayer: PlayerResponseDTO) {
+    this.currentPlayer = new PlayerResponseDTO(currentPlayer);
+  }
+}