tango-app-api-client 3.0.51-dev → 3.0.51-test

package/package.json

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

package/src/controllers/client.controllers.js

@@ -1540,17 +1540,13 @@ export async function clientListV1( req, res ) {
         subscriptionType: 1,
         PaymentPlan: 1,
         installed: {
-          $cond: [ { $or: [ { $eq: [ '$stores.edge.firstFile', true ] } ] }, 1, 0,
+          $cond: [ { $and: [ { $eq: [ '$stores.edge.firstFile', true ] } ] }, 1, 0,
           ],
         },
         activeStores: {
           $cond: [ { $and: [ { $eq: [ '$stores.status', 'active' ] }, { $eq: [ '$stores.edge.firstFile', true ] } ] }, 1, 0,
           ],
         },
-        InactiveStores: {
-          $cond: [ { $and: [ { $ne: [ '$stores.status', 'active' ] } ] }, 1, 0,
-          ],
-        },
       },
     },
     {
@@ -1560,7 +1556,6 @@ export async function clientListV1( req, res ) {
         onboardedStores: { $sum: 1 },
         installedStore: { $sum: '$installed' },
         activeStores: { $sum: '$activeStores' },
-        InactiveStores: { $sum: '$InactiveStores' },
         ProcessingStatus: { $first: '$status' },
         clientName: { $first: '$clientName' },
         subscriptionPlan: { $first: '$subscriptionType' },
@@ -1606,7 +1601,6 @@ export async function clientListV1( req, res ) {
         subscriptionPlan: 1,
         installedStore: 1,
         activeStores: 1,
-        InactiveStores: 1,
         installedPending: {
           $cond: [ { $and: [ { $ne: [ '$ticket.status', 'closed' ] } ] }, 1, 0 ],
         },
@@ -1622,7 +1616,6 @@ export async function clientListV1( req, res ) {
         onboardedStores: { $first: '$onboardedStores' },
         installedStore: { $first: '$installedStore' },
         activeStores: { $first: '$activeStores' },
-        InactiveStores: { $first: '$InactiveStores' },
         ProcessingStatus: { $first: '$ProcessingStatus' },
         clientName: { $first: '$clientName' },
         subscriptionPlan: { $first: '$subscriptionPlan' },
@@ -1631,33 +1624,6 @@ export async function clientListV1( req, res ) {
         installedFailed: { $sum: '$installedFailed' },
       },
     },
-    {
-      $project: {
-        clientId: 1,
-        onboardedStores: 1,
-        installedStore: 1,
-        activeStores: 1,
-        InactiveStores: 1,
-        ProcessingStatus: 1,
-        clientName: 1,
-        subscriptionPlan: 1,
-        PaymentPlan: 1,
-        installedPending: 1,
-        installedFailed: 1,
-        ProgressBar: {
-          $cond: {
-            if: { $eq: [ '$onboardedStores', 0 ] },
-            then: 0,
-            else: {
-              $round: [
-                { $multiply: [ { $divide: [ '$installedStore', '$onboardedStores' ] }, 100 ] },
-                0,
-              ],
-            },
-          },
-        },
-      },
-    },
     );
 
     const clientCount = await aggregateClient( clientQuery );
@@ -1665,16 +1631,11 @@ export async function clientListV1( req, res ) {
       return res.sendError( 'No Data Found', 204 );
     }
 
-    if ( inputData.sortColumName&&inputData.sortColumName!=''&& req.body.sortBy&&req.body.sortBy!='' ) {
+    if ( inputData.sortColumName ) {
       clientQuery.push( {
         $sort: { [req.body.sortColumName]: req.body.sortBy },
       },
       );
-    } else {
-      clientQuery.push( {
-        $sort: { activeStores: -1 },
-      },
-      );
     }
     if ( req.body.limit && req.body.offset && !req.body.isExport ) {
       clientQuery.push(
@@ -1688,16 +1649,17 @@ export async function clientListV1( req, res ) {
       const exportResult = [];
       for ( let client of clientList ) {
         exportResult.push( {
-          'Brand Name': client.clientName,
-          'Brand Id': client.clientId,
-          'Installed Number of Store': client.installedStore || 0,
-          'Active Stores': client.activeStores || 0,
-          'InActive Stores': client.activeStores || 0,
-          'Progress Bar': ProgressBar||0,
-          'Pending Install': client.installedPending || 0,
-          'Payment Plan': client.PaymentPlan,
-          'Subscription Plan': client.subscriptionPlan,
-          'Processing Status': client.ProcessingStatus,
+          'client Name': client.clientName,
+          'client Id': client.clientId,
+          'Installation Stores Count': client.installedStore || 0,
+          'Onboarded Stores Count': client.onboardedStores,
+          'Store Progress': client.onboardedStores ? `${Math.round( ( client.onboardedStores / client.installedStore ) * 100 )}%` : '0%',
+          'Active Store': client.activeStores || 0,
+          'installedPending Stores': client.installedPending || 0,
+          'installedFailed Stores': client.installedFailed || 0,
+          'PaymentPlan': client.PaymentPlan,
+          'subscriptionPlan': client.subscriptionPlan,
+          'ProcessingStatus': client.ProcessingStatus,
         } );
       }
       await download( exportResult, res );