From 2835e3839fe054fe13185c7d9d0b4d26605e99a5 Mon Sep 17 00:00:00 2001
From: L4168 <L4168@student.jamk.fi>
Date: Wed, 10 Jul 2019 12:36:09 +0300
Subject: [PATCH] added ownership function
---
src/draw/coordinate.entity.ts | 41 ++++++++++-------------------------
1 file changed, 11 insertions(+), 30 deletions(-)
diff --git a/src/draw/coordinate.entity.ts b/src/draw/coordinate.entity.ts
index ef5447f..049f41b 100644
--- a/src/draw/coordinate.entity.ts
+++ b/src/draw/coordinate.entity.ts
@@ -1,12 +1,6 @@
-import {
- Entity,
- Column,
- PrimaryGeneratedColumn,
- ManyToOne,
- Timestamp,
-} from 'typeorm';
+import { Entity, Column, PrimaryGeneratedColumn, ManyToOne } from 'typeorm';
-import { Game_PersonEntity, GameEntity } from '../game/game.entity';
+import { GameEntity } from '../game/game.entity';
import { FactionEntity } from '../faction/faction.entity';
@Entity('MapDrawing')
@@ -25,27 +19,14 @@ export class MapDrawingEntity {
onDelete: 'CASCADE',
})
gameId: GameEntity;
-}
-
-@Entity('Game_Person_MapDrawing')
-export class Game_Person_MapDrawingEntity {
- @PrimaryGeneratedColumn('uuid') GPmapDrawingId: string;
- @Column({ type: 'timestamp' }) GPCTimeStamp: Timestamp;
- @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;
+ async ownershipCheck(factionEntity, role) {
+ if (role === 'admin') {
+ return factionEntity == this.faction;
+ } else {
+ return this.faction && factionEntity.factionId === this.faction.factionId
+ ? true
+ : false;
+ }
+ }
}
--
GitLab