diff --git a/src/users/users.controller.ts b/src/users/users.controller.ts index ef9997a..718c39f 100644 --- a/src/users/users.controller.ts +++ b/src/users/users.controller.ts @@ -272,7 +272,11 @@ export class UsersController { @Put('approve-user/:id') async approveUser(@Param('id', ParseUUIDPipe) id: string, @Request() req) { return { - data: await this.usersService.confirmationUser(id, req.user, 'approved'), + data: await this.usersService.confirmationUser( + id, + req.user.userId, + 'approved', + ), statusCode: HttpStatus.OK, message: 'success', }; @@ -281,7 +285,11 @@ export class UsersController { @Put('reject-user/:id') async rejectUser(@Param('id', ParseUUIDPipe) id: string, @Request() req) { return { - data: await this.usersService.confirmationUser(id, req.user, 'rejected'), + data: await this.usersService.confirmationUser( + id, + req.user.userId, + 'rejected', + ), statusCode: HttpStatus.OK, message: 'success', }; diff --git a/src/users/users.service.ts b/src/users/users.service.ts index ad0c128..4e256ac 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -309,7 +309,7 @@ export class UsersService { const baseQuery = this.usersRepository .createQueryBuilder('user') .where( - 'user.id != :id and user.superior_id = :superior and status_approval = :status and is_rejected is false', + 'user.id != :id and status_approval = :status and is_rejected is false', { id: superrior.userId, status: superrior.userId, @@ -569,7 +569,7 @@ export class UsersService { async confirmationUser(id: string, user: string, status: string) { try { const dataUser = await this.usersRepository.findOneOrFail(id); - const supervisorUser = await this.usersRepository.findOneOrFail(id); + const supervisorUser = await this.findExist(user); if (status == 'approved') { dataUser.status_approval = supervisorUser.superior.id;