chore: formatting

dto/conceptinturnresponse.dto.ts

@@ -1,16 +0,0 @@
-import { ConceptResponseDTO } from './conceptresponse.dto';
-
-export class ConceptInTurnResponseDTO {
-  constructor(partial: Partial<ConceptInTurnResponseDTO>) {
-    Object.assign(this, partial);
-    this.concept = new ConceptResponseDTO(partial.concept);
-  }
-
-  concept: ConceptResponseDTO;
-
-  order: number;
-
-  subconcept: number;
-
-  markers: number;
-}

dto/conceptresponse.dto.ts

@@ -1,9 +0,0 @@
-export class ConceptResponseDTO {
-  constructor(partial: Partial<ConceptResponseDTO>) {
-    Object.assign(this, partial);
-  }
-
-  id: number;
-
-  value: string;
-}

dto/gameresponse.dto.ts

@@ -1,27 +1,32 @@
-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>) {
-    Object.assign(this, partial);
+    this.id = partial.id;
-    this.owner = new UserResponseDTO(partial.owner);
+    this.started = partial.started;
+    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));
+    }
+
+    if (partial.currentPlayer) {
       this.currentPlayer = new PlayerResponseDTO(partial.currentPlayer);
-    this.currentConcepts = partial.currentConcepts.map(
+    }
-      (c) => new ConceptInTurnResponseDTO(c),
-    );
   }
 
   id: number;
 
-  owner: UserResponseDTO;
+  ownerId: string;
 
-  players: PlayerResponseDTO[];
+  players: PlayerResponseDTO[] = [];
 
-  currentPlayer: PlayerResponseDTO;
+  currentPlayer?: PlayerResponseDTO;
 
   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>) {
-    Object.assign(this, partial);
+    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;
 }

dto/userresponse.dto.ts

@@ -1,6 +1,8 @@
 export class UserResponseDTO {
-  constructor(partial: Partial<UserResponseDTO>) {
+  constructor(partial: UserResponseDTO) {
-    Object.assign(this, partial);
+    this.id = partial.id;
+    this.username = partial.username;
+    this.avatar = partial.avatar;
   }
   id: string;
 

events.ts

@@ -0,0 +1,3 @@
+export interface ConceptEvent {
+  type: string;
+}

game.events.ts

@@ -1,20 +1,47 @@
-import { PlayerResponseDTO } from './dto/playerresponse.dto';
+import { MessageResponseDTO } from "./dto/messageresponse.dto";
+import { PlayerResponseDTO } from "./dto/playerresponse.dto";
+import type { ConceptEvent } from "./events";
 
-export class GameStartEvent {
+export class GameStartEvent implements ConceptEvent {
-  type = 'start';
+  type = "start";
+  constructor(public currentPlayer: PlayerResponseDTO) {
+    this.currentPlayer = new PlayerResponseDTO(currentPlayer);
+  }
 }
 
-export class GameDeleteEvent {
+export class GameDeleteEvent implements ConceptEvent {
-  type = 'delete';
+  type = "delete";
 }
 
-export class GameJoinEvent {
+export class GameJoinEvent implements ConceptEvent {
-  type = 'joingame';
+  type = "joingame";
-  constructor(public player: PlayerResponseDTO) {}
+  constructor(public player: PlayerResponseDTO) {
+    this.player = new PlayerResponseDTO(player);
+  }
 }
 
-export class GameLeaveEvent {
+export class GameLeaveEvent implements ConceptEvent {
-  type = 'leavegame';
+  type = "leavegame";
-  gameId?: number;
+  constructor(public player: PlayerResponseDTO) {
-  constructor(public player: PlayerResponseDTO) {}
+    this.player = new PlayerResponseDTO(player);
+  }
+}
+
+export class GameMessageEvent implements ConceptEvent {
+  type = "message";
+  constructor(public message: MessageResponseDTO) {
+    this.message = new MessageResponseDTO(message);
+  }
+}
+
+export class GameMessageDeleteEvent implements ConceptEvent {
+  type = "deleteMessage";
+  constructor(public messageId: number) {}
+}
+
+export class GameEndTurnEvent implements ConceptEvent {
+  type = "endTurn";
+  constructor(public currentPlayer: PlayerResponseDTO) {
+    this.currentPlayer = new PlayerResponseDTO(currentPlayer);
+  }
 }

lobby.events.ts

@@ -1,34 +1,46 @@
-import { GameResponseDTO } from './dto/gameresponse.dto';
+import { GameResponseDTO } from "./dto/gameresponse.dto";
-import { PlayerResponseDTO } from './dto/playerresponse.dto';
+import { PlayerResponseDTO } from "./dto/playerresponse.dto";
+import type { ConceptEvent } from "./events";
 
-export class LobbyCreateEvent {
+export class LobbyCreateEvent implements ConceptEvent {
-  type = 'create';
+  type = "create";
-  constructor(public game: GameResponseDTO) {}
+  game: GameResponseDTO;
+  constructor(game: GameResponseDTO) {
+    this.game = new GameResponseDTO(game);
+  }
 }
 
-export class LobbyStartEvent {
+export class LobbyStartEvent implements ConceptEvent {
-  type = 'start';
+  type = "start";
-  constructor(public game: GameResponseDTO) {}
+  constructor(public game: GameResponseDTO) {
+    this.game = new GameResponseDTO(game);
+  }
 }
 
-export class LobbyDeleteEvent {
+export class LobbyDeleteEvent implements ConceptEvent {
-  type = 'delete';
+  type = "delete";
   constructor(public id: number) {}
 }
 
-export class LobbyJoinEvent {
+export class LobbyJoinEvent implements ConceptEvent {
-  type = 'joingame';
+  type = "joingame";
   constructor(
     public player: PlayerResponseDTO,
     public game: GameResponseDTO,
-  ) {}
+  ) {
+    this.player = new PlayerResponseDTO(player);
+    this.game = new GameResponseDTO(game);
+  }
 }
 
-export class LobbyLeaveEvent {
+export class LobbyLeaveEvent implements ConceptEvent {
-  type = 'leavegame';
+  type = "leavegame";
   gameId?: number;
   constructor(
     public player: PlayerResponseDTO,
     public game: GameResponseDTO,
-  ) {}
+  ) {
+    this.player = new PlayerResponseDTO(player);
+    this.game = new GameResponseDTO(game);
+  }
 }

word.events.ts

@@ -1,26 +1,31 @@
-import { WordResponseDTO } from './dto/wordresponse.dto';
+import { WordResponseDTO } from "./dto/wordresponse.dto";
+import type { ConceptEvent } from "./events";
 
-export class WordCreateEvent {
+export class WordCreateEvent implements ConceptEvent {
-  type = 'create';
+  type = "create";
-  constructor(public word: WordResponseDTO) {}
+  constructor(public word: WordResponseDTO) {
+    this.word = new WordResponseDTO(word);
+  }
 }
 
-export class WordEditEvent {
+export class WordEditEvent implements ConceptEvent {
-  type = 'edit';
+  type = "edit";
-  constructor(public word: WordResponseDTO) {}
+  constructor(public word: WordResponseDTO) {
+    this.word = new WordResponseDTO(word);
+  }
 }
 
-export class WordDeleteEvent {
+export class WordDeleteEvent implements ConceptEvent {
-  type = 'delete';
+  type = "delete";
   constructor(public id: number) {}
 }
 
-export class WordEnableEvent {
+export class WordEnableEvent implements ConceptEvent {
-  type = 'enable';
+  type = "enable";
   constructor(public id: number) {}
 }
 
-export class WordDisableEvent {
+export class WordDisableEvent implements ConceptEvent {
-  type = 'disable';
+  type = "disable";
   constructor(public id: number) {}
 }