Skip to content
Snippets Groups Projects

Development to testing

Merged Ghost User requested to merge Development into testing
11 files
+ 256
88
Compare changes
  • Side-by-side
  • Inline
Files
11
import {
import { Entity, Column, PrimaryGeneratedColumn, ManyToOne } from 'typeorm';
Entity,
Column,
PrimaryGeneratedColumn,
ManyToOne,
CreateDateColumn,
OneToMany,
} from 'typeorm';
import { GameEntity } from '../game/game.entity';
import { GameEntity } from '../game/game.entity';
import { FactionEntity } from '../faction/faction.entity';
import { FactionEntity } from '../faction/faction.entity';
@@ -20,7 +13,7 @@ export class MapDrawingEntity {
@@ -20,7 +13,7 @@ export class MapDrawingEntity {
@Column({ type: 'bool', nullable: true }) drawingIsActive: boolean;
@Column({ type: 'bool', nullable: true }) drawingIsActive: boolean;
@Column({ type: 'json', nullable: true }) data: JSON;
@Column({ type: 'json', nullable: true }) data: JSON;
// When Faction or game that has the drawing in question is deleted from
// When Faction or game that has the drawing in question is deleted from
// the database, the drawing is also deleted
// the database, the drawing is also deleted
@ManyToOne(type => FactionEntity, faction => faction.mapDrawings, {
@ManyToOne(type => FactionEntity, faction => faction.mapDrawings, {
onDelete: 'CASCADE',
onDelete: 'CASCADE',
Loading