Merge branch 'Score' into HEAD

src/game/game.controller.ts

@@ -55,8 +55,13 @@ export class GameController {
   }
 
   @Get('listgames')
-  async listGames() {
-    return this.gameservice.listGames();
+  async listGames(state) {
+    return this.gameservice.listGames(state);
+  }
+
+  @Get('listgames/:state')
+  async listGamesState(@Param('state') state: string) {
+    return this.gameservice.listGames(state);
   }
 
   // ClassSerializerInterceptor removes excluded columns set in Entities

src/game/game.dto.ts

@@ -76,7 +76,7 @@ export class newGameDTO {
 export class GameStateDTO {
   @IsUUID('4')
   id: string;
-  @IsIn(['CREATED', 'STARTED', 'PAUSED', 'ENDED'])
+  @IsIn(['CREATED', 'STARTED', 'PAUSED', 'ENDED', 'ONGOING'])
   state: string;
 }
 

src/game/game.service.ts

@@ -170,11 +170,31 @@ export class GameService {
   }
 
   // returns name and id of each game
-  async listGames() {
-    const games = await this.gameRepository.find();
-    return games.map(game => {
-      return game.gameObject();
-    });
+  async listGames(state) {
+    if(state == null){
+      const games = await this.gameRepository.find();
+      return games.map(game => {
+        return game.gameObject();
+      });
+    }
+    else if(state == 'ONGOING'){
+      const games = await this.gameRepository.find({
+        where: [
+          {state: 'CREATED'}, {state: 'STARTED'}, {state: 'PAUSED'},
+        ]
+      });
+      return games.map(game => {
+        return game.gameObject();
+      });
+    }
+    else{
+      const games = await this.gameRepository.find({
+        where: {state: state}
+      });
+      return games.map(game => {
+        return game.gameObject();
+      });
+    }
   }
 
   // returns information about a game identified by id