tango-app-api-client 3.0.40-dev → 3.0.42-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.0.40-dev",
+    "version": "3.0.42-dev",
     "description": "client",
     "main": "index.js",
     "type": "module",
@@ -25,8 +25,8 @@
         "mongodb": "^6.3.0",
         "nodemon": "^3.0.3",
         "swagger-ui-express": "^5.0.0",
+        "tango-app-api-middleware": "^1.0.72-test",
         "tango-api-schema": "^2.0.93",
-        "tango-app-api-middleware": "^3.1.9",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/client.controllers.js

@@ -486,7 +486,9 @@ export async function updateBrandInfo( req, res ) {
       eventType: 'update',
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
 
     const updateAck = await brandInfoUpdate( {
@@ -580,7 +582,10 @@ export async function updateBillingDetails( req, res ) {
       eventType: 'update',
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
+
 
     const updateAck = await billingDetailsUpdate( {
       clientId: req.params?.id, tradeName: req.body?.tradeName, gstNumber: req.body?.gstNumber,
@@ -618,7 +623,10 @@ export async function updateSignatoryDetails( req, res ) {
       eventType: 'update',
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
+
     const updateAck = await signatoryDetailsUpdate( {
       clientId: req.params?.id, name: req.body?.name, email: req.body?.email,
       number: req.body?.number, designation: req.body?.designation,
@@ -660,7 +668,10 @@ export async function updateTicketConfiguration( req, res ) {
       changes: updateKeys,
       eventType: 'update',
     };
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
@@ -745,7 +756,9 @@ export async function updateFeatureConfiguration( req, res ) {
       changes: updateKeys,
       eventType: 'update',
     };
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
@@ -785,7 +798,10 @@ export async function domainDetailsConfiguration( req, res ) {
       eventType: 'update',
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
+
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
     }
@@ -895,7 +911,9 @@ export async function updateDocuments( req, res ) {
       eventType: 'update',
     };
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
@@ -959,7 +977,9 @@ export async function auditConfiguration( req, res ) {
       logObj.changes = [ `Audit config bulk` ];
     }
 
-    await insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    if ( updateKeys.length ) {
+      await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    }
 
     res.sendSuccess( { result: 'Updated Successfully' } );
   } catch ( error ) {
@@ -1276,8 +1296,13 @@ export async function clientList( req, res ) {
           list.push( {
             'client Name': chunk[i]?.clientName,
             'client Id': chunk[i]?.clientId,
+            'Installation Stores Count': chunk[i]?.installedStores || 0,
+            'Onboarded Stores Count': chunk[i]?.totalStores,
+            'Store Progress': chunk[i]?.installedStores? `${ ( ( chunk[i]?.installedStores/ chunk[i]?.totalStores )* 100 ).toFixed( 0 )}%`: '0%',
             'Active Store': chunk[i]?.activeStoreCount || 0,
             'Active Camera': chunk[i]?.activeCameraCount && chunk[i]?.activeCameraCount != undefined ? chunk[i]?.activeCameraCount : 0,
+            'Pending Stores': chunk[i]?.pendingStores || 0,
+            'Failed Stores': chunk[i]?.failedStores || 0,
             'Payment Status': chunk[i]?.paymentStatus,
             'Subs Plan': chunk[i]?.subscriptionType,
             'Status': chunk[i]?.status,
@@ -1349,7 +1374,10 @@ export async function detailedClientCount( req, res ) {
 export async function getActivityLogs( req, res ) {
   try {
     const query = {
-      '_source': [ 'userId', 'userName', 'email', 'date', 'logType', 'logSubType', 'changes', 'eventType' ],
+      '_source': [
+        'userId', 'userName', 'email', 'date', 'logType', 'logSubType',
+        'changes', 'eventType',
+      ],
       'query': {
         'bool': {
           'must': [
@@ -1363,6 +1391,13 @@ export async function getActivityLogs( req, res ) {
       },
       'from': ( req.body.offset - 1 ) * req.body.limit,
       'size': req.body.limit,
+      'sort': [
+        {
+          'date': {
+            'order': 'desc',
+          },
+        },
+      ],
     };
 
     if ( req.body?.logTypeFilters?.length ) {
@@ -1386,7 +1421,7 @@ export async function getActivityLogs( req, res ) {
       } );
     }
 
-    const logs = await getOpenSearchData( 'tango-retail-activity-logs', query );
+    const logs = await getOpenSearchData( appConfig.opensearch.activityLog, query );
 
     const hits = logs?.body?.hits?.hits;
     const totalDocuments = logs?.body?.hits?.total?.value;
@@ -1402,6 +1437,7 @@ export async function getActivityLogs( req, res ) {
   }
 }
 
+
 async function postApi( url, data ) {
   const requestOptions = {
     method: 'POST',