diff --git a/src/models/Permission.ts b/src/models/Permission.ts index 4dfeff2..e5d3d3c 100644 --- a/src/models/Permission.ts +++ b/src/models/Permission.ts @@ -7,10 +7,10 @@ import { } from "class-validator"; /** - * Defines the UserGroup interface. + * Defines the Permission interface. */ @Entity() -export abstract class UserGroup { +export abstract class Permission { /** * Autogenerated unique id (primary key). */ diff --git a/src/models/User.ts b/src/models/User.ts index e068b57..b59ad3f 100644 --- a/src/models/User.ts +++ b/src/models/User.ts @@ -1,6 +1,7 @@ import { Entity, Column, OneToMany, ManyToOne, PrimaryGeneratedColumn, Generated, Unique, JoinTable, ManyToMany } from "typeorm"; import { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsString, isUUID, } from "class-validator"; import { UserGroup } from './UserGroup'; +import { Permission } from './Permission'; /** * Defines a admin user. @@ -64,11 +65,11 @@ export class User { password: string; /** - * userpermissions + * permissions */ - // TODO: UserPermission implementation - // @OneToMany(() => UserPermission,userpermission=>) - // userpermissions: UserPermission[]; + // TODO: Permission implementation + // @OneToMany(() => Permission,userpermission=>) + // permissions: Permission[]; /** * groups diff --git a/src/models/UserGroup.ts b/src/models/UserGroup.ts index 96b1633..90f6378 100644 --- a/src/models/UserGroup.ts +++ b/src/models/UserGroup.ts @@ -5,7 +5,7 @@ import { IsOptional, IsString, } from "class-validator"; -import { User } from "./User"; +import { Permission } from "./Permission"; /** * Defines the UserGroup interface. @@ -40,5 +40,5 @@ export abstract class UserGroup { * TODO: Something about permission stuff */ // TODO: - // grouppermissions: GroupPermissions[]; + // grouppermissions: Permission[]; } \ No newline at end of file