From 247137ef27ff32c521898ff0cf90824291d45e62 Mon Sep 17 00:00:00 2001
From: Samuli Virtapohja <l4721@student.jamk.fi>
Date: Thu, 18 Jul 2019 17:07:58 +0300
Subject: [PATCH] remove timerstart from score service to prevent duplicate
timers
---
src/game/game.service.ts | 7 ++++++-
src/score/score.controller.ts | 7 -------
src/score/score.service.ts | 5 +----
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/game/game.service.ts b/src/game/game.service.ts
index e4288a4..887d06e 100644
--- a/src/game/game.service.ts
+++ b/src/game/game.service.ts
@@ -12,6 +12,7 @@ import { GameDTO, FlagboxEventDTO, GameStateDTO } from './game.dto';
import { PersonEntity } from '../user/user.entity';
import { FactionEntity } from '../faction/faction.entity';
import { NotificationGateway } from '../notifications/notifications.gateway';
+import { ScoreService } from 'src/score/score.service';
@Injectable()
export class GameService {
@@ -29,7 +30,11 @@ export class GameService {
ObjectivePoint_HistoryEntity
>,
private notificationGateway: NotificationGateway,
- ) {}
+ private scoreService: ScoreService,
+ ) {
+ //start timer when gameservice is loaded
+ this.scoreService.startTimer();
+ }
// create a new game
async createNewGame(personId: PersonEntity, gameData: GameDTO) {
// checks if a game with the same name exists already
diff --git a/src/score/score.controller.ts b/src/score/score.controller.ts
index dd26dd2..a9989a0 100644
--- a/src/score/score.controller.ts
+++ b/src/score/score.controller.ts
@@ -29,13 +29,6 @@ export class ScoreController {
return this.scoreService.addScore(data, gameId);
}
- // temporary scoreTick path, :id is gameId
- @Get('tick-score/:id')
- @GameStates('STARTED')
- async scoreTick(@Param('id') gameId: GameEntity) {
- return this.scoreService.scoreTick(gameId);
- }
-
// shows scores, :id is gameId
@Get('get-score/:id')
@UseInterceptors(ClassSerializerInterceptor)
diff --git a/src/score/score.service.ts b/src/score/score.service.ts
index 1a62576..957780c 100644
--- a/src/score/score.service.ts
+++ b/src/score/score.service.ts
@@ -30,10 +30,7 @@ export class ScoreService {
@InjectRepository(FactionEntity)
private factionRepository: Repository<FactionEntity>,
private notificationGateway: NotificationGateway,
- ) {
- // initialize timer when service is loaded
- this.startTimer();
- }
+ ) {}
async addScore(scoreData: ScoreDTO, gameId: GameEntity) {
// check if faction exists
--
GitLab