From 4b1e2eee7691513caa311d3fe69a288d6f6f9253 Mon Sep 17 00:00:00 2001
From: Samuli Virtapohja <l4721@student.jamk.fi>
Date: Fri, 5 Jul 2019 16:10:09 +0300
Subject: [PATCH] weekend
---
src/tracking/tracking.entity.ts | 4 +++-
src/tracking/tracking.service.ts | 10 ++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/tracking/tracking.entity.ts b/src/tracking/tracking.entity.ts
index e208b95..f399824 100644
--- a/src/tracking/tracking.entity.ts
+++ b/src/tracking/tracking.entity.ts
@@ -1,5 +1,5 @@
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from 'typeorm';
-import { Game_PersonEntity } from '../game/game.entity';
+import { Game_PersonEntity, GameEntity } from '../game/game.entity';
import { FactionEntity } from 'src/faction/faction.entity';
@Entity('Tracking')
@@ -10,4 +10,6 @@ export class TrackingEntity {
gamepersonId: Game_PersonEntity;
@ManyToOne(type => FactionEntity, faction => faction.factionId)
faction: FactionEntity;
+ @ManyToOne(type => GameEntity, game => game.id)
+ game: GameEntity;
}
diff --git a/src/tracking/tracking.service.ts b/src/tracking/tracking.service.ts
index 0d6994c..cb44c4f 100644
--- a/src/tracking/tracking.service.ts
+++ b/src/tracking/tracking.service.ts
@@ -64,10 +64,16 @@ export class TrackingService {
relations: ['faction'],
});
- // if faction is not null, user is factionleader
+ // if user , user is factionleader
if (gameperson.faction) {
- return 'factionleader';
+ const playerdata = await this.trackingrepository.find({
+ where: { faction: gameperson.faction },
+ });
+ return playerdata;
} else {
+ const playerdata = await this.trackingrepository.find({
+ where: { game: gameId },
+ });
return 'admin';
}
}
--
GitLab