From 278fdff8f5eeec63e22de451d0389b4848c1b244 Mon Sep 17 00:00:00 2001
From: ilham <ilhamdwips@gmail.com>
Date: Mon, 24 Jan 2022 11:01:51 +0700
Subject: [PATCH] fix: user approval

---
 src/users/entities/user.entity.ts |  4 ++--
 src/users/users.service.ts        | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/users/entities/user.entity.ts b/src/users/entities/user.entity.ts
index b16c9c4..5d36ea0 100644
--- a/src/users/entities/user.entity.ts
+++ b/src/users/entities/user.entity.ts
@@ -21,7 +21,7 @@ export class User extends BaseModel {
   salt: string;
 
   @Column({ default: true })
-  isActive: boolean;
+  is_active: boolean;
 
   @Column({
     nullable: true,
@@ -29,7 +29,7 @@ export class User extends BaseModel {
   status_approval: string;
 
   @Column({ default: false })
-  isRejected: boolean;
+  is_rejected: boolean;
 
   @ManyToOne(
     () => {
diff --git a/src/users/users.service.ts b/src/users/users.service.ts
index 22c40f6..1e288bc 100644
--- a/src/users/users.service.ts
+++ b/src/users/users.service.ts
@@ -159,7 +159,7 @@ export class UsersService {
       .select([
         'user.id',
         'user.username',
-        'user.isActive',
+        'user.is_active',
         'user.createdAt',
         'roles.id',
         'roles.name',
@@ -276,7 +276,7 @@ export class UsersService {
       .select([
         'user.id',
         'user.username',
-        'user.isActive',
+        'user.is_active',
         'roles.id',
         'roles.name',
         'user_detail',
@@ -302,7 +302,7 @@ export class UsersService {
     const baseQuery = this.usersRepository
       .createQueryBuilder('user')
       .where(
-        'user.id != :id and user.superior_id = :superior and status_approval = :status and isRejected is false',
+        'user.id != :id and user.superior_id = :superior and status_approval = :status and is_rejected is false',
         {
           id: superrior.userId,
           superior: superrior.userId,
@@ -325,7 +325,7 @@ export class UsersService {
       .select([
         'user.id',
         'user.username',
-        'user.isActive',
+        'user.is_active',
         'roles.id',
         'roles.name',
         'user_detail',
@@ -404,7 +404,7 @@ export class UsersService {
         .select([
           'users.id',
           'users.username',
-          'users.isActive',
+          'users.is_active',
           'users.createdAt',
           'roles.id',
           'roles.name',
@@ -567,9 +567,9 @@ export class UsersService {
       if (status == 'approved') {
         dataUser.status_approval = supervisorUser.roles.name;
       } else if (status == 'resend') {
-        dataUser.isRejected = false;
+        dataUser.is_rejected = false;
       } else {
-        dataUser.isRejected = true;
+        dataUser.is_rejected = true;
       }
 
       const result = await this.usersRepository.save(dataUser);
@@ -594,9 +594,9 @@ export class UsersService {
     const userData = new User();
 
     if (type === 'active') {
-      userData.isActive = true;
+      userData.is_active = true;
     } else {
-      userData.isActive = false;
+      userData.is_active = false;
     }
 
     await this.connection.transaction(async (manager) => {
@@ -630,7 +630,7 @@ export class UsersService {
     return this.usersRepository.findOneOrFail({
       where: {
         username,
-        isActive: true,
+        is_active: true,
       },
       relations: ['roles', 'partner'],
     });