tango-app-api-client 3.3.1 → 3.3.2-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.3.1",
+    "version": "3.3.2-beta.1",
     "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.1.58",
-        "tango-app-api-middleware": "^3.1.45",
+        "tango-api-schema": "^2.1.59",
+        "tango-app-api-middleware": "^3.1.43-alpha.8",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/client.controllers.js

@@ -515,7 +515,44 @@ export async function clientDetails( req, res ) {
 }
 export async function detailedAllClientCount( req, res ) {
   try {
+    const field = { clientName: 1, clientId: 1 };
+    let Assinedclient = [];
+    if ( req?.user?.role === 'superadmin' ) {
+      Assinedclient = await findClient( {}, field );
+      Assinedclient = Assinedclient.map( ( data ) => data.clientId );
+    } else {
+      const clientQuery = [
+        {
+          $match: {
+            userEmail: req?.user?.email,
+            assignedType: { $eq: 'client' },
+          },
+        },
+        {
+          $group: {
+            _id: null,
+            clientId: { $addToSet: '$assignedValue' },
+          },
+        },
+        {
+          $project: {
+            _id: 0,
+            clientId: 1,
+          },
+        },
+
+      ];
+      const clientList = await aggregateUserAssignedStore( clientQuery );
+      if ( clientList[0]?.clientId?.length != 0 ) {
+        Assinedclient= clientList[0]?.clientId;
+      }
+    }
     const query = [
+      {
+        $match: {
+          clientId: { $in: Assinedclient },
+        },
+      },
       {
         $project: {
           activeClient: { $cond: [ { $eq: [ '$status', 'active' ] }, 1, 0 ] },
@@ -579,11 +616,14 @@ export async function detailedAllClientCount( req, res ) {
       },
     ];
     const result = await aggregateClient( query );
-    const activeStores = await findStore( { 'status': 'active' }, { storeId: 1 } );
+    const activeStores = await findStore( {
+      'clientId': { $in: Assinedclient },
+      'status': 'active' }, { storeId: 1 } );
     let yettoInstallCount = await aggregateTickets( [
       {
         $match: {
           $and: [
+            { 'basicDetails.clientId': { $in: Assinedclient } },
             { issueType: 'installation' },
             { 'status': { $ne: 'closed' } },
           ],
@@ -867,7 +907,7 @@ export async function updateFeatureConfiguration( req, res ) {
       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, isCameraDisabled: req.body?.isCameraDisabled, isbillingDisabled: req.body?.isbillingDisabled, isNewDashboard: req.body?.isNewDashboard,
-      isFootfallAuditStores: req.body?.isFootfallAuditStores, isNewTraffic: req.body?.isNewTraffic, isNewZone: req.body?.isNewZone, isNewReports: req.body?.isNewReports, isNOB: req.body?.isNOB, isNewZoneV2: req.body?.isNewZoneV2,
+      isFootfallAuditStores: req.body?.isFootfallAuditStores, isNewTraffic: req.body?.isNewTraffic, isNewZone: req.body?.isNewZone, isNewReports: req.body?.isNewReports, isNOB: req.body?.isNOB, isNewZoneV2: req.body?.isNewZoneV2, isTrax: req.body?.isTrax,
     } );
 
     let updateKeys = [];

package/src/dtos/client.dtos.js

@@ -119,6 +119,7 @@ export const featureConfigurationSchemaBody = joi.object(
       isNewReports: joi.boolean().optional(),
       isNOB: joi.boolean().optional(),
       isNewZoneV2: joi.boolean().optional(),
+      isTrax: joi.boolean().optional(),
     },
 );
 

package/src/service/client.service.js

@@ -134,7 +134,7 @@ export function featureConfigurationUpdate( {
   conversionValue, infraAlertCondition, infraAlertValue, isFootfallDirectory,
   isNormalized, isPasserByData, missedOpportunityCalculation, open, isExcludedArea,
   isCameraDisabled, isbillingDisabled, isNewDashboard, isFootfallAuditStores, isNewTraffic,
-  isNewZone, isNewReports, isNOB, isNewZoneV2,
+  isNewZone, isNewReports, isNOB, isNewZoneV2, isTrax,
 } ) {
   return clientModel.updateOne( { clientId: clientId },
       {
@@ -164,6 +164,7 @@ export function featureConfigurationUpdate( {
           'featureConfigs.isNewReports': isNewReports,
           'featureConfigs.isNOB': isNOB,
           'featureConfigs.isNewZoneV2': isNewZoneV2,
+          'featureConfigs.isTrax': isTrax,
         },
       } );
 }