see list of user

backend/src/entities/user.entity.ts

@@ -56,4 +56,11 @@ export class UserEntity extends BaseEntity {
 
   @OneToMany(() => ReceiptEntity, (receipt) => receipt.receiver)
   out_receipts: Relation<ReceiptEntity>[];
+
+  @ManyToOne(() => BranchEntity, { nullable: true })
+  @JoinColumn({ name: 'branch_id' }) // Tùy chỉnh tên cột là branch_id
+  branch: Relation<BranchEntity>;
+
+  @Column({ nullable: true })
+  branch_id: string;
 }

backend/src/migrations/1731146081011-create-branch-id.ts

@@ -0,0 +1,16 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class CreateBranchId1731146081011 implements MigrationInterface {
+    name = 'CreateBranchId1731146081011'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "users" ADD "branch_id" character varying`);
+        await queryRunner.query(`ALTER TABLE "users" ADD CONSTRAINT "FK_5a58f726a41264c8b3e86d4a1de" FOREIGN KEY ("branch_id") REFERENCES "branches"("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_5a58f726a41264c8b3e86d4a1de"`);
+        await queryRunner.query(`ALTER TABLE "users" DROP COLUMN "branch_id"`);
+    }
+
+}

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

@@ -10,21 +10,6 @@ import { UpdateUsersDto } from './dto/update-users.dto.js';
 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;
@@ -40,22 +25,9 @@ export class UsersController {
     return this.usersService.updateUsers(updateUsersDto);
   }
 
-  @Get('getAll')
+  @Get('getUsers')
   @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);
-  }
-
-  @Get('role')
-  @Roles(Role.ADMIN, Role.AREA_MANAGER)
-  async getUsersByBranch(@Query('branchId') branchId: string, @Paginate() query: PaginateQuery){
-    
+  async getUsers( @Paginate() query: PaginateQuery, ) {
+    return this.usersService.getUsers(query);
   }
 }

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

@@ -103,22 +103,25 @@ export class UserService {
     return paginate(query, queryBuilder, paginateConfig);
   }
 
-  async findAllByRole(role: string, query: PaginateQuery) {
+  async getUsers(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'],
+      searchableColumns: ['full_name', 'phone_number'],
       filterableColumns: {
+        id: [FilterOperator.EQ],
         full_name: [
           FilterOperator.LT,
           FilterOperator.LTE,
           FilterOperator.GT,
           FilterOperator.GTE,
         ],
-        item_type: [FilterOperator.EQ]
+        phone_number: [FilterOperator.EQ],
+        email: [FilterOperator.EQ],
+        branch_id:[FilterOperator.EQ],
+        role: [FilterOperator.EQ]
       },
     };
     return paginate(query, queryBuilder, paginateConfig);