From f41269d209411797ed0337246ae43b71236a980c Mon Sep 17 00:00:00 2001
From: Igor Propisnov <info@igor-propisnov.com>
Date: Sat, 4 May 2024 23:47:44 +0200
Subject: [PATCH] update id to uuid and change rename entity

---
 ...r.entity.ts => user-credentials.entity.ts} |  4 ++--
 .../src/modules/auth-module/auth.module.ts    |  7 +++++--
 .../repositories/user.repository.ts           | 19 +++++++++++++------
 .../database-module/database-config.ts        |  5 ++---
 4 files changed, 22 insertions(+), 13 deletions(-)
 rename backend/src/entities/{user.entity.ts => user-credentials.entity.ts} (84%)

diff --git a/backend/src/entities/user.entity.ts b/backend/src/entities/user-credentials.entity.ts
similarity index 84%
rename from backend/src/entities/user.entity.ts
rename to backend/src/entities/user-credentials.entity.ts
index 960a8cf..a9959b0 100644
--- a/backend/src/entities/user.entity.ts
+++ b/backend/src/entities/user-credentials.entity.ts
@@ -7,8 +7,8 @@ import {
 } from 'typeorm';
 
 @Entity()
-export class User {
-  @PrimaryGeneratedColumn()
+export class UserCredentials {
+  @PrimaryGeneratedColumn('uuid')
   id: number;
 
   @Column({ unique: true })
diff --git a/backend/src/modules/auth-module/auth.module.ts b/backend/src/modules/auth-module/auth.module.ts
index 171e9c8..fa1efaf 100644
--- a/backend/src/modules/auth-module/auth.module.ts
+++ b/backend/src/modules/auth-module/auth.module.ts
@@ -4,13 +4,16 @@ import { AuthController } from './controller/auth.controller';
 import { JwtModule } from '@nestjs/jwt';
 import { AccessTokenStrategy, RefreshTokenStrategy } from './strategies';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { User } from 'src/entities/user.entity';
+import { UserCredentials } from 'src/entities/user-credentials.entity';
 import { UserRepository } from './repositories/user.repository';
 import { EncryptionService } from './services/encryption.service';
 import { TokenManagementService } from './services/token-management.service';
 
 @Module({
-  imports: [JwtModule.register({}), TypeOrmModule.forFeature([User])],
+  imports: [
+    JwtModule.register({}),
+    TypeOrmModule.forFeature([UserCredentials]),
+  ],
   providers: [
     AuthService,
     TokenManagementService,
diff --git a/backend/src/modules/auth-module/repositories/user.repository.ts b/backend/src/modules/auth-module/repositories/user.repository.ts
index 64a5428..7e0ba22 100644
--- a/backend/src/modules/auth-module/repositories/user.repository.ts
+++ b/backend/src/modules/auth-module/repositories/user.repository.ts
@@ -1,25 +1,32 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { User } from 'src/entities/user.entity';
+import { UserCredentials } from 'src/entities/user-credentials.entity';
 import { Repository } from 'typeorm';
 
 @Injectable()
 export class UserRepository {
   constructor(
-    @InjectRepository(User)
-    private readonly repository: Repository<User>
+    @InjectRepository(UserCredentials)
+    private readonly repository: Repository<UserCredentials>
   ) {}
 
-  public async createUser(email: string, hash: string): Promise<User> {
+  public async createUser(
+    email: string,
+    hash: string
+  ): Promise<UserCredentials> {
     const user = this.repository.create({ email, hash });
     return this.repository.save(user);
   }
 
-  public async findUserByEmail(email: string): Promise<User | undefined> {
+  public async findUserByEmail(
+    email: string
+  ): Promise<UserCredentials | undefined> {
     return this.repository.findOne({ where: { email } });
   }
 
-  public async findUserById(userId: number): Promise<User | undefined> {
+  public async findUserById(
+    userId: number
+  ): Promise<UserCredentials | undefined> {
     return this.repository.findOne({ where: { id: userId } });
   }
 
diff --git a/backend/src/modules/database-module/database-config.ts b/backend/src/modules/database-module/database-config.ts
index 0f955ee..4d3d2bc 100644
--- a/backend/src/modules/database-module/database-config.ts
+++ b/backend/src/modules/database-module/database-config.ts
@@ -1,7 +1,6 @@
 import { ConfigService } from '@nestjs/config';
 import { TypeOrmModuleOptions } from '@nestjs/typeorm';
-import { resolve } from 'path';
-import { User } from '../../entities/user.entity';
+import { UserCredentials } from '../../entities/user-credentials.entity';
 
 export const databaseConfigFactory = (
   configService: ConfigService
@@ -14,5 +13,5 @@ export const databaseConfigFactory = (
   database: configService.get('DB_NAME'),
   synchronize: true,
   logging: true,
-  entities: [User],
+  entities: [UserCredentials],
 });