PPOB/ppob-backend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into 'devops-staging'

Browse Source 
fix: resend user

See merge request empatnusabangsa/ppob/ppob-backend!108
This commit is contained in:
ilham dwi pratama 2022-01-24 11:10:58 +00:00
commit ca70f7cef4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/users/users.controller.ts
View File

@ -298,7 +298,11 @@ export class UsersController {
@Put('resend-user/:id') @Put('resend-user/:id')
async resendUser(@Param('id', ParseUUIDPipe) id: string, @Request() req) { async resendUser(@Param('id', ParseUUIDPipe) id: string, @Request() req) {
return { return {
data: await this.usersService.confirmationUser(id, req.user, 'resend'), data: await this.usersService.confirmationUser(
id,
req.user.userId,
'resend',
),
statusCode: HttpStatus.OK, statusCode: HttpStatus.OK,
message: 'success', message: 'success',
}; };

3
src/users/users.service.ts
View File

@ -571,12 +571,11 @@ export class UsersService {
const dataUser = await this.usersRepository.findOneOrFail(id); const dataUser = await this.usersRepository.findOneOrFail(id);
const supervisorUser = await this.findExist(user); const supervisorUser = await this.findExist(user);
if (status == 'approved') { if (status == 'approved') {
if (supervisorUser.roles.name == 'Admin') { if (supervisorUser.roles.name == 'Admin') {
dataUser.status_approval = 'Done'; dataUser.status_approval = 'Done';
dataUser.is_active = true; dataUser.is_active = true;
}else { } else {
dataUser.status_approval = supervisorUser.superior.id; dataUser.status_approval = supervisorUser.superior.id;
} }
} else if (status == 'resend') { } else if (status == 'resend') {