From e8292bd819f6368fb69061f4764f7c8817bc4752 Mon Sep 17 00:00:00 2001
From: L4168 <L4168@student.jamk.fi>
Date: Thu, 6 Jun 2019 18:45:56 +0300
Subject: [PATCH] updated services
---
package-lock.json | 41 ++++++++++++++++++-------
src/game/game.controller.ts | 14 +++++----
src/game/game.entity.ts | 7 ++++-
src/game/game.service.ts | 30 ++++++++++--------
src/main.ts | 2 +-
src/mapmarkers/mapmarker.service.ts | 2 +-
src/mapmarkers/mapmarkers.controller.ts | 2 +-
7 files changed, 64 insertions(+), 34 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 12e5ef5..290769d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3005,7 +3005,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"aproba": {
"version": "1.2.0",
@@ -3026,12 +3027,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -3046,17 +3049,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"core-util-is": {
"version": "1.0.2",
@@ -3173,7 +3179,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"ini": {
"version": "1.3.5",
@@ -3185,6 +3192,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -3199,6 +3207,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -3206,12 +3215,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -3230,6 +3241,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -3310,7 +3322,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -3322,6 +3335,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"wrappy": "1"
}
@@ -3407,7 +3421,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -3443,6 +3458,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -3462,6 +3478,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -3505,12 +3522,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
}
}
},
diff --git a/src/game/game.controller.ts b/src/game/game.controller.ts
index 3294a0b..4ec3580 100644
--- a/src/game/game.controller.ts
+++ b/src/game/game.controller.ts
@@ -1,24 +1,26 @@
-import { Controller, Post, UseGuards, Body, Get } from '@nestjs/common';
+import { Controller, Post, UseGuards, Body, Get, Param } from '@nestjs/common';
import { GameService } from './game.service';
-import { AuthGuard } from 'dist/shared/auth.guard';
+import { AuthGuard } from '../shared/auth.guard';
import { User } from 'src/user/user.decorator';
import { GameDTO, FactionDTO } from './game.dto';
@Controller('game')
export class GameController {
- constructor(private gameservice:GameService) {}
+ constructor(private gameservice: GameService) { }
@Post('new')
@UseGuards(new AuthGuard())
async newGame(@User('id') person, @Body() body) {
- //@Body() game: GameDTO, @Body() factions: FactionDTO[]
- //return body;
return this.gameservice.createNewGame(person, body, body.factions);
- //game: GameDTO, @Body() factions: FactionDTO[]
}
@Get('listgames')
async listGames() {
return this.gameservice.listGames();
}
+
+ @Get(':id')
+ async returnGameInfo(@Param('id') id: string) {
+ return this.gameservice.returnGameInfo(id);
+ }
}
diff --git a/src/game/game.entity.ts b/src/game/game.entity.ts
index a79b61b..0a35559 100644
--- a/src/game/game.entity.ts
+++ b/src/game/game.entity.ts
@@ -19,6 +19,11 @@ export class GameEntity {
@Column('timestamp') enddate: Timestamp;
@OneToMany(type => FactionEntity, faction => faction.game)
factions: FactionEntity[];
+
+ gameObject() {
+ const { id, name } = this;
+ return { id, name };
+ }
}
// table that stores all factions created for games
@@ -28,4 +33,4 @@ export class FactionEntity {
@Column('text') name: string;
@ManyToOne(type => GameEntity, game => game.factions)
game: GameEntity;
-}
+}
\ No newline at end of file
diff --git a/src/game/game.service.ts b/src/game/game.service.ts
index 9c8ff88..a14ae18 100644
--- a/src/game/game.service.ts
+++ b/src/game/game.service.ts
@@ -11,7 +11,7 @@ export class GameService {
private gameRepository: Repository<GameEntity>,
@InjectRepository(FactionEntity)
private factionRepository: Repository<FactionEntity>,
- ) {}
+ ) { }
// create a new game
async createNewGame(
@@ -19,31 +19,35 @@ export class GameService {
gameData: GameDTO,
factions: FactionDTO[],
) {
- //Logger.log(gameData);
- //Logger.log(factions);
const game = await this.gameRepository.create({
...gameData,
factions: factions,
});
await this.gameRepository.insert(game);
-
+ // get the id of the game created to pass it to factions table
const gameid = await this.gameRepository.findOne({ where: { name: gameData.name } })
factions.map(async faction => {
- let name = await this.factionRepository.create({
- ...faction,
- game: gameid
- });
- await this.factionRepository.insert(name);
+ let name = await this.factionRepository.create({
+ ...faction,
+ game: gameid
+ });
+ await this.factionRepository.insert(name);
});
return 'success';
-}
+ }
+ // returns name and id of each game
async listGames() {
- //return await this.gameRepository.find();
const games = await this.gameRepository.find({ relations: ['factions'] });
return games.map(game => {
- return { ...game, factions: game.factions };
+ return { game };
});
}
-}
+
+ // returns information about a game identified by id
+ async returnGameInfo(id: string) {
+ const game = await this.gameRepository.findOne({ where: { id: id }, relations: ['factions'] });
+ return game;
+ }
+}
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 3f85030..3c7cc46 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -17,6 +17,6 @@ async function bootstrap() {
app.enableCors();
// apply limiter to all routes
app.use(limiter);
- await app.listen(5001);
+ await app.listen(5000);
}
bootstrap();
diff --git a/src/mapmarkers/mapmarker.service.ts b/src/mapmarkers/mapmarker.service.ts
index 5235e4b..f185de4 100644
--- a/src/mapmarkers/mapmarker.service.ts
+++ b/src/mapmarkers/mapmarker.service.ts
@@ -4,7 +4,7 @@ import { InjectRepository } from "@nestjs/typeorm";
import { MapMarkerEntity } from './mapmarker.entity';
import { MapMarkerDTO } from './mapmarker.dto';
-import { PersonEntity } from 'dist/user/user.entity';
+import { PersonEntity } from '../user/user.entity';
import { userInfo } from 'os';
@Injectable()
diff --git a/src/mapmarkers/mapmarkers.controller.ts b/src/mapmarkers/mapmarkers.controller.ts
index f6c2e0b..7f98652 100644
--- a/src/mapmarkers/mapmarkers.controller.ts
+++ b/src/mapmarkers/mapmarkers.controller.ts
@@ -2,7 +2,7 @@ import { Controller, Body, Get, Put, UseGuards } from '@nestjs/common';
import { MapMarkerService } from './mapmarker.service';
import { MapMarkerDTO } from './mapmarker.dto';
-import { AuthGuard } from 'dist/shared/auth.guard';
+import { AuthGuard } from '../shared/auth.guard';
import { User } from 'src/user/user.decorator';
@Controller('mapmarkers')
--
GitLab