Implemented new Permission system on the DB side.

ref #22

src/models/entities/Permission.ts

@@ -1,12 +1,11 @@
 import {
   IsInt,
-  IsNotEmpty,
+  IsNotEmpty
-
-  IsString
 } from "class-validator";
-import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from "typeorm";
+import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from "typeorm";
-import { User } from './User';
+import { PermissionAction } from '../enums/PermissionAction';
-import { UserGroup } from './UserGroup';
+import { PermissionTarget } from '../enums/PermissionTargets';
+import { Principal } from './Principal';
 /**
  * Defines the Permission interface.
 */
@@ -20,30 +19,27 @@ export abstract class Permission {
   id: number;
 
   /**
-   * users
+   * The permissions principal
    */
-  @OneToMany(() => User, user => user.permissions, { nullable: true })
+  @ManyToOne(() => Principal, principal => principal.permissions)
-  users: User[]
+  principal: Principal[]
-
-  /**
-   * groups
-   */
-  @OneToMany(() => UserGroup, group => group.permissions, { nullable: true })
-  groups: UserGroup[]
 
   /**
    * The target
    */
-  @Column()
+  @Column({
+    type: 'simple-enum',
+    enum: PermissionTarget
+  })
   @IsNotEmpty()
-  @IsString()
+  target: PermissionTarget;
-  target: string;
 
   /**
    * The action type
    */
-  @Column()
+  @Column({
-  @IsNotEmpty()
+    type: 'simple-enum',
-  @IsString()
+    enum: PermissionAction
-  action: string;
+  })
+  action: PermissionAction;
 }

src/models/entities/Principal.ts

@@ -0,0 +1,24 @@
+import { IsInt, IsOptional } from 'class-validator';
+import { Entity, OneToMany, PrimaryGeneratedColumn, TableInheritance } from 'typeorm';
+import { Permission } from './Permission';
+
+/**
+ * Defines a admin user.
+*/
+@Entity()
+@TableInheritance({ column: { name: "type", type: "varchar" } })
+export abstract class Principal {
+  /**
+  * autogenerated unique id (primary key).
+  */
+  @PrimaryGeneratedColumn()
+  @IsInt()
+  id: number;
+
+  /**
+* permissions
+*/
+  @IsOptional()
+  @OneToMany(() => Permission, permission => permission.principal, { nullable: true })
+  permissions?: Permission[];
+}

src/models/entities/User.ts

@@ -1,22 +1,16 @@
 import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsPhoneNumber, IsString, IsUUID } from "class-validator";
-import { Column, Entity, JoinTable, ManyToMany, ManyToOne, OneToMany, PrimaryGeneratedColumn } from "typeorm";
+import { ChildEntity, Column, JoinTable, ManyToMany, OneToMany } from "typeorm";
 import { config } from '../../config';
 import { Permission } from './Permission';
+import { Principal } from './Principal';
 import { UserAction } from './UserAction';
 import { UserGroup } from './UserGroup';
 
 /**
  * Defines a admin user.
 */
-@Entity()
+@ChildEntity()
-export class User {
+export class User extends Principal {
-  /**
-  * autogenerated unique id (primary key).
-  */
-  @PrimaryGeneratedColumn()
-  @IsInt()
-  id: number;
-
   /**
   * uuid
   */
@@ -78,13 +72,6 @@ export class User {
   @IsNotEmpty()
   password: string;
 
-  /**
-  * permissions
-  */
-  @IsOptional()
-  @ManyToOne(() => Permission, permission => permission.users, { nullable: true })
-  permissions?: Permission[];
-
   /**
   * groups
   */

src/models/entities/UserGroup.ts

@@ -1,29 +1,16 @@
 import {
-  IsInt,
   IsNotEmpty,
   IsOptional,
   IsString
 } from "class-validator";
-import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from "typeorm";
+import { ChildEntity, Column } from "typeorm";
-import { Permission } from "./Permission";
+import { Principal } from './Principal';
 
 /**
  * Defines the UserGroup interface.
 */
-@Entity()
+@ChildEntity()
-export class UserGroup {
+export class UserGroup extends Principal {
-  /**
-   * Autogenerated unique id (primary key).
-   */
-  @PrimaryGeneratedColumn()
-  @IsInt()
-  id: number;
-
-  /**
-     * permissions
-     */
-  @ManyToOne(() => Permission, permission => permission.groups, { nullable: true })
-  permissions: Permission[];
 
   /**
    * The group's name

src/models/enums/PermissionAction.ts

@@ -0,0 +1,6 @@
+export enum PermissionAction {
+    READ = 'READ',
+    ADD = 'ADD',
+    UPDATE = 'UPDATE',
+    DELETE = 'DELETE'
+}

src/models/enums/PermissionTargets.ts

@@ -0,0 +1,8 @@
+export enum PermissionTarget {
+    RUNNER = 'RUNNER',
+    ORGANISATION = 'RUNNERORGANISATION',
+    TEAM = 'RUNNERTEAM',
+    TRACK = 'TRACK',
+    USER = 'USER',
+    GROUP = 'USERGROUP'
+}