tango-app-api-client 3.1.16 → 3.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.1.16",
+    "version": "3.1.18",
     "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-api-schema": "^2.0.113",
-        "tango-app-api-middleware": "^3.1.19",
+        "tango-api-schema": "^2.0.144",
+        "tango-app-api-middleware": "^3.1.26",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

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 ) {
@@ -802,7 +813,7 @@ export async function updateFeatureConfiguration( req, res ) {
       close: req.body?.close, conversionCalculation: req.body?.conversionCalculation, conversionCondition: req.body?.conversionCondition,
       conversionValue: req.body?.conversionValue, infraAlertCondition: req.body?.infraAlertCondition, infraAlertValue: req.body?.infraAlertValue, isFootfallDirectory: req.body?.isFootfallDirectory,
       isNormalized: req.body?.isNormalized, isPasserByData: req.body?.isPasserByData, missedOpportunityCalculation: req.body?.missedOpportunityCalculation, open: req.body?.open,
-      isExcludedArea: req.body?.isExcludedArea,
+      isExcludedArea: req.body?.isExcludedArea, isCameraDisabled: req.body?.isCameraDisabled, isbillingDisabled: req.body?.isbillingDisabled,
     } );
 
     let updateKeys = [];
@@ -1732,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 },

package/src/docs/client.docs.js

@@ -10,14 +10,6 @@ export const clientDocs = {
       tags: [ 'Client' ],
       description: 'lead appoved and create a new client',
       operationId: 'create',
-      parameters: [ {
-        in: 'path',
-        name: 'id',
-        required: true,
-        schema: {
-          type: 'string',
-        },
-      } ],
       requestBody: {
         content: {
           'application/json': {

package/src/dtos/client.dtos.js

@@ -109,6 +109,8 @@ export const featureConfigurationSchemaBody = joi.object(
       isPasserByData: joi.boolean().optional(),
       isFootfallDirectory: joi.boolean().optional(),
       isExcludedArea: joi.boolean().optional(),
+      isCameraDisabled: joi.boolean().optional(),
+      isbillingDisabled: joi.boolean().optional(),
     },
 );
 

package/src/service/client.service.js

@@ -133,6 +133,7 @@ export function featureConfigurationUpdate( {
   close, conversionCalculation, conversionCondition,
   conversionValue, infraAlertCondition, infraAlertValue, isFootfallDirectory,
   isNormalized, isPasserByData, missedOpportunityCalculation, open, isExcludedArea,
+  isCameraDisabled, isbillingDisabled,
 } ) {
   return clientModel.updateOne( { clientId: clientId },
       {
@@ -153,6 +154,8 @@ export function featureConfigurationUpdate( {
           'featureConfigs.isFootfallDirectory': isFootfallDirectory,
           'featureConfigs.isExcludedArea': isExcludedArea,
           'featureConfigs.updateFeatureConfig': false,
+          'featureConfigs.isCameraDisabled': isCameraDisabled,
+          'featureConfigs.isbillingDisabled': isbillingDisabled,
         },
       } );
 }