cleaning up

src/game/faction.entity.ts

@@ -21,14 +21,14 @@ export class FactionEntity {
 
   @OneToMany(type => Game_PersonEntity, game_persons => game_persons.faction)
   game_persons: Game_PersonEntity[];
-  @ManyToOne(type => GameEntity, game => game.id)
-  gameId: GameEntity;
+  @ManyToOne(type => GameEntity, game => game.factions)
+  game: GameEntity;
   @OneToMany(type => MapDrawingEntity, mapDrawings => mapDrawings.faction)
   mapDrawings: MapDrawingEntity[];
 
   factionObject() {
-    const { factionId, factionName, gameId } = this;
-    return { factionId, factionName, gameId };
+    const { factionId, factionName, game } = this;
+    return { factionId, factionName, game };
   }
 }
 

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.gameId)
+  @OneToMany(type => FactionEntity, factions => factions.game)
   factions: FactionEntity[];
   @OneToMany(type => Game_PersonEntity, game_persons => game_persons.game)
   game_persons: Game_PersonEntity[];
@@ -52,7 +52,7 @@ export class GameEntity {
 export class Game_PersonEntity {
   @PrimaryGeneratedColumn('uuid') gamepersonId: string;
   @Column({ type: 'text', nullable: true }) role: string;
-  @ManyToOne(type => FactionEntity, faction => faction)
+  @ManyToOne(type => FactionEntity, faction => faction.game_persons)
   faction: FactionEntity;
   @ManyToOne(type => GameEntity, game => game.id)
   game: GameEntity;

src/game/game.service.ts

@@ -86,7 +86,7 @@ export class GameService {
         if (!Object.values(factionNames).includes(faction.factionName)) {
           let name = await this.factionRepository.create({
             ...faction,
-            gameId: gameId,
+            game: gameId,
           });
           await this.factionRepository.insert(name);
         }
@@ -217,7 +217,7 @@ export class GameService {
   // add events to history and send updates with socket
   async flagboxEvent(gameId, data: FlagboxEventDTO) {
     // get all the factions associated with the game
-    const factionRef = await this.factionRepository.find({ gameId: gameId });
+    const factionRef = await this.factionRepository.find({ game: gameId });
     // get reference to the objective
     const objectiveRef = await this.objectivePointRepository.findOne({
       where: { objectivePointDescription: data.node_id, game: gameId },