working on replay

src/faction/faction.entity.ts

@@ -13,6 +13,7 @@ import { GameEntity } from '../game/game.entity';
 import { Game_PersonEntity } from '../game/game.entity';
 import { MapDrawingEntity } from '../draw/coordinate.entity';
 import { Exclude } from 'class-transformer';
+import { ScoreEntity } from 'src/score/score.entity';
 
 //Faction, PowerUp, Faction_powerUp, FP_History, Score
 
@@ -35,6 +36,10 @@ export class FactionEntity {
   game: GameEntity;
   @OneToMany(type => MapDrawingEntity, mapDrawings => mapDrawings.faction)
   mapDrawings: MapDrawingEntity[];
+  @OneToMany(type => ScoreEntity, score => score.scoreId, {
+    onDelete: 'NO ACTION',
+  })
+  scores: ScoreEntity[];
 
   factionObject() {
     const { factionId, factionName, game } = this;

src/replay/replay.controller.ts

-import { Controller, Get, Param, Post } from '@nestjs/common';
+import {
+  Controller,
+  Get,
+  Param,
+  Post,
+  UseInterceptors,
+  ClassSerializerInterceptor,
+} from '@nestjs/common';
 import { ReplayService } from './replay.service';
-import { Roles } from 'src/shared/guard.decorator';
 
 @Controller('replay')
 export class ReplayController {
   constructor(private replayservice: ReplayService) {}
 
   @Get(':id')
+  @UseInterceptors(ClassSerializerInterceptor)
   async replayInfo(@Param('id') gameId) {
     return this.replayservice.replayData(gameId);
   }

src/replay/replay.module.ts

@@ -8,8 +8,12 @@ import { FactionEntity, GameGroupEntity } from '../faction/faction.entity';
 import { UserService } from '../user/user.service';
 import { FactionService } from '../faction/faction.service';
 import { TrackingService } from '../tracking/tracking.service';
-import { TrackingEntity } from 'src/tracking/tracking.entity';
-import { PersonEntity } from 'src/user/user.entity';
+import { TrackingEntity } from '../tracking/tracking.entity';
+import { PersonEntity } from '../user/user.entity';
+import {
+  MapDrawingEntity,
+  MapDrawingHistoryEntity,
+} from '../draw/coordinate.entity';
 
 @Module({
   imports: [
@@ -20,6 +24,8 @@ import { PersonEntity } from 'src/user/user.entity';
       TrackingEntity,
       GameGroupEntity,
       Game_PersonEntity,
+      MapDrawingEntity,
+      MapDrawingHistoryEntity,
     ]),
   ],
   controllers: [ReplayController],

src/replay/replay.service.ts

@@ -4,11 +4,15 @@ import { Repository } from 'typeorm';
 import * as jwt from 'jsonwebtoken';
 
 import { FactionEntity } from '../faction/faction.entity';
-import { GameEntity } from 'src/game/game.entity';
-import { TrackingService } from 'src/tracking/tracking.service';
-import { UserService } from 'src/user/user.service';
-import { FactionService } from 'src/faction/faction.service';
-import { TrackingEntity } from 'src/tracking/tracking.entity';
+import { GameEntity } from '../game/game.entity';
+import { TrackingService } from '../tracking/tracking.service';
+import { UserService } from '../user/user.service';
+import { FactionService } from '../faction/faction.service';
+import { TrackingEntity } from '../tracking/tracking.entity';
+import {
+  MapDrawingEntity,
+  MapDrawingHistoryEntity,
+} from '../draw/coordinate.entity';
 
 @Injectable()
 export class ReplayService {
@@ -19,17 +23,31 @@ export class ReplayService {
     private gameRepository: Repository<GameEntity>,
     @InjectRepository(TrackingEntity)
     private trackingRepository: Repository<TrackingEntity>,
+    @InjectRepository(MapDrawingEntity)
+    private mapdrawingRepository: Repository<MapDrawingEntity>,
+    @InjectRepository(MapDrawingHistoryEntity)
+    private mapHistoryRepository: Repository<MapDrawingHistoryEntity>,
     private trackingService: TrackingService,
     private userService: UserService,
     private factionService: FactionService,
   ) {}
 
   async replayData(gameId) {
-    const replay = await this.factionRepository.find({
-      where: { game: gameId },
-      relations: ['mapDrawings', 'scores', 'trackdata'],
+    let mapDrawingIds = await this.mapdrawingRepository.find({
+      where: { gameId: gameId },
+      select: ['mapDrawingId'],
     });
-    return replay;
+    let drawings = [];
+    await Promise.all(
+      mapDrawingIds.map(async mapId => {
+        drawings.push(
+          await this.mapHistoryRepository.find({
+            mapdrawing: mapId.mapDrawingId,
+          }),
+        );
+      }),
+    );
+    return drawings;
   }
 
   // get replay data for players

src/score/score.service.ts

@@ -69,7 +69,8 @@ export class ScoreService {
             i => i.faction === current.owner.factionId,
           );
           index !== -1
-            ? await (scoreData[index]['score'] += box.objectivePointMultiplier * current.owner.multiplier)
+            ? await (scoreData[index]['score'] +=
+                box.objectivePointMultiplier * current.owner.multiplier)
             : await scoreData.push({
                 score: box.objectivePointMultiplier,
                 faction: current.owner.factionId,