Development to testing

src/draw/coordinate.entity.ts

@@ -3,18 +3,16 @@ import {
   Column,
   PrimaryGeneratedColumn,
   ManyToOne,
-  Timestamp,
+  CreateDateColumn,
 } from 'typeorm';
 
-import { Game_PersonEntity, GameEntity } from '../game/game.entity';
+import { GameEntity } from '../game/game.entity';
 import { FactionEntity } from '../faction/faction.entity';
 
 @Entity('MapDrawing')
 export class MapDrawingEntity {
   @PrimaryGeneratedColumn('uuid') mapDrawingId: string;
   @Column({ type: 'bool', nullable: true }) drawingIsActive: boolean;
-  @Column({ type: 'time', nullable: true }) drawingValidTill: string;
-
   @Column({ type: 'json', nullable: true }) data: JSON;
 
   @ManyToOne(type => FactionEntity, faction => faction.mapDrawings, {
@@ -25,27 +23,27 @@ export class MapDrawingEntity {
     onDelete: 'CASCADE',
   })
   gameId: GameEntity;
+
+  async ownershipCheck(factionEntity, role) {
+    if (role === 'admin') {
+      return factionEntity == this.faction;
+    } else {
+      return this.faction && factionEntity.factionId === this.faction.factionId
+        ? true
+        : false;
+    }
+  }
 }
 
-@Entity('Game_Person_MapDrawing')
-export class Game_Person_MapDrawingEntity {
-  @PrimaryGeneratedColumn('uuid') GPmapDrawingId: string;
-  @Column({ type: 'timestamp' }) GPCTimeStamp: Timestamp;
+@Entity('MapDrawingHistory')
+export class MapDrawingHistoryEntity {
+  @PrimaryGeneratedColumn('uuid') mapDrawingHistoryId: string;
+  @CreateDateColumn() timestamp: Date;
+  @Column('bool') drawingIsActive: boolean;
+  @Column('json') data: JSON;
 
-  @ManyToOne(
-    type => Game_PersonEntity,
-    game_person => game_person.gamepersonId,
-    {
-      onDelete: 'CASCADE',
-    },
-  )
-  game_person: Game_PersonEntity;
-  @ManyToOne(
-    type => MapDrawingEntity,
-    map_drawing => map_drawing.mapDrawingId,
-    {
-      onDelete: 'CASCADE',
-    },
-  )
-  map_drawing: MapDrawingEntity;
+  @ManyToOne(() => MapDrawingEntity, mapDrawing => mapDrawing.mapDrawingId, {
+    onDelete: 'CASCADE',
+  })
+  mapdrawing: string;
 }