fixing game list bug

src/game/coordinate.entity.ts

@@ -2,21 +2,27 @@ import {
   Entity,
   Column,
   PrimaryGeneratedColumn,
+  OneToMany,
   ManyToOne,
+  PrimaryColumn,
   Timestamp,
 } from 'typeorm';
-import { GameEntity, Game_PersonEntity } from './game.entity';
+import {
+  Game_PersonEntity,
+  ObjectivePointEntity,
+  GameEntity,
+} from './game.entity';
 import { FactionEntity } from './faction.entity';
 
 @Entity('MapDrawing')
 export class MapDrawingEntity {
   @PrimaryGeneratedColumn('uuid') mapDrawingId: string;
-  @Column({ type: 'bool' }) drawingIsActive: boolean;
-  @Column({ type: 'time' }) drawingValidTill: 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.factionId)
+  @ManyToOne(type => FactionEntity, faction => faction.mapDrawings)
   faction: FactionEntity;
   @ManyToOne(type => GameEntity, gameEntity => gameEntity.id)
   gameId: GameEntity;

src/game/faction.entity.ts

@@ -8,6 +8,7 @@ import {
 } from 'typeorm';
 import { GameEntity } from './game.entity';
 import { Game_PersonEntity } from './game.entity';
+import { MapDrawingEntity } from './coordinate.entity';
 
 //Faction, PowerUp, Faction_powerUp, FP_History, Score
 
@@ -22,6 +23,13 @@ export class FactionEntity {
   game_persons: Game_PersonEntity[];
   @ManyToOne(type => GameEntity, game => game.id)
   gameId: GameEntity;
+  @OneToMany(type => MapDrawingEntity, mapDrawings => mapDrawings.faction)
+  mapDrawings: MapDrawingEntity[];
+
+  factionObject() {
+    const { factionId, factionName, gameId } = this;
+    return { factionId, factionName, gameId };
+  }
 }
 
 @Entity('PowerUp')

src/game/game.entity.ts

@@ -29,7 +29,7 @@ export class GameEntity {
   @Column('timestamp') startdate: Timestamp;
   @Column('timestamp') enddate: Timestamp;
 
-  @OneToMany(type => FactionEntity, factions => factions.factionId)
+  @OneToMany(type => FactionEntity, factions => factions.gameId)
   factions: FactionEntity[];
   @OneToMany(type => Game_PersonEntity, game_persons => game_persons.game)
   game_persons: Game_PersonEntity[];