Merge branch 'development' into 'devops-staging'

fix: resend user

See merge request empatnusabangsa/ppob/ppob-backend!108

src/users/users.controller.ts

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

src/users/users.service.ts

@@ -571,7 +571,6 @@ export class UsersService {
       const dataUser = await this.usersRepository.findOneOrFail(id);
       const supervisorUser = await this.findExist(user);
 
-
       if (status == 'approved') {
         if (supervisorUser.roles.name == 'Admin') {
           dataUser.status_approval = 'Done';