lfk/backend
2
0
Fork 0
Code Issues 1 Pull Requests Actions Projects Releases 40 Activity

Merge branch 'feature/11-new_classes' of https://git.odit.services/lfk/backend into feature/11-new_classes

Browse Source
This commit is contained in:
Philipp Dormann 2020-12-02 18:27:16 +01:00
commit 63843cc4c9
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/models/User.ts
View File

@ -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 { IsBoolean, IsEmail, IsInt, IsNotEmpty, IsOptional, IsString, isUUID, } from "class-validator";
import { UserGroup } from './UserGroup'; import { UserGroup } from './UserGroup';
@ -73,9 +73,8 @@ export class User {
/** /**
* groups * groups
*/ */
// TODO: UserGroup implementation @ManyToMany(() => UserGroup)
// @OneToMany(() => UserGroup, usergroup => usergroup.) @JoinTable()
@IsOptional()
groups: UserGroup[]; groups: UserGroup[];
/** /**

2
src/models/UserGroup.ts
View File

@ -37,7 +37,7 @@ export abstract class UserGroup {
description: string; description: string;
/** /**
* Used to link users to a user group. * TODO: Something about permission stuff
*/ */
// TODO: // TODO:
// grouppermissions: GroupPermissions[]; // grouppermissions: GroupPermissions[];