From 4a9fd57356132b2fce539724c2faecdc6f160e7f Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 2 Dec 2020 18:20:53 +0100 Subject: [PATCH] Fixed user<-> Group relationship --- src/models/User.ts | 7 +++---- src/models/UserGroup.ts | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/models/User.ts b/src/models/User.ts index fcc897e..e068b57 100644 --- a/src/models/User.ts +++ b/src/models/User.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, ManyToOne, PrimaryGeneratedColumn, Generated, Unique } from "typeorm"; +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'; @@ -73,9 +73,8 @@ export class User { /** * groups */ - // TODO: UserGroup implementation - // @OneToMany(() => UserGroup, usergroup => usergroup.) - @IsOptional() + @ManyToMany(() => UserGroup) + @JoinTable() groups: UserGroup[]; /** diff --git a/src/models/UserGroup.ts b/src/models/UserGroup.ts index 61a434e..96b1633 100644 --- a/src/models/UserGroup.ts +++ b/src/models/UserGroup.ts @@ -37,7 +37,7 @@ export abstract class UserGroup { description: string; /** - * Used to link users to a user group. + * TODO: Something about permission stuff */ // TODO: // grouppermissions: GroupPermissions[];