From cf98661fce1fd7d38e6e60410a22949eccedf755 Mon Sep 17 00:00:00 2001
From: Samuli Virtapohja <l4721@student.jamk.fi>
Date: Wed, 24 Jul 2019 14:03:38 +0300
Subject: [PATCH] tracking folder audited
---
src/tracking/geo.dto.ts | 2 ++
src/tracking/tracking.controller.ts | 10 ----------
src/tracking/tracking.dto.ts | 2 +-
src/tracking/tracking.entity.ts | 2 +-
src/tracking/tracking.service.ts | 24 ------------------------
5 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/src/tracking/geo.dto.ts b/src/tracking/geo.dto.ts
index 352faf7..681e1b6 100644
--- a/src/tracking/geo.dto.ts
+++ b/src/tracking/geo.dto.ts
@@ -1,5 +1,7 @@
import { IsNumber, Min, Max, Allow } from 'class-validator';
+// latitude and longitude accepts degrees from worldmap
+
export class GeoDTO {
@IsNumber()
@Min(-90)
diff --git a/src/tracking/tracking.controller.ts b/src/tracking/tracking.controller.ts
index 93d0779..a98c12b 100644
--- a/src/tracking/tracking.controller.ts
+++ b/src/tracking/tracking.controller.ts
@@ -42,14 +42,4 @@ export class TrackingController {
async getPlayerLocations(@GamePerson() gameperson, @Param('id') gameId) {
return this.trackingservice.getPlayers(gameperson, gameId);
}
-
-
- // finds certain player
- @Get('player/:id')
- @Roles('admin', 'factionleader')
- @GameStates('STARTED', 'PAUSED')
- @UseInterceptors(ClassSerializerInterceptor)
- async getPlayerData(@User('id') userId, @Param('id') gameid, @Body() person) {
- return this.trackingservice.getPlayerData(person);
- }
}
diff --git a/src/tracking/tracking.dto.ts b/src/tracking/tracking.dto.ts
index 3ac93c7..181430b 100644
--- a/src/tracking/tracking.dto.ts
+++ b/src/tracking/tracking.dto.ts
@@ -1,4 +1,4 @@
-import { Allow, ValidateNested } from 'class-validator';
+import { ValidateNested } from 'class-validator';
import { GeoDTO } from './geo.dto';
import { Type } from 'class-transformer';
diff --git a/src/tracking/tracking.entity.ts b/src/tracking/tracking.entity.ts
index 4952e18..dc398ac 100644
--- a/src/tracking/tracking.entity.ts
+++ b/src/tracking/tracking.entity.ts
@@ -1,6 +1,6 @@
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from 'typeorm';
import { Game_PersonEntity, GameEntity } from '../game/game.entity';
-import { FactionEntity } from 'src/faction/faction.entity';
+import { FactionEntity } from '../faction/faction.entity';
import { GeoDTO } from './geo.dto';
@Entity('Tracking')
diff --git a/src/tracking/tracking.service.ts b/src/tracking/tracking.service.ts
index 1a772ee..175c3ea 100644
--- a/src/tracking/tracking.service.ts
+++ b/src/tracking/tracking.service.ts
@@ -42,7 +42,6 @@ export class TrackingService {
await this.trackingrepository.save(trackedperson);
return { message: 'Location updated!' };
} else {
- // first entry will be empty
trackdata['time'] = Date.now();
// initialize data
trackedperson = await this.trackingrepository.create(trackedperson);
@@ -122,27 +121,4 @@ export class TrackingService {
);
return currentdata;
}
-
- // get selected player data
- async getPlayerData(person) {
- const gameperson = await this.gamepersonrepository.findOne({
- where: { gamepersonId: person.gamepersonId },
- relations: ['person', 'leaderGroup', 'group', 'faction'],
- });
- if (!gameperson) {
- throw new HttpException('No player found!', HttpStatus.BAD_REQUEST);
- }
-
- return {
- gamepersonId: gameperson.gamepersonId,
- name: gameperson.person.name,
- role: gameperson.role,
- group: gameperson.group,
- faction: {
- factionId: gameperson.faction.factionId,
- factionName: gameperson.faction.factionName,
- colour: gameperson.faction.colour,
- },
- };
- }
}
--
GitLab