diff --git a/src/tracking/geo.dto.ts b/src/tracking/geo.dto.ts index 352faf704db72912a548734185d277253d67c789..681e1b6d1f5c4cc30d66e113b5d1fb0dbf653dd9 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 93d0779a9c1ec36f2446b93167211f9c8eae9dce..a98c12bfb399cc797c9dd642de2663ae5d0a5d76 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 3ac93c71d8ccf3035e82fb52a7d21350b6407763..181430ba1f631fda4202d9d5115247a27c82a99c 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 4952e18c1f2cbac3b2c31a377909960ed85100c9..dc398ac8d9398aa475de128fd2bc6bfb87074013 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 1a772eec2d71e9c22eebc5fe49d12cf6d828779a..175c3eaaeb548507dc103c484b0f908edba9f1e1 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, - }, - }; - } }