update user, create migration, change role to enum

backend/src/entities/role.entity.ts

@@ -1,18 +0,0 @@
-import{
-    Entity,
-    Column,
-    BaseEntity,
-    PrimaryGeneratedColumn,
-} from 'typeorm'
-
-@Entity('role')
-export class RoleEntity extends BaseEntity{
-    @PrimaryGeneratedColumn('uuid')
-    id: string;
-
-    @Column({ nullable: false})
-    role_name: string;
-
-    @Column({ nullable: true })
-    description: string;
-}

backend/src/entities/user.entity.ts

@@ -9,8 +9,8 @@ import {
   JoinColumn,
 } from 'typeorm';
 import { BranchEntity } from './branch.entity.js';
-import { RoleEntity } from './role.entity.js';
 import { IsOptional } from 'class-validator';
+import { Role } from '../common/enums/role.enum.js';
 
 @Entity('users')
 export class UserEntity extends BaseEntity {
@@ -34,8 +34,8 @@ export class UserEntity extends BaseEntity {
   @Column({ nullable: true, unique: true })
   email: string;
 
-  @Column({ default: 'f3750930-48ab-4c30-8681-d50e68e2bda7' })
-  role_id: string;
+  @Column({ type: 'enum', enum: Role, default: 'CUSTOMER' })
+  role: Role;
   
   @Column()
   hash_password: string;
@@ -51,9 +51,4 @@ export class UserEntity extends BaseEntity {
   @IsOptional()
   @OneToMany(() => BranchEntity, (branch) => branch.owner)
   branches: Relation<BranchEntity>[];
-
-  @IsOptional()
-  @ManyToOne(() => RoleEntity)
-  @JoinColumn({ name: 'role_id'})
-  role: RoleEntity;
 }

backend/src/migrations/1728840582079-Addf.ts

@@ -1,18 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class Addf1728840582079 implements MigrationInterface {
-    name = 'Addf1728840582079'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`CREATE TABLE "branches" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "name" character varying NOT NULL, "location" character varying NOT NULL, "phone_number" character varying NOT NULL, "create_at" TIMESTAMP NOT NULL DEFAULT now(), "ownerId" uuid, CONSTRAINT "PK_7f37d3b42defea97f1df0d19535" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TABLE "users" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "avatar" character varying, "full_name" character varying, "phone_number" character varying, "address" character varying, "email" character varying, "role_id" integer, "hash_password" character varying, "is_valid" boolean NOT NULL DEFAULT true, "create_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_a3ffb1c0c8416b9fc6f907b7433" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`ALTER TABLE "branches" ADD CONSTRAINT "FK_8c6ae9f9c654c4fac71bccbb7ed" FOREIGN KEY ("ownerId") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "branches" DROP CONSTRAINT "FK_8c6ae9f9c654c4fac71bccbb7ed"`);
-        await queryRunner.query(`DROP TABLE "users"`);
-        await queryRunner.query(`DROP TABLE "branches"`);
-    }
-
-}

backend/src/migrations/1729703705445-AddBranchMenus.ts

@@ -1,20 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class AddBranchMenus1729703705445 implements MigrationInterface {
-    name = 'AddBranchMenus1729703705445'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`CREATE TABLE "menu_items" ("id" character varying NOT NULL, "item_name" character varying NOT NULL, "image_url" character varying, "item_group_id" character varying, "description" character varying NOT NULL, "price" integer NOT NULL, "create_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_57e6188f929e5dc6919168620c8" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE TABLE "branch_menu" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "branch_id" character varying NOT NULL, "menu_id" character varying NOT NULL, "description" character varying NOT NULL, "is_open" boolean NOT NULL, "branchId" uuid, "menuItemId" character varying, CONSTRAINT "PK_977becffe98bbc626a56031b9e7" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`ALTER TABLE "branch_menu" ADD CONSTRAINT "FK_e0c721a124fa03ea4cef6f28f42" FOREIGN KEY ("branchId") REFERENCES "branches"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-        await queryRunner.query(`ALTER TABLE "branch_menu" ADD CONSTRAINT "FK_cbfb42df5887653593974e3e285" FOREIGN KEY ("menuItemId") REFERENCES "menu_items"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "branch_menu" DROP CONSTRAINT "FK_cbfb42df5887653593974e3e285"`);
-        await queryRunner.query(`ALTER TABLE "branch_menu" DROP CONSTRAINT "FK_e0c721a124fa03ea4cef6f28f42"`);
-        await queryRunner.query(`DROP TABLE "branch_menu"`);
-        await queryRunner.query(`DROP TABLE "menu_items"`);
-    }
-
-}

backend/src/migrations/1729780814885-AddFeeds.ts

@@ -1,14 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class AddFeeds1729780814885 implements MigrationInterface {
-    name = 'AddFeeds1729780814885'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`CREATE TABLE "feeds" ("id" SERIAL NOT NULL, "author_id" character varying, "image_url" character varying, "title" character varying NOT NULL, "description" character varying, "create_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_3dafbf766ecbb1eb2017732153f" PRIMARY KEY ("id"))`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`DROP TABLE "feeds"`);
-    }
-
-}

backend/src/migrations/1729846207793-unique-email-phone.ts

@@ -1,19 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class UniqueEmailPhone1729846207793 implements MigrationInterface {
-    name = 'UniqueEmailPhone1729846207793'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "users" ADD CONSTRAINT "UQ_17d1817f241f10a3dbafb169fd2" UNIQUE ("phone_number")`);
-        await queryRunner.query(`ALTER TABLE "users" ADD CONSTRAINT "UQ_97672ac88f789774dd47f7c8be3" UNIQUE ("email")`);
-        await queryRunner.query(`ALTER TABLE "users" ALTER COLUMN "hash_password" SET NOT NULL`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "users" ALTER COLUMN "hash_password" DROP NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "users" DROP CONSTRAINT "UQ_97672ac88f789774dd47f7c8be3"`);
-        await queryRunner.query(`ALTER TABLE "users" DROP CONSTRAINT "UQ_17d1817f241f10a3dbafb169fd2"`);
-        await queryRunner.query(`DROP TABLE "feeds"`);
-    }
-
-}

backend/src/migrations/1729864559594-name-phone-not-nullable.ts

@@ -1,16 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class NamePhoneNotNullable1729864559594 implements MigrationInterface {
-    name = 'NamePhoneNotNullable1729864559594'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "users" ALTER COLUMN "full_name" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "users" ALTER COLUMN "phone_number" SET NOT NULL`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "users" ALTER COLUMN "phone_number" DROP NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "users" ALTER COLUMN "full_name" DROP NOT NULL`);
-    }
-
-}

backend/src/migrations/1729877042750-MoveMenuItemType.ts

@@ -1,20 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class MoveMenuItemType1729877042750 implements MigrationInterface {
-    name = 'MoveMenuItemType1729877042750'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "menu_items" RENAME COLUMN "item_group_id" TO "item_type"`);
-        await queryRunner.query(`ALTER TABLE "menu_items" DROP COLUMN "item_type"`);
-        await queryRunner.query(`CREATE TYPE "public"."menu_items_item_type_enum" AS ENUM('monchinh', 'trangmieng', 'giaikhat', 'khac')`);
-        await queryRunner.query(`ALTER TABLE "menu_items" ADD "item_type" "public"."menu_items_item_type_enum" NOT NULL DEFAULT 'khac'`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "menu_items" DROP COLUMN "item_type"`);
-        await queryRunner.query(`DROP TYPE "public"."menu_items_item_type_enum"`);
-        await queryRunner.query(`ALTER TABLE "menu_items" ADD "item_type" character varying`);
-        await queryRunner.query(`ALTER TABLE "menu_items" RENAME COLUMN "item_type" TO "item_group_id"`);
-    }
-
-}

backend/src/migrations/1729952137958-Change-role-id-string-default.ts

@@ -1,20 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class ChangeRoleIdStringDefault1729952137958 implements MigrationInterface {
-    name = 'ChangeRoleIdStringDefault1729952137958'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "users" DROP CONSTRAINT "FK_a2cecd1a3531c0b041e29ba46e1"`);
-        await queryRunner.query(`ALTER TABLE "users" ALTER COLUMN "role_id" SET NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "users" ALTER COLUMN "role_id" SET DEFAULT 'f3750930-48ab-4c30-8681-d50e68e2bda7'`);
-        await queryRunner.query(`ALTER TABLE "users" ADD CONSTRAINT "FK_a2cecd1a3531c0b041e29ba46e1" FOREIGN KEY ("role_id") REFERENCES "role"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "users" DROP CONSTRAINT "FK_a2cecd1a3531c0b041e29ba46e1"`);
-        await queryRunner.query(`ALTER TABLE "users" ALTER COLUMN "role_id" DROP DEFAULT`);
-        await queryRunner.query(`ALTER TABLE "users" ALTER COLUMN "role_id" DROP NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "users" ADD CONSTRAINT "FK_a2cecd1a3531c0b041e29ba46e1" FOREIGN KEY ("role_id") REFERENCES "role"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-    }
-
-}

backend/src/migrations/{1729070527478-Create-Role-Entity.ts → 1729963419864-enum-role.ts}

@@ -1,20 +1,22 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
 
-export class CreateRoleEntity1729070527478 implements MigrationInterface {
-    name = 'CreateRoleEntity1729070527478'
+export class EnumRole1729963419864 implements MigrationInterface {
+    name = 'EnumRole1729963419864'
 
     public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`CREATE TABLE "role" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "role_name" character varying NOT NULL, "description" character varying, CONSTRAINT "PK_b36bcfe02fc8de3c57a8b2391c2" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`ALTER TABLE "users" DROP COLUMN "role_id"`);
-        await queryRunner.query(`ALTER TABLE "users" ADD "role_id" uuid`);
-        await queryRunner.query(`ALTER TABLE "users" ADD CONSTRAINT "FK_a2cecd1a3531c0b041e29ba46e1" FOREIGN KEY ("role_id") REFERENCES "role"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "users" DROP CONSTRAINT "FK_a2cecd1a3531c0b041e29ba46e1"`);
+        await queryRunner.query(`ALTER TABLE "users" RENAME COLUMN "role_id" TO "role"`);
+        await queryRunner.query(`ALTER TABLE "users" DROP COLUMN "role"`);
+        await queryRunner.query(`CREATE TYPE "public"."users_role_enum" AS ENUM('CUSTOMER', 'ADMIN', 'BRANCH_MANAGER', 'AREA_MANAGER', 'STAFF', 'SHIPPER')`);
+        await queryRunner.query(`ALTER TABLE "users" ADD "role" "public"."users_role_enum" NOT NULL DEFAULT 'CUSTOMER'`);
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "users" DROP CONSTRAINT "FK_a2cecd1a3531c0b041e29ba46e1"`);
-        await queryRunner.query(`ALTER TABLE "users" DROP COLUMN "role_id"`);
-        await queryRunner.query(`ALTER TABLE "users" ADD "role_id" integer`);
-        await queryRunner.query(`DROP TABLE "role"`);
+        await queryRunner.query(`ALTER TABLE "users" DROP COLUMN "role"`);
+        await queryRunner.query(`DROP TYPE "public"."users_role_enum"`);
+        await queryRunner.query(`ALTER TABLE "users" ADD "role" uuid NOT NULL DEFAULT 'f3750930-48ab-4c30-8681-d50e68e2bda7'`);
+        await queryRunner.query(`ALTER TABLE "users" RENAME COLUMN "role" TO "role_id"`);
+        await queryRunner.query(`ALTER TABLE "users" ADD CONSTRAINT "FK_a2cecd1a3531c0b041e29ba46e1" FOREIGN KEY ("role_id") REFERENCES "role"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
     }
 
 }

backend/src/modules/authentication/authentication.controller.ts

@@ -12,7 +12,7 @@ import { Public } from './authentication.decorator.js';
 import { SignInDto } from './dto/sign-in.dto.js';
 import { SignUpDto } from './dto/sign-up.dto.js';
 import { Roles } from './authorization/roles.decorator.js';
-import { Role } from './authorization/enums/role.enum.js';
+import { Role } from '../../common/enums/role.enum.js';
 @Controller('authentication')
 
 export class AuthenticationController {

backend/src/modules/authentication/authentication.service.ts

@@ -23,11 +23,10 @@ export class AuthenticationService {
     else
       user = await this.usersService.findOneByField('phone_number', username);
     const compare = await bcrypt.compare(pass, user.hash_password)
-    console.log(compare);
     if (( !user || !compare )) {
       throw new UnauthorizedException();
     }
-    const payload = { sub: user.id, username: user.full_name, roles: user.role.role_name};
+    const payload = { sub: user.id, username: user.full_name, roles: user.role};
     return {
       access_token: await this.jwtService.signAsync(payload),
     };
@@ -55,7 +54,7 @@ export class AuthenticationService {
     })
     await this.usersService.save(user);
 
-    const payload = { sub: user.id, username: user.id, role: user.role };
+    const payload = { sub: user.id, username: user.full_name, role: user.role };
     const token = await this.jwtService.signAsync(payload)
     return {
       access_token: token

backend/src/modules/user/user.service.ts

@@ -34,8 +34,7 @@ export class UserService {
 
   async findOneByField(field: string, value: any): Promise<UserEntity | undefined> {
     return UserEntity.findOne({ 
-      where: { [field]: value },
-      relations: ['role'] 
+      where: { [field]: value }
     });
   }
 
@@ -45,8 +44,7 @@ export class UserService {
     await this.validateService.checkExistField('phone_number', updateUserDto.phone_number);
 
     const user = await UserEntity.findOne({
-      where: { id: userId },
-      relations: ['role']
+      where: { id: userId }
     });
     if (!user) {
       throw new NotFoundException(`User with ID ${userId} not found`);
@@ -59,7 +57,7 @@ export class UserService {
     }
     await UserEntity.save(user);
 
-    const payload = { sub: user.id, username: user.full_name, roles: user.role.role_name };
+    const payload = { sub: user.id, username: user.full_name, roles: user.role };
     const token = await this.jwtService.signAsync(payload)
     return {
       access_token: token

backend/src/validate/validate.service.ts

@@ -14,8 +14,7 @@ export class ValidateService {
 
     // Tìm trong database theo tên và giá trị của trường
     const existingUser = await UserEntity.findOne({ 
-        where: { [fieldName]: fieldValue }, 
-        relations: ['role'] 
+        where: { [fieldName]: fieldValue }
     });
 
     if (existingUser) {