tango-app-api-client 3.0.52-dev → 3.0.54-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.0.52-dev",
+    "version": "3.0.54-dev",
     "description": "client",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "nodemon": "^3.0.3",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.0.110",
-        "tango-app-api-middleware": "^3.1.12",
+        "tango-app-api-middleware": "^1.0.73-test",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/client.controllers.js

@@ -1491,6 +1491,37 @@ export async function clientListV1( req, res ) {
           },
         },
     );
+    if ( inputData.filterByPaymentStatus ) {
+      if ( inputData.filterByPaymentStatus.includes( 'paid' ) ) {
+        inputData.filterByPaymentStatus.push( ...[ 'unbilled', 'due' ] );
+      }
+
+      clientQuery.push(
+          {
+            $match: {
+              'PaymentPlan': { $in: inputData.filterByPaymentStatus },
+            },
+          },
+      );
+    }
+    if ( inputData.filterBySubscription ) {
+      clientQuery.push(
+          {
+            $match: {
+              'subscriptionType': { $in: inputData.filterBySubscription },
+            },
+          },
+      );
+    }
+    if ( inputData.filterByStatus ) {
+      clientQuery.push(
+          {
+            $match: {
+              status: { $in: inputData.filterByStatus },
+            },
+          },
+      );
+    }
     if ( inputData.searchValue && inputData.searchValue != '' ) {
       clientQuery.push( {
         $match: {
@@ -1633,10 +1664,13 @@ export async function clientListV1( req, res ) {
     },
     {
       $project: {
-        clientId: 1,
+        clientId: { $toInt: '$clientId' },
         onboardedStores: 1,
         installedStore: 1,
-        activeStores: { $subtract: [ '$activeStores', '$installedPending' ] },
+        activeStores: { $max: [
+          { $subtract: [ '$activeStores', '$installedPending' ] },
+          0,
+        ] },
         InactiveStores: 1,
         ProcessingStatus: 1,
         clientName: 1,
@@ -1676,6 +1710,22 @@ export async function clientListV1( req, res ) {
       },
       );
     }
+    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 },
@@ -1690,11 +1740,12 @@ export async function clientListV1( req, res ) {
         exportResult.push( {
           'Brand Name': client.clientName,
           'Brand Id': client.clientId,
-          'Installed Number of Store': client.installedStore || 0,
+          'Onboarded Stores': client.onboardedStores||0,
+          'Installed Stores': client.installedStore || 0,
+          'Progress Bar': client.ProgressBar||0,
           'Active Stores': client.activeStores || 0,
-          'InActive Stores': client.activeStores || 0,
-          'Progress Bar': ProgressBar||0,
-          'Pending Install': client.installedPending || 0,
+          'In-Active Stores': client.activeStores || 0,
+          'Pending Configuration': client.installedPending || 0,
           'Payment Plan': client.PaymentPlan,
           'Subscription Plan': client.subscriptionPlan,
           'Processing Status': client.ProcessingStatus,