fix: update branch admin

backend/package.json

@@ -1,95 +1,95 @@
-{
-  "type": "module",
-  "name": "backend",
-  "version": "0.0.1",
-  "description": "",
-  "author": "",
-  "private": true,
-  "license": "UNLICENSED",
-  "scripts": {
-    "build": "nest build",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "start": "nest start",
-    "start:dev": "nest start --watch",
-    "start:debug": "nest start --debug --watch",
-    "start:prod": "node dist/main",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:cov": "jest --coverage",
-    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json",
-    "typeorm": "typeorm-ts-node-esm",
-    "db:migrate:generate": "npm run typeorm migration:generate -- -d ./src/config/typeorm.ts",
-    "db:migrate:up": "npm run typeorm migration:run -- -d ./src/config/typeorm.ts",
-    "db:migrate:down": "npm run typeorm migration:revert -- -d ./src/config/typeorm.ts"
-  },
-  "dependencies": {
-    "@nestjs/common": "^10.0.0",
-    "@nestjs/config": "^3.2.3",
-    "@nestjs/core": "^10.0.0",
-    "@nestjs/jwt": "^10.2.0",
-    "@nestjs/mapped-types": "*",
-    "@nestjs/passport": "^10.0.3",
-    "@nestjs/platform-express": "^10.0.0",
-    "@nestjs/typeorm": "^10.0.2",
-    "bcrypt": "^5.1.1",
-    "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.1",
-    "dateformat": "^5.0.3",
-    "dotenv": "^16.4.5",
-    "mysql2": "^3.11.3",
-    "nest-access-control": "^3.1.0",
-    "nestjs-paginate": "^9.3.0",
-    "passport": "^0.7.0",
-    "passport-jwt": "^4.0.1",
-    "passport-local": "^1.0.0",
-    "pg": "^8.13.0",
-    "reflect-metadata": "^0.2.0",
-    "rxjs": "^7.8.1",
-    "typeorm": "^0.3.20",
-    "vnpay": "^1.6.0"
-  },
-  "devDependencies": {
-    "@nestjs/cli": "^10.0.0",
-    "@nestjs/schematics": "^10.0.0",
-    "@nestjs/testing": "^10.0.0",
-    "@types/dateformat": "^5.0.2",
-    "@types/express": "^4.17.17",
-    "@types/jest": "^29.5.2",
-    "@types/multer": "^1.4.12",
-    "@types/node": "^20.3.1",
-    "@types/supertest": "^6.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.0.0",
-    "@typescript-eslint/parser": "^8.0.0",
-    "eslint": "^8.42.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "jest": "^29.5.0",
-    "prettier": "^3.0.0",
-    "source-map-support": "^0.5.21",
-    "supertest": "^7.0.0",
-    "ts-jest": "^29.1.0",
-    "ts-loader": "^9.4.3",
-    "ts-node": "^10.9.2",
-    "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.1.3"
-  },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "ts"
-    ],
-    "rootDir": "src",
-    "testRegex": ".*\\.spec\\.ts$",
-    "transform": {
-      "^.+\\.(t|j)s$": "ts-jest"
-    },
-    "collectCoverageFrom": [
-      "**/*.(t|j)s"
-    ],
-    "coverageDirectory": "../coverage",
-    "testEnvironment": "node"
-  }
-}
+{
+  "type": "module",
+  "name": "backend",
+  "version": "0.0.1",
+  "description": "",
+  "author": "",
+  "private": true,
+  "license": "UNLICENSED",
+  "scripts": {
+    "build": "nest build",
+    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "start": "nest start",
+    "start:dev": "nest start --watch",
+    "start:debug": "nest start --debug --watch",
+    "start:prod": "node dist/main",
+    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:cov": "jest --coverage",
+    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "typeorm": "typeorm-ts-node-esm",
+    "db:migrate:generate": "npm run typeorm migration:generate -- -d ./src/config/typeorm.ts",
+    "db:migrate:up": "npm run typeorm migration:run -- -d ./src/config/typeorm.ts",
+    "db:migrate:down": "npm run typeorm migration:revert -- -d ./src/config/typeorm.ts"
+  },
+  "dependencies": {
+    "@nestjs/common": "^10.0.0",
+    "@nestjs/config": "^3.2.3",
+    "@nestjs/core": "^10.0.0",
+    "@nestjs/jwt": "^10.2.0",
+    "@nestjs/mapped-types": "*",
+    "@nestjs/passport": "^10.0.3",
+    "@nestjs/platform-express": "^10.0.0",
+    "@nestjs/typeorm": "^10.0.2",
+    "bcrypt": "^5.1.1",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.1",
+    "dateformat": "^5.0.3",
+    "dotenv": "^16.4.5",
+    "mysql2": "^3.11.3",
+    "nest-access-control": "^3.1.0",
+    "nestjs-paginate": "^9.3.0",
+    "passport": "^0.7.0",
+    "passport-jwt": "^4.0.1",
+    "passport-local": "^1.0.0",
+    "pg": "^8.13.0",
+    "reflect-metadata": "^0.2.0",
+    "rxjs": "^7.8.1",
+    "typeorm": "^0.3.20",
+    "vnpay": "^1.6.0"
+  },
+  "devDependencies": {
+    "@nestjs/cli": "^10.0.0",
+    "@nestjs/schematics": "^10.0.0",
+    "@nestjs/testing": "^10.0.0",
+    "@types/dateformat": "^5.0.2",
+    "@types/express": "^4.17.17",
+    "@types/jest": "^29.5.2",
+    "@types/multer": "^1.4.12",
+    "@types/node": "^20.3.1",
+    "@types/supertest": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
+    "eslint": "^8.42.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "jest": "^29.5.0",
+    "prettier": "^3.0.0",
+    "source-map-support": "^0.5.21",
+    "supertest": "^7.0.0",
+    "ts-jest": "^29.1.0",
+    "ts-loader": "^9.4.3",
+    "ts-node": "^10.9.2",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5.1.3"
+  },
+  "jest": {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "ts"
+    ],
+    "rootDir": "src",
+    "testRegex": ".*\\.spec\\.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": "ts-jest"
+    },
+    "collectCoverageFrom": [
+      "**/*.(t|j)s"
+    ],
+    "coverageDirectory": "../coverage",
+    "testEnvironment": "node"
+  }
+}

backend/src/common/enums/VnpCardType.enum.ts

@@ -1,5 +1,5 @@
-export enum VnpCardType {
-    None = 0,
-	ATM = 1,
-	QRCODE = 2
+export enum VnpCardType {
+    None = 0,
+	ATM = 1,
+	QRCODE = 2
 }

backend/src/entities/branch.entity.ts

@@ -2,6 +2,7 @@ import {
   BaseEntity,
   Column,
   CreateDateColumn,
+  DeleteDateColumn,
   Entity,
   ManyToOne,
   OneToMany,
@@ -41,4 +42,7 @@ export class BranchEntity extends BaseEntity {
 
   @CreateDateColumn()
   create_at: Date;
+
+  @DeleteDateColumn()
+  delete_at: Date;
 }

backend/src/entities/feed.entity.ts

@@ -1,4 +1,11 @@
-import { Entity, Column, BaseEntity, PrimaryGeneratedColumn, CreateDateColumn } from 'typeorm';
+import {
+  Entity,
+  Column,
+  BaseEntity,
+  PrimaryGeneratedColumn,
+  CreateDateColumn,
+  DeleteDateColumn,
+} from 'typeorm';
 
 @Entity('feeds')
 export class FeedEntity extends BaseEntity {
@@ -19,4 +26,7 @@ export class FeedEntity extends BaseEntity {
 
   @CreateDateColumn()
   create_at: Date;
+
+  @DeleteDateColumn()
+  delete_at: Date;
 }

backend/src/entities/menu-item.entity.ts

@@ -2,6 +2,7 @@ import {
   BaseEntity,
   Column,
   CreateDateColumn,
+  DeleteDateColumn,
   Entity,
   OneToMany,
   PrimaryColumn,
@@ -35,4 +36,7 @@ export class MenuItemEntity extends BaseEntity {
 
   @CreateDateColumn()
   create_at: Date;
+
+  @DeleteDateColumn()
+  delete_at: Date;
 }

backend/src/entities/order.entity.ts

@@ -46,6 +46,9 @@ export class OrderEntity extends BaseEntity {
   @Column({ nullable: true })
   table_number: number;
 
+  @Column({ nullable: true })
+  note: string;
+
   @Column()
   total_value: number;
 

backend/src/migrations/1730651201156-modify_payment.ts

@@ -1,32 +1,32 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class ModifyPayment1730651201156 implements MigrationInterface {
-    name = 'ModifyPayment1730651201156'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "value"`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_amount" integer NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_bank_code" character varying`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_bank_tran_no" character varying`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_card_type" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_order_info" character varying`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_paydate" character varying`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_response_code" integer`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_transaction_no" character varying`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_transaction_status" integer`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_transaction_status"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_transaction_no"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_response_code"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_paydate"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_order_info"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_card_type"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_bank_tran_no"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_bank_code"`);
-        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_amount"`);
-        await queryRunner.query(`ALTER TABLE "payments" ADD "value" integer NOT NULL`);
-    }
-
-}
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class ModifyPayment1730651201156 implements MigrationInterface {
+    name = 'ModifyPayment1730651201156'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "value"`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_amount" integer NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_bank_code" character varying`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_bank_tran_no" character varying`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_card_type" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_order_info" character varying`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_paydate" character varying`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_response_code" integer`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_transaction_no" character varying`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "vnp_transaction_status" integer`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_transaction_status"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_transaction_no"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_response_code"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_paydate"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_order_info"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_card_type"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_bank_tran_no"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_bank_code"`);
+        await queryRunner.query(`ALTER TABLE "payments" DROP COLUMN "vnp_amount"`);
+        await queryRunner.query(`ALTER TABLE "payments" ADD "value" integer NOT NULL`);
+    }
+
+}

backend/src/migrations/1730801455870-AddOrderAndPayment.ts

@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddOrderAndPayment1730801455870 implements MigrationInterface {
+    name = 'AddOrderAndPayment1730801455870'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "feeds" ADD "delete_at" TIMESTAMP`);
+        await queryRunner.query(`ALTER TABLE "menu_items" ADD "delete_at" TIMESTAMP`);
+        await queryRunner.query(`ALTER TABLE "branches" ADD "delete_at" TIMESTAMP`);
+        await queryRunner.query(`ALTER TABLE "orders" ADD "note" character varying`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "orders" DROP COLUMN "note"`);
+        await queryRunner.query(`ALTER TABLE "branches" DROP COLUMN "delete_at"`);
+        await queryRunner.query(`ALTER TABLE "menu_items" DROP COLUMN "delete_at"`);
+        await queryRunner.query(`ALTER TABLE "feeds" DROP COLUMN "delete_at"`);
+    }
+
+}

backend/src/modules/branch/branch.controller.ts

@@ -22,6 +22,11 @@ export class BranchController {
     return this.branchService.create(createBranchDto);
   }
 
+  @Post(':id/restore')
+  restore(@Param('id') id: string) {
+    return this.branchService.restore(id);
+  }
+
   @Get()
   async findAll() {
     return this.branchService.findAll();
@@ -42,7 +47,7 @@ export class BranchController {
 
   @Delete(':id')
   async remove(@Param('id') id: string) {
-    return this.branchService.remove(id);
+    return this.branchService.softRemove(id);
   }
 
   @Post(':id/menu-items')

backend/src/modules/branch/branch.service.ts

@@ -46,8 +46,14 @@ export class BranchService {
     return await branch.save();
   }
 
-  async remove(id: string) {
-    let menuItem = await this.getBranchOrError(id);
-    return await menuItem.remove();
+  async softRemove(id: string) {
+    let branch = await this.getBranchOrError(id);
+    return await branch.softRemove();
+  }
+
+  async restore(id: string) {
+    let result = await BranchEntity.getRepository().restore(id);
+    let branch = await BranchEntity.findOneBy({ id });
+    return branch;
   }
 }

backend/src/modules/order/order.service.ts

@@ -17,7 +17,7 @@ export class OrderService {
     userId: string,
     createOrderDto: CreateOrderDto,
   ) {
-    console.log('??');
+    // Chưa được update đầy đủ, còn thiếu thông tin thanh toán.
     if (createOrderDto.order_type != OrderType.ONLINE) {
       throw new BadRequestException('customer cannot create offline order');
     }
@@ -124,6 +124,7 @@ export class OrderService {
   }
 
   findAll() {
+    // 
     return `This action returns all order`;
   }
 

backend/src/modules/user/user.controller.ts

@@ -1,46 +1,46 @@
-import { Body, Controller, Get, Param, Post, Query, Request } from '@nestjs/common';
-import { UserService } from './user.service.js';
-import { UserEntity } from 'src/entities/user.entity.js';
-import { Roles } from '../authentication/authorization/roles.decorator.js';
-import { Role } from '../../common/enums/role.enum.js';
-import { Paginate, PaginateQuery } from 'nestjs-paginate';
-
-@Controller('users')
-export class UsersController {
-  constructor(private readonly usersService: UserService) {}
-
-  @Get('id')
-  @Roles(Role.ADMIN, Role.AREA_MANAGER, Role.BRANCH_MANAGER)
-  async getUserById(
-    @Query('id') id: string
-  ): Promise<UserEntity | undefined> {
-    return this.usersService.findOneByField("id", id)
-  }
-
-  @Get('fullname')
-  @Roles(Role.ADMIN, Role.AREA_MANAGER, Role.BRANCH_MANAGER)
-  async getUserByFullname( @Query('full_name') fullName: string, @Paginate() query: PaginateQuery, ) {
-    console.log(fullName)
-    return this.usersService.findAllByName(fullName, query);
-  }
-
-  @Post('updateUser')
-  async updateUser(@Request() req){
-      const userId = req.user.sub;
-      const updateUserDto = req.body;
-      return this.usersService.updateUserById(userId, updateUserDto);
-  }
-
-  @Get('getAll')
-  @Roles(Role.ADMIN, Role.AREA_MANAGER, Role.BRANCH_MANAGER)
-  async findAllUser(@Paginate() query: PaginateQuery) {
-    return this.usersService.findAllUser(query);
-  }
-
-  @Get('role')
-  @Roles(Role.ADMIN, Role.AREA_MANAGER, Role.BRANCH_MANAGER)
-  async getUserByRole( @Query('role') role: string, @Paginate() query: PaginateQuery, ) {
-    console.log(role)
-    return this.usersService.findAllByRole(role, query);
-  }
-}
+import { Body, Controller, Get, Param, Post, Query, Request } from '@nestjs/common';
+import { UserService } from './user.service.js';
+import { UserEntity } from 'src/entities/user.entity.js';
+import { Roles } from '../authentication/authorization/roles.decorator.js';
+import { Role } from '../../common/enums/role.enum.js';
+import { Paginate, PaginateQuery } from 'nestjs-paginate';
+
+@Controller('users')
+export class UsersController {
+  constructor(private readonly usersService: UserService) {}
+
+  @Get('id')
+  @Roles(Role.ADMIN, Role.AREA_MANAGER, Role.BRANCH_MANAGER)
+  async getUserById(
+    @Query('id') id: string
+  ): Promise<UserEntity | undefined> {
+    return this.usersService.findOneByField("id", id)
+  }
+
+  @Get('fullname')
+  @Roles(Role.ADMIN, Role.AREA_MANAGER, Role.BRANCH_MANAGER)
+  async getUserByFullname( @Query('full_name') fullName: string, @Paginate() query: PaginateQuery, ) {
+    console.log(fullName)
+    return this.usersService.findAllByName(fullName, query);
+  }
+
+  @Post('updateUser')
+  async updateUser(@Request() req){
+      const userId = req.user.sub;
+      const updateUserDto = req.body;
+      return this.usersService.updateUserById(userId, updateUserDto);
+  }
+
+  @Get('getAll')
+  @Roles(Role.ADMIN, Role.AREA_MANAGER, Role.BRANCH_MANAGER)
+  async findAllUser(@Paginate() query: PaginateQuery) {
+    return this.usersService.findAllUser(query);
+  }
+
+  @Get('role')
+  @Roles(Role.ADMIN, Role.AREA_MANAGER, Role.BRANCH_MANAGER)
+  async getUserByRole( @Query('role') role: string, @Paginate() query: PaginateQuery, ) {
+    console.log(role)
+    return this.usersService.findAllByRole(role, query);
+  }
+}

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

@@ -1,124 +1,124 @@
-import { Body, forwardRef, Inject, Injectable, NotFoundException } from '@nestjs/common';
-import { UserEntity } from '../../entities/user.entity.js';
-import { SignUpDto } from '../authentication/dto/sign-up.dto.js';
-import { UpdateUserDto } from './dto/update-user-dto.js';
-import { ValidateService } from '../../validate/validate.service.js';
-import * as bcrypt from 'bcrypt';
-import { JwtService } from '@nestjs/jwt';
-import { FilterOperator, paginate, PaginateConfig, PaginateQuery } from 'nestjs-paginate';
-
-export type User = any;
-
-@Injectable()
-export class UserService {
-  constructor(
-    private validateService: ValidateService,
-    private jwtService: JwtService,
-  ) {}
-
-  async create(signUpDto: SignUpDto): Promise<UserEntity | undefined>{
-    return UserEntity.create({
-      full_name: signUpDto.full_name,
-      phone_number: signUpDto.phone_number,
-      email: signUpDto.email,
-      hash_password: signUpDto.password
-    })
-  }
-
-  async save(userEntity: UserEntity): Promise<UserEntity | undefined>{
-    return UserEntity.save(userEntity);
-  }
-
-  async findOneByField(field: string, value: any): Promise<UserEntity | undefined> {
-    return UserEntity.findOne({ 
-      where: { [field]: value }
-    });
-  }
-
-  async updateUserById(userId: string, updateUserDto: UpdateUserDto){
-
-    await this.validateService.checkExistField('email', updateUserDto.email);
-    await this.validateService.checkExistField('phone_number', updateUserDto.phone_number);
-
-    const user = await UserEntity.findOne({
-      where: { id: userId }
-    });
-    if (!user) {
-      throw new NotFoundException(`User with ID ${userId} not found`);
-    }
-
-    Object.assign(user, updateUserDto);
-    if (updateUserDto.hash_password) {
-      const saltRounds = 10;
-      user.hash_password = await bcrypt.hash(updateUserDto.hash_password, saltRounds); // Mã hóa mật khẩu
-    }
-    await UserEntity.save(user);
-
-    const payload = { sub: user.id, username: user.full_name, roles: user.role };
-    const token = await this.jwtService.signAsync(payload)
-    return {
-      access_token: token
-    };
-  }
-
-  async findAllUser(query: PaginateQuery) {
-    const paginateConfig: PaginateConfig<UserEntity> = {
-      sortableColumns: ['id', 'full_name', 'phone_number', 'email'],
-      nullSort: 'last',
-      defaultSortBy: [['id', 'DESC']],
-      searchableColumns: ['full_name'],
-      filterableColumns: {
-        full_name: [
-          FilterOperator.LT,
-          FilterOperator.LTE,
-          FilterOperator.GT,
-          FilterOperator.GTE,
-        ],
-        item_type: [FilterOperator.EQ]
-      },
-    };
-    return paginate(query, UserEntity.createQueryBuilder(), paginateConfig);
-  }
-
-  async findAllByName(fullName: string, query: PaginateQuery) {
-    const queryBuilder = UserEntity.createQueryBuilder('users')
-      .where('users.full_name = :fullName', { fullName });
-    const paginateConfig: PaginateConfig<UserEntity> = {
-      sortableColumns: ['id', 'full_name', 'phone_number', 'email'],
-      nullSort: 'last',
-      defaultSortBy: [['id', 'DESC']],
-      searchableColumns: ['full_name'],
-      filterableColumns: {
-        full_name: [
-          FilterOperator.LT,
-          FilterOperator.LTE,
-          FilterOperator.GT,
-          FilterOperator.GTE,
-        ],
-        item_type: [FilterOperator.EQ]
-      },
-    };
-    return paginate(query, queryBuilder, paginateConfig);
-  }
-
-  async findAllByRole(role: string, query: PaginateQuery) {
-    const queryBuilder = UserEntity.createQueryBuilder('users')
-      .where('users.role = :role', { role });
-    const paginateConfig: PaginateConfig<UserEntity> = {
-      sortableColumns: ['id', 'full_name', 'phone_number', 'email'],
-      nullSort: 'last',
-      defaultSortBy: [['id', 'DESC']],
-      searchableColumns: ['full_name'],
-      filterableColumns: {
-        full_name: [
-          FilterOperator.LT,
-          FilterOperator.LTE,
-          FilterOperator.GT,
-          FilterOperator.GTE,
-        ],
-        item_type: [FilterOperator.EQ]
-      },
-    };
-    return paginate(query, queryBuilder, paginateConfig);
-  }
-}
+import { Body, forwardRef, Inject, Injectable, NotFoundException } from '@nestjs/common';
+import { UserEntity } from '../../entities/user.entity.js';
+import { SignUpDto } from '../authentication/dto/sign-up.dto.js';
+import { UpdateUserDto } from './dto/update-user-dto.js';
+import { ValidateService } from '../../validate/validate.service.js';
+import * as bcrypt from 'bcrypt';
+import { JwtService } from '@nestjs/jwt';
+import { FilterOperator, paginate, PaginateConfig, PaginateQuery } from 'nestjs-paginate';
+
+export type User = any;
+
+@Injectable()
+export class UserService {
+  constructor(
+    private validateService: ValidateService,
+    private jwtService: JwtService,
+  ) {}
+
+  async create(signUpDto: SignUpDto): Promise<UserEntity | undefined>{
+    return UserEntity.create({
+      full_name: signUpDto.full_name,
+      phone_number: signUpDto.phone_number,
+      email: signUpDto.email,
+      hash_password: signUpDto.password
+    })
+  }
+
+  async save(userEntity: UserEntity): Promise<UserEntity | undefined>{
+    return UserEntity.save(userEntity);
+  }
+
+  async findOneByField(field: string, value: any): Promise<UserEntity | undefined> {
+    return UserEntity.findOne({ 
+      where: { [field]: value }
+    });
+  }
+
+  async updateUserById(userId: string, updateUserDto: UpdateUserDto){
+
+    await this.validateService.checkExistField('email', updateUserDto.email);
+    await this.validateService.checkExistField('phone_number', updateUserDto.phone_number);
+
+    const user = await UserEntity.findOne({
+      where: { id: userId }
+    });
+    if (!user) {
+      throw new NotFoundException(`User with ID ${userId} not found`);
+    }
+
+    Object.assign(user, updateUserDto);
+    if (updateUserDto.hash_password) {
+      const saltRounds = 10;
+      user.hash_password = await bcrypt.hash(updateUserDto.hash_password, saltRounds); // Mã hóa mật khẩu
+    }
+    await UserEntity.save(user);
+
+    const payload = { sub: user.id, username: user.full_name, roles: user.role };
+    const token = await this.jwtService.signAsync(payload)
+    return {
+      access_token: token
+    };
+  }
+
+  async findAllUser(query: PaginateQuery) {
+    const paginateConfig: PaginateConfig<UserEntity> = {
+      sortableColumns: ['id', 'full_name', 'phone_number', 'email'],
+      nullSort: 'last',
+      defaultSortBy: [['id', 'DESC']],
+      searchableColumns: ['full_name'],
+      filterableColumns: {
+        full_name: [
+          FilterOperator.LT,
+          FilterOperator.LTE,
+          FilterOperator.GT,
+          FilterOperator.GTE,
+        ],
+        item_type: [FilterOperator.EQ]
+      },
+    };
+    return paginate(query, UserEntity.createQueryBuilder(), paginateConfig);
+  }
+
+  async findAllByName(fullName: string, query: PaginateQuery) {
+    const queryBuilder = UserEntity.createQueryBuilder('users')
+      .where('users.full_name = :fullName', { fullName });
+    const paginateConfig: PaginateConfig<UserEntity> = {
+      sortableColumns: ['id', 'full_name', 'phone_number', 'email'],
+      nullSort: 'last',
+      defaultSortBy: [['id', 'DESC']],
+      searchableColumns: ['full_name'],
+      filterableColumns: {
+        full_name: [
+          FilterOperator.LT,
+          FilterOperator.LTE,
+          FilterOperator.GT,
+          FilterOperator.GTE,
+        ],
+        item_type: [FilterOperator.EQ]
+      },
+    };
+    return paginate(query, queryBuilder, paginateConfig);
+  }
+
+  async findAllByRole(role: string, query: PaginateQuery) {
+    const queryBuilder = UserEntity.createQueryBuilder('users')
+      .where('users.role = :role', { role });
+    const paginateConfig: PaginateConfig<UserEntity> = {
+      sortableColumns: ['id', 'full_name', 'phone_number', 'email'],
+      nullSort: 'last',
+      defaultSortBy: [['id', 'DESC']],
+      searchableColumns: ['full_name'],
+      filterableColumns: {
+        full_name: [
+          FilterOperator.LT,
+          FilterOperator.LTE,
+          FilterOperator.GT,
+          FilterOperator.GTE,
+        ],
+        item_type: [FilterOperator.EQ]
+      },
+    };
+    return paginate(query, queryBuilder, paginateConfig);
+  }
+}