From 61a9f0a045c57d3a89702fde9f0c0e9945ee56a6 Mon Sep 17 00:00:00 2001 From: Claus-Peter Huebner Date: Tue, 27 Jun 2023 02:36:19 +0200 Subject: [PATCH] change entity relations --- database/entity/0067-add_user_roles_table/User.ts | 2 +- database/entity/0067-add_user_roles_table/UserRole.ts | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/database/entity/0067-add_user_roles_table/User.ts b/database/entity/0067-add_user_roles_table/User.ts index 07c723683..2812c2db4 100644 --- a/database/entity/0067-add_user_roles_table/User.ts +++ b/database/entity/0067-add_user_roles_table/User.ts @@ -87,7 +87,7 @@ export class User extends BaseEntity { @Column({ type: 'bool', default: false }) hideAmountGDT: boolean - @OneToOne(() => UserRole, (userRole) => userRole.userId) + @OneToOne(() => UserRole, (userRole: UserRole) => userRole.userId) @JoinColumn({ name: 'id' }) userRole?: UserRole diff --git a/database/entity/0067-add_user_roles_table/UserRole.ts b/database/entity/0067-add_user_roles_table/UserRole.ts index eeca3faa1..eb68b6e85 100644 --- a/database/entity/0067-add_user_roles_table/UserRole.ts +++ b/database/entity/0067-add_user_roles_table/UserRole.ts @@ -1,5 +1,4 @@ -import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToOne, JoinColumn } from 'typeorm' -import { User } from '../User' +import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm' @Entity('user_roles', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' }) export class UserRole extends BaseEntity { @@ -17,8 +16,4 @@ export class UserRole extends BaseEntity { @Column({ name: 'updated_at', nullable: true, default: null, type: 'datetime' }) updatedAt: Date | null - - @OneToOne(() => User, (user) => user.id) - @JoinColumn({ name: 'user_id' }) - userRole?: UserRole }