tango-app-api-client 3.0.59-dev → 3.0.61-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.0.59-dev",
+    "version": "3.0.61-dev",
     "description": "client",
     "main": "index.js",
     "type": "module",

package/src/controllers/client.controllers.js

@@ -526,7 +526,18 @@ export async function detailedAllClientCount( req, res ) {
       },
     ];
     const result = await aggregateClient( query );
-    const activeStores = await findStore( { 'status': 'active', 'edge.firstFile': true }, { storeId: 1 } );
+    const activeStores = await findStore( { 'status': 'active' }, { storeId: 1 } );
+    let yettoInstallCount = await aggregateTickets( [
+      {
+        $match: {
+          $and: [
+            { issueType: 'installation' },
+            { 'status': { $ne: 'closed' } },
+          ],
+        },
+      },
+    ] );
+
     let storesList = [];
     for ( let store of activeStores ) {
       storesList.push( store.storeId );
@@ -535,7 +546,7 @@ export async function detailedAllClientCount( req, res ) {
     if ( result.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
-    result[0].activeStoresCount = activeStores.length;
+    result[0].activeStoresCount = activeStores.length-yettoInstallCount.length;
     result[0].activeCameraCount = activeCameras;
     return res.sendSuccess( { result: result } );
   } catch ( error ) {
@@ -1695,6 +1706,19 @@ export async function clientListV1( req, res ) {
         clientName: 1,
         subscriptionPlan: 1,
         PaymentPlan: 1,
+        PaymentPlan: {
+          $cond: {
+            if: { $eq: [ '$PaymentPlan', 'unbilled' ] },
+            then: 'paid',
+            else: {
+              $cond: {
+                if: { $eq: [ '$PaymentPlan', 'due' ] },
+                then: 'paid',
+                else: '$PaymentPlan',
+              },
+            },
+          },
+        },
         installedPending: 1,
         installedFailed: 1,
         ProgressBar: {
@@ -1719,32 +1743,44 @@ export async function clientListV1( req, res ) {
     }
 
     if ( inputData.sortColumName&&inputData.sortColumName!=''&& req.body.sortBy&&req.body.sortBy!='' ) {
-      clientQuery.push( {
-        $sort: { [req.body.sortColumName]: req.body.sortBy },
-      },
-      );
+      if ( inputData.sortColumName==='clientName' ) {
+        clientQuery.push(
+            {
+              $project: {
+                clientId: 1,
+                onboardedStores: 1,
+                installedStore: 1,
+                activeStores: 1,
+                InactiveStores: 1,
+                ProcessingStatus: 1,
+                clientName: 1,
+                subscriptionPlan: 1,
+                PaymentPlan: 1,
+                PaymentPlan: 1,
+                installedPending: 1,
+                installedFailed: 1,
+                ProgressBar: 1,
+                sortField: {
+                  '$toLower': `$${req.body.sortColumName}`,
+                },
+              },
+            },
+            {
+              $sort: { sortField: req.body.sortBy },
+            },
+        );
+      } else {
+        clientQuery.push( {
+          $sort: { [req.body.sortColumName]: req.body.sortBy },
+        } );
+      }
     } else {
       clientQuery.push( {
         $sort: { activeStores: -1 },
       },
       );
     }
-    clientQuery.push( {
-      $project: {
-        clientId: { $toString: '$clientId' },
-        onboardedStores: 1,
-        installedStore: 1,
-        activeStores: 1,
-        InactiveStores: 1,
-        ProcessingStatus: 1,
-        clientName: 1,
-        subscriptionPlan: 1,
-        PaymentPlan: 1,
-        installedPending: 1,
-        installedFailed: 1,
-        ProgressBar: 1,
-      },
-    } );
+
     if ( req.body.limit && req.body.offset && !req.body.isExport ) {
       clientQuery.push(
           { $skip: ( req.body.offset - 1 ) * req.body.limit },
@@ -1758,7 +1794,7 @@ export async function clientListV1( req, res ) {
       for ( let client of clientList ) {
         exportResult.push( {
           'Brand Name': client.clientName,
-          'Brand Id': client.clientId,
+          'Brand ID': client.clientId,
           'Onboarded Stores': client.onboardedStores||0,
           'Installed Stores': client.installedStore || 0,
           'Progress Status': client.ProgressBar||0,
@@ -1767,7 +1803,7 @@ export async function clientListV1( req, res ) {
           'Pending Configuration': client.installedPending || 0,
           'Payment Plan': client.PaymentPlan == 'free'?'Lifetime Free':client.PaymentPlan,
           'Subscription Plan': client.subscriptionPlan,
-          'Processing Status': client.ProcessingStatus=='active'?'Activated':client.ProcessingStatus?'deactive':client.ProcessingStatus,
+          'Processing Status': client.ProcessingStatus=='active'?'Activated':client.ProcessingStatus=='deactive'?'Deactivated':client.ProcessingStatus,
         } );
       }
       await download( exportResult, res );