From 35e72a2134c87a86cecf6684e7a6d95d2230df79 Mon Sep 17 00:00:00 2001
From: Errormacr <tulupov.valeriy@mail.ru>
Date: Mon, 20 Nov 2023 14:59:51 +0300
Subject: [PATCH]  Update Admin entity and AdminService to use user_id instead
 of id

---
 backend/libs/database/admin.entity.ts      | 14 +++++++++++---
 backend/src/modules/admin/admin.service.ts |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/backend/libs/database/admin.entity.ts b/backend/libs/database/admin.entity.ts
index 66a86f5..022d660 100644
--- a/backend/libs/database/admin.entity.ts
+++ b/backend/libs/database/admin.entity.ts
@@ -1,4 +1,5 @@
-import { Entity, PrimaryColumn } from 'typeorm';
+import { Entity, OneToOne, JoinColumn, PrimaryGeneratedColumn, Column } from 'typeorm';
+import { User } from './user.entity';
 
 @Entity()
 export class Admin {
@@ -6,6 +7,13 @@ export class Admin {
         Object.assign(this, props);
     }
 
-    @PrimaryColumn()
-    public id!: string;
+    @PrimaryGeneratedColumn()
+    public id!: number;
+
+    @Column()
+    user_id: string;
+
+    @OneToOne(() => User)
+    @JoinColumn({ name: 'user_id' })
+    user: User;
 }
diff --git a/backend/src/modules/admin/admin.service.ts b/backend/src/modules/admin/admin.service.ts
index 5001fb0..f732c20 100644
--- a/backend/src/modules/admin/admin.service.ts
+++ b/backend/src/modules/admin/admin.service.ts
@@ -21,7 +21,7 @@ export class AdminService {
         try {
             this.logger.debug(`[admin.checkIsAdmin]`);
             const admins = await this.adminRepository.findOne({
-                where: { id: id },
+                where: { user_id: id },
             });
             if (!admins) {
                 return false;