From 15aa99aa0a1c065c660b42481936fac9d58d8fda Mon Sep 17 00:00:00 2001
From: L4168 <L4168@student.jamk.fi>
Date: Wed, 26 Jun 2019 11:45:36 +0300
Subject: [PATCH] moved task to task.entity
---
src/game/faction.entity.ts | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/src/game/faction.entity.ts b/src/game/faction.entity.ts
index 135d73a..4c15c86 100644
--- a/src/game/faction.entity.ts
+++ b/src/game/faction.entity.ts
@@ -8,9 +8,8 @@ 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, Task
+//Faction, PowerUp, Faction_powerUp, FP_History, Score
@Entity('Faction')
export class FactionEntity {
@@ -70,17 +69,3 @@ export class ScoreEntity {
@ManyToOne(type => FactionEntity, factionName => factionName.factionId)
faction: FactionEntity;
}
-
-@Entity('Task')
-export class TaskEntity {
- @PrimaryGeneratedColumn('uuid') taskId: string;
- @Column({ type: 'text' }) taskName: string;
- @Column({ type: 'text' }) taskDescription: string;
- @Column({ type: 'text' }) taskWinner: string;
- @Column({ type: 'bool' }) taskIsActive: boolean;
-
- @ManyToOne(type => FactionEntity, faction => faction.factionId)
- faction: FactionEntity;
- /* @ManyToOne(type => PersonEntity, person => person.tasks)
- person: PersonEntity; */
-}
--
GitLab