Merge branch 'main' of https://github.com/PBL6-team-CATS/PBL6-informative-system

backend/package-lock.json

@@ -31,7 +31,8 @@
         "pg": "^8.13.0",
         "reflect-metadata": "^0.2.0",
         "rxjs": "^7.8.1",
-        "typeorm": "^0.3.20"
+        "typeorm": "^0.3.20",
+        "vnpay": "^1.6.0"
       },
       "devDependencies": {
         "@nestjs/cli": "^10.0.0",
@@ -7138,6 +7139,27 @@
         "mkdirp": "bin/cmd.js"
       }
     },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/moment-timezone": {
+      "version": "0.5.46",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.46.tgz",
+      "integrity": "sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==",
+      "license": "MIT",
+      "dependencies": {
+        "moment": "^2.29.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -9594,6 +9616,7 @@
       "version": "0.3.20",
       "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.20.tgz",
       "integrity": "sha512-sJ0T08dV5eoZroaq9uPKBoNcGslHBR4E4y+EBHs//SiGbblGe7IeduP/IH4ddCcj0qp3PHwDwGnuvqEAnKlq/Q==",
+      "license": "MIT",
       "dependencies": {
         "@sqltools/formatter": "^1.2.5",
         "app-root-path": "^3.1.0",
@@ -9878,6 +9901,16 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/vnpay": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/vnpay/-/vnpay-1.6.0.tgz",
+      "integrity": "sha512-+y1tdsJ1ClPC0cVGCG6v5lDi5rZZSzfUe1I670d4tqzxvHdgPbgmrYuH4LpLOEuiFs0Nwum9Thw7DfWgbztjBA==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "moment-timezone": "^0.5.43"
+      }
+    },
     "node_modules/walker": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",

backend/package.json

@@ -47,7 +47,8 @@
     "pg": "^8.13.0",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.8.1",
-    "typeorm": "^0.3.20"
+    "typeorm": "^0.3.20",
+    "vnpay": "^1.6.0"
   },
   "devDependencies": {
     "@nestjs/cli": "^10.0.0",

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

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

backend/src/entities/payment.entity.ts

@@ -7,7 +7,6 @@ import {
   Relation,
 } from 'typeorm';
 import { OrderEntity } from './order.entity.js';
-import { PaymentMethod } from '../common/enums/PaymentMethod.enum.js';
 
 @Entity('payments')
 export class PaymentEntity extends BaseEntity {
@@ -18,8 +17,32 @@ export class PaymentEntity extends BaseEntity {
   order: Relation<OrderEntity>;
 
   @Column({ default: 0 })
-  payment_method: number; // E.g., 'Cash', 'Credit Card', 'Online Payment'
+  payment_method: number; 
 
   @Column()
-  value: number;
+  vnp_amount: number
+
+  @Column({ nullable: true })
+  vnp_bank_code: string
+
+  @Column({ nullable: true })
+  vnp_bank_tran_no:string
+  
+  @Column({ default: 0})
+  vnp_card_type: number
+
+  @Column({ nullable: true })
+  vnp_order_info: string //Nội dung giao dịch
+
+  @Column({ nullable: true })
+  vnp_paydate: string
+
+  @Column({ nullable: true })
+  vnp_response_code: number
+
+  @Column({ nullable: true })
+  vnp_transaction_no: string
+
+  @Column({ nullable: true })
+  vnp_transaction_status: number
 }

backend/src/migrations/1730651201156-modify_payment.ts

@@ -0,0 +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`);
+    }
+
+}

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

@@ -1,17 +1,27 @@
-import { Body, Controller, Get, Param, Post, Request } from '@nestjs/common';
+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 { UpdateUserDto } from './dto/update-user-dto.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(':username')
-  async getUser(
-    @Param('username') username: string,
+  @Get('id')
+  @Roles(Role.ADMIN, Role.AREA_MANAGER, Role.BRANCH_MANAGER)
+  async getUserById(
+    @Query('id') id: string
   ): Promise<UserEntity | undefined> {
-    return this.usersService.findOne(username);
+    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')
@@ -20,4 +30,17 @@ export class UsersController {
       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

@@ -5,6 +5,7 @@ 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;
 
@@ -15,10 +16,6 @@ export class UserService {
     private jwtService: JwtService,
   ) {}
 
-  async findOne(username: string): Promise<UserEntity | undefined> {
-    return UserEntity.findOne({ where: { full_name: username } });
-  }
-
   async create(signUpDto: SignUpDto): Promise<UserEntity | undefined>{
     return UserEntity.create({
       full_name: signUpDto.full_name,
@@ -63,4 +60,65 @@ export class UserService {
       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);
+  }
 }