From 74ee77f814c269718cb99847e4a43600fc52b41f Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Sat, 5 Dec 2020 09:48:01 +0100 Subject: [PATCH] Cleaned up some relations for users ref #14 --- src/models/entities/User.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/models/entities/User.ts b/src/models/entities/User.ts index 7da56db..762ec92 100644 --- a/src/models/entities/User.ts +++ b/src/models/entities/User.ts @@ -81,13 +81,15 @@ export class User { /** * permissions */ + @IsOptional() @ManyToOne(() => Permission, permission => permission.users, { nullable: true }) permissions: Permission[]; /** * groups */ - @ManyToMany(() => UserGroup) + @IsOptional() + @ManyToMany(() => UserGroup, { nullable: true }) @JoinTable() groups: UserGroup[]; @@ -96,7 +98,7 @@ export class User { */ @Column() @IsBoolean() - enabled: boolean; + enabled: boolean = true; /** * jwt refresh count @@ -110,12 +112,13 @@ export class User { */ @Column() @IsString() - profilepic: string; + profilePic: string; /** * actions */ - @OneToMany(() => UserAction, action => action.user) + @IsOptional() + @OneToMany(() => UserAction, action => action.user, { nullable: true }) actions: UserAction /**