tango-app-api-client 3.0.8 → 3.0.10-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.0.8",
+    "version": "3.0.10-dev",
     "description": "client",
     "main": "index.js",
     "type": "module",
@@ -23,8 +23,8 @@
         "lodash": "^4.17.21",
         "mongodb": "^6.3.0",
         "nodemon": "^3.0.3",
-        "tango-api-schema": "^2.0.50",
-        "tango-app-api-middleware": "^1.0.30",
+        "tango-api-schema": "^2.0.53",
+        "tango-app-api-middleware": "^1.0.39-dev",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/client.controllers.js

@@ -15,16 +15,14 @@ export async function create( req, res ) {
     const generatedName = inputData.clientName.replace( /[^A-Z0-9]+/ig, '' );
     const product = leadRecord?.planDetails?.product.map( ( value ) => ( { productName: value } ) );
     const getPermission = await findOneStandaredRole( { roleName: 'superadmin', userType: 'client' }, { permission: 1 } );
-    const userRecord = {
-      role: 'superadmin',
-      userType: 'client',
-      permission: getPermission?.permission,
-    };
     const userQuery={
-      email: inputData?.corporateEmail,
+      email: leadRecord?.corporateEmail,
     };
-    const user = await findOneAndUpdateUser( userQuery, userRecord );
-    logger.info( { message: user } );
+    const user = await findOneUser( userQuery );
+    if ( !user ) {
+      return res.sendError( { error: 'User doesnot exist' }, 500 );
+    }
+    logger.info( { message: user, function: 'findOneUser' } );
     const record = {
       'clientName': leadRecord.clientName,
       'clientId': String( tangoId ),
@@ -44,6 +42,14 @@ export async function create( req, res ) {
 
     const insertClient = await insert( record );
     if ( insertClient ) {
+      const userRecord = {
+        role: 'superadmin',
+        userType: 'client',
+        permission: getPermission?.permission,
+        clientId: String( tangoId ),
+      };
+
+      await findOneAndUpdateUser( userQuery, userRecord );
       await createAuditQueue( generatedName );
       return res.sendSuccess( { result: { clientId: String( tangoId ) } } );
     }
@@ -749,8 +755,8 @@ export async function clientList( req, res ) {
       }
       return list;
     } );
-    const clientList = await Promise.all( promises );
-    clientList.flat();
+    const clientListResult = await Promise.all( promises );
+    const clientList= clientListResult.flat();
     const storeQuery = [
       {
         $match: {
@@ -806,19 +812,19 @@ export async function clientList( req, res ) {
         const list = [];
         for ( let i = 0; i < chunk.length; i++ ) {
           list.push( {
-            'client Name': chunk[i].clientName,
-            'client Id': chunk[i].clientId,
-            'Active Store': chunk[i].activeStoreCount,
-            'Active Camera': chunk[i].activeCameraCount,
-            'Payment Status': chunk[i].paymentStatus,
-            'Subs Plan': chunk[i].subscriptionType,
-            'Status': chunk[i].status,
+            'client Name': chunk[i]?.clientName,
+            'client Id': chunk[i]?.clientId,
+            'Active Store': chunk[i]?.activeStoreCount || 0,
+            'Active Camera': chunk[i]?.activeCameraCount && chunk[i]?.activeCameraCount!=undefined? chunk[i]?.activeCameraCount: 0,
+            'Payment Status': chunk[i]?.paymentStatus,
+            'Subs Plan': chunk[i]?.subscriptionType,
+            'Status': chunk[i]?.status,
           } );
         }
         return list;
       } );
-      const exportResult = await Promise.all( promises );
-      exportResult.flat();
+      const temp = await Promise.all( promises );
+      const exportResult = temp.flat();
       await download( exportResult, res );
       return;
     }

package/src/service/user.service.js

@@ -1,7 +1,7 @@
 import userModel from 'tango-api-schema/schema/user.model.js';
 
-export function findOneUser( query ) {
-  return userModel.findOne( query );
+export function findOneUser( query, field ) {
+  return userModel.findOne( query, field );
 }
 
 export function countDocumentsUser( query ) {