Merge pull request #46 from PBL6-team-CATS/feature/user

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);
+  }
 }