From bacc12fc5689517eba0431b275c89c31b75b37a3 Mon Sep 17 00:00:00 2001
From: Ronnie Friman <L4168@student.jamk.fi>
Date: Mon, 22 Jul 2019 17:27:25 +0300
Subject: [PATCH] trackingdata returns username
---
src/tracking/tracking.service.ts | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/tracking/tracking.service.ts b/src/tracking/tracking.service.ts
index 769ae24..1a772ee 100644
--- a/src/tracking/tracking.service.ts
+++ b/src/tracking/tracking.service.ts
@@ -70,7 +70,7 @@ export class TrackingService {
playerdata.push(
await this.trackingrepository.find({
where: { faction: gameperson.faction },
- relations: ['faction', 'gamepersonId'],
+ relations: ['faction', 'gamepersonId', 'gamepersonId.person'],
}),
);
} else {
@@ -79,7 +79,7 @@ export class TrackingService {
factions.map(async faction => {
let rawdata = await this.trackingrepository.find({
where: { faction: faction.factionId },
- relations: ['faction', 'gamepersonId'],
+ relations: ['faction', 'gamepersonId', 'gamepersonId.person'],
});
let groups = {
'infantry.svg': [],
@@ -105,6 +105,7 @@ export class TrackingService {
await Promise.all(
faction[group].map(async player => {
return await {
+ username: player['gamepersonId']['person']['name'],
gamepersonId: player['gamepersonId']['gamepersonId'],
gamepersonRole: player['gamepersonId']['role'],
factionId: player['faction']['factionId'],
--
GitLab