From 69c478a7c9277712ff7875a3135365fa990bad58 Mon Sep 17 00:00:00 2001 From: ilham Date: Mon, 24 Jan 2022 13:11:13 +0700 Subject: [PATCH 1/3] fix: approve user --- src/users/users.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/users/users.service.ts b/src/users/users.service.ts index a57f79d..bb64689 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -308,7 +308,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, From 97e3d49c40f8dba2984bfcd1845db1aa5ad0247a Mon Sep 17 00:00:00 2001 From: ilham Date: Mon, 24 Jan 2022 13:35:14 +0700 Subject: [PATCH 2/3] fix: approve user --- src/users/users.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/users/users.service.ts b/src/users/users.service.ts index bb64689..d189a9f 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -567,7 +567,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.usersRepository.findOneOrFail(user); if (status == 'approved') { dataUser.status_approval = supervisorUser.superior.id; From 7a0ba0eab7cbc66fe9083d8d737fd9cf0307cab8 Mon Sep 17 00:00:00 2001 From: ilham Date: Mon, 24 Jan 2022 13:39:20 +0700 Subject: [PATCH 3/3] fix: approve user --- src/users/users.controller.ts | 12 ++++++++++-- src/users/users.service.ts | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) 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 d189a9f..dc218e7 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -567,7 +567,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(user); + const supervisorUser = await this.findExist(user); if (status == 'approved') { dataUser.status_approval = supervisorUser.superior.id;