From 84b45cd6b11347e66437cd92dc20372d0abd6eb9 Mon Sep 17 00:00:00 2001
From: Joseph Ditton <jditton.atomic@gmail.com>
Date: Wed, 1 Dec 2021 20:18:26 -0700
Subject: adds roles

---
 server/entities/role.entity.ts      | 15 ++++++++-------
 server/entities/user_role.entity.ts |  8 +++++++-
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'server/entities')

diff --git a/server/entities/role.entity.ts b/server/entities/role.entity.ts
index 35b4ac3..da33726 100644
--- a/server/entities/role.entity.ts
+++ b/server/entities/role.entity.ts
@@ -1,20 +1,21 @@
 import { Entity, PrimaryGeneratedColumn, OneToMany, Column } from 'typeorm';
 import { UserRole } from './user_role.entity';
 
+// Make sure to add aditional roles here then reseed
+export enum RoleKey {
+  ADMIN = 'admin',
+  USER = 'user',
+}
+
 @Entity()
 export class Role {
-  static ADMIN = 'admin';
-  static USER = 'user';
-
-  // make sure add additional roles to this arraylist as it
-  // will be used during seeds to initiallize all roles.
-  static ROLES = [Role.ADMIN, Role.USER];
+  static ROLES = [RoleKey.ADMIN, RoleKey.USER];
 
   @PrimaryGeneratedColumn()
   id: number;
 
   @Column()
-  key: string;
+  key: RoleKey;
 
   @OneToMany(() => UserRole, (userRole) => userRole.role)
   userRoles: UserRole[];
diff --git a/server/entities/user_role.entity.ts b/server/entities/user_role.entity.ts
index 0a6c5c6..e680a3a 100644
--- a/server/entities/user_role.entity.ts
+++ b/server/entities/user_role.entity.ts
@@ -1,4 +1,4 @@
-import { Entity, PrimaryGeneratedColumn, ManyToOne } from 'typeorm';
+import { Entity, PrimaryGeneratedColumn, ManyToOne, Column } from 'typeorm';
 import { Role } from './role.entity';
 import { User } from './user.entity';
 
@@ -7,6 +7,12 @@ export class UserRole {
   @PrimaryGeneratedColumn()
   id: number;
 
+  @Column()
+  roleId: number;
+
+  @Column()
+  userId: number;
+
   @ManyToOne(() => Role, (role) => role.userRoles)
   role: Role;
 
-- 
cgit v1.2.3-70-g09d2