Merge pull request #118 from bakaphp/feat/add-app-functions

Feat/add app functions

Author: jerlyrosa

package.json

@@ -1,6 +1,6 @@
 {
 
-  "version": "0.0.62",
+  "version": "0.0.63",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

src/modules/app/index.ts

@@ -1,6 +1,6 @@
-import type { AppUserInterface, AppUpdatePasswordInterface, WhereCondition, AllAppUsersInterface, OrderBy, AppCreateUserParams, CreatedAppCreateUser } from '../../types';
-import { APP_CREATE_USER, USER_UPDATE_PASSWORD_MUTATION } from '../../mutations';
-import { APP_USERS_QUERY, GET_ALL_APP_USERS } from '../../queries';
+import type { AppUserInterface, AppUpdatePasswordInterface, WhereCondition, AllAppUsersInterface, OrderBy, AppCreateUserParams, CreatedAppCreateUser, AppActivateUser, AppDeactiveUser, } from '../../types';
+import { APP_ACTIVE_USER, APP_CREATE_USER, APP_DEACTIVE_USER, USER_UPDATE_PASSWORD_MUTATION } from '../../mutations';
+import { GET_APP_USERS } from '../../queries';
 import type { ClientType } from '../../index';
 
 class Users {
@@ -36,7 +36,7 @@ class Users {
    * */
   public async getUserByEmail(email: string): Promise<AppUserInterface> {
     const response = await this.client.query({
-      query: APP_USERS_QUERY,
+      query: GET_APP_USERS,
       variables: {
         first: 1,
         where: {
@@ -50,7 +50,7 @@ class Users {
     return response.data.appUsers.data[0];
   }
 
-  public async getAllAppUsers(
+  public async getAppUsers(
     options: {
       first?: number;
       page?: number;
@@ -62,7 +62,7 @@ class Users {
     const { first, page, whereCondition, orderByCondition, search } = options;
 
     const response = await this.client.query({
-      query: GET_ALL_APP_USERS,
+      query: GET_APP_USERS,
       variables: {
         first,
         page,
@@ -76,13 +76,6 @@ class Users {
     return response.data;
   }
 
-}
-
-
-class Admin {
-  constructor(protected client: ClientType) { }
-  
-
   public async appCreateUser(data: AppCreateUserParams): Promise<CreatedAppCreateUser> {
     const response = await this.client.mutate({
       mutation: APP_CREATE_USER,
@@ -92,16 +85,32 @@ class Admin {
     return response.data
   }
 
+  public async appActivateUser(user_id: number | string): Promise<AppActivateUser> {
+    const response = await this.client.mutate({
+      mutation: APP_ACTIVE_USER,
+      variables: { user_id: user_id },
+    });
+
+    return response.data
+  }
+
+  public async appDeactivateUser(user_id: number | string): Promise<AppDeactiveUser> {
+    const response = await this.client.mutate({
+      mutation: APP_DEACTIVE_USER,
+      variables: { user_id: user_id },
+    });
+
+    return response.data
+  }
 
 }
 
+
 export class App {
   public users: Users;
-  public admin: Admin;
 
   constructor(protected client: ClientType) {
     this.users = new Users(this.client);
-    this.admin = new Admin(this.client);
 
   }
 }

src/mutations/app.mutation.ts

@@ -44,3 +44,15 @@ export const APP_CREATE_USER = gql`
     }
   }
 `;
+
+export const APP_ACTIVE_USER = gql`
+  mutation($user_id: ID!) {
+    appActivateUser(user_id: $user_id)
+  }
+`;
+
+export const APP_DEACTIVE_USER = gql`
+  mutation appDeActiveUser($user_id: ID!) {
+    appDeActiveUser(user_id: $user_id)
+  }
+`;

src/queries/app.query.ts

@@ -1,69 +1,7 @@
 import { gql } from '@apollo/client/core';
 
-export const APP_USERS_QUERY = gql`
-  query filterUser($first: Int, $where: QueryAppUsersWhereWhereConditions) {
-    appUsers(first: $first, where: $where) {
-      data {
-        id
-        uuid
-        email
-        displayname
-        lastname
-        firstname
-        sex
-        description
-        user_active
-        address {
-          address_1
-          address_2
-          city {
-            id
-            name
-            latitude
-            longitude
-            states_id
-            countries_id
-          }
-          country {
-            id
-            name
-            code
-            flag
-          }
-          zip_code
-          state {
-            id
-            code
-            name
-          }
-        }
-        contact {
-          phone_number
-          cell_phone_number
-        }
-        companies {
-          id
-          uuid
-          name
-        }
-        branches {
-          id
-          name
-          companies_id
-        }
-        created_at
-        updated_at
-      }
-      paginatorInfo {
-        currentPage
-        lastPage
-      }
-    }
-  }
-`;
-
-export const GET_ALL_APP_USERS = gql`
-  query getAllAppUsers(
+export const GET_APP_USERS = gql`
+  query getAppUsers(
     $first: Int
     $page: Int
     $whereCondition: QueryAppUsersWhereWhereConditions
@@ -88,6 +26,7 @@ export const GET_ALL_APP_USERS = gql`
         description
         user_active
         roles
+        is_active
         address {
           address_1
           address_2

src/queries/inventory.query.ts

@@ -151,8 +151,8 @@ export const GET_PRODUCT_TYPES = gql`
 `;
 
 export const GET_STATUS = gql`
-  query getStatus($whereCondition: QueryGetStatusWhereWhereConditions) {
-    getStatus(where: $whereCondition) {
+  query getStatus($whereCondition: [QueryGetStatusWhereWhereConditions!]) {
+    getStatus(where: { AND: $whereCondition }) {
       data {
         name
         id
@@ -297,7 +297,6 @@ export const GET_VARIANTS = gql`
           name
           value
         }
-
         product {
           id
           slug
@@ -335,7 +334,7 @@ export const GET_VARIANTS = gql`
 export const GET_VARIANTS_BY_STATUS = gql`
   query getVariantsByStatus(
     $warehouse_id: ID!
-    $status_id:  [ID]!
+    $status_id: [ID]!
     $first: Int
     $page: Int
     $whereCondition: QueryVariantsByStatusWhereWhereConditions

src/types/app.ts

@@ -100,3 +100,11 @@ export interface AppCreateUserParams {
 export interface CreatedAppCreateUser {
   appCreateUser: AppUserInterface;
 }
+
+export interface AppActivateUser {
+  appActivateUser: boolean;
+}
+
+export interface AppDeactiveUser {
+  appDeActiveUser: boolean;
+}

src/types/users.ts

@@ -106,6 +106,7 @@ export interface UserData {
     cell_phone_number: string;
   };
   roles: string[];
+  is_active: boolean;
   abilities: string[];
   custom_fields: {
     data: {
@@ -124,6 +125,7 @@ export interface UpdateUserParams {
   displayname?: string;
   phone_number: string;
   cell_phone_number: string;
+  role_id?: number | string;
   custom_fields: {
     name: string;
     data: any;