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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.3.1-beta.2",
+    "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.54",
-        "tango-app-api-middleware": "^3.1.42",
+        "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/routes/client.routes.js

@@ -2,97 +2,94 @@
 import express from 'express';
 import { activityLogValid, auditConfigValid, billingDetailsValid, brandInfoValid, clientCreationValid, clientDetailsValid, documentsValid, domainDetailsValid, featureConfigurationValid, getAssignedClientValid, getAuditConfigValid, postClientCamApprovalValid, signatoryDetailsValid, ticketConfigurationValid, userConfigurationValid } from '../dtos/client.dtos.js';
 import { auditConfiguration, changeStatus, clientCsmAssignAction, clientDetails, create, csmAssignConfirmation, domainDetailsConfiguration, getActivityLogs, getAuditConfiguration, getClients, getCsmUsers, getOpsUsers, updateBillingDetails, updateBrandInfo, updateDocuments, updateFeatureConfiguration, updateSignatoryDetails, updateTicketConfiguration, userConfiguration } from '../controllers/client.controllers.js';
-import { authorize, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
+import { accessVerification, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { clientListValid, detailedClientCountValid } from '../dtos/client.dtos.js';
-import { isclientIdExists, isclientNameExists } from '../validations/client.validations.js';
+import { isclientIdExists, isclientNameExists, roleVerification } from '../validations/client.validations.js';
 import { detailedAllClientCount, detailedClientCount, clientList, clientListV1 } from '../controllers/client.controllers.js';
 
 export const clientRouter = express.Router();
 
 clientRouter.post( '/create', isAllowedSessionHandler,
-    authorize( { userType: [ 'tango' ], access: [ { featureName: 'manage', name: 'brands', permissions: [ 'isEdit' ] } ] } ),
+    accessVerification( { userType: [ 'tango' ] } ), roleVerification,
     validate( clientCreationValid ), isclientNameExists, changeStatus, create );
 clientRouter.get( '/get-clients', isAllowedSessionHandler,
-    authorize( { userType: [ 'tango' ] } ), getClients );
+    accessVerification( { userType: [ 'tango' ] } ), getClients );
 clientRouter.get( '/client-details/:id', isAllowedSessionHandler, validate( clientDetailsValid ), clientDetails );
 
-clientRouter.put( '/brand-info/:id', isAllowedSessionHandler, authorize(
+clientRouter.put( '/brand-info/:id', isAllowedSessionHandler, accessVerification(
     { userType: [ 'tango', 'client' ], access: [
-      { featureName: 'settings', name: 'brandDetails', permissions: [ 'isEdit' ] } ] } ),
+      { featureName: 'Global', name: 'Configuration', permissions: [ 'isEdit' ] } ] } ),
 validate( brandInfoValid ), updateBrandInfo );
 
-clientRouter.put( '/billing-details/:id', isAllowedSessionHandler, authorize(
+clientRouter.put( '/billing-details/:id', isAllowedSessionHandler, accessVerification(
     { userType: [ 'tango', 'client' ], access: [
-      { featureName: 'settings', name: 'brandDetails', permissions: [ 'isEdit' ] } ] } ),
+      { featureName: 'Global', name: 'Billing', permissions: [ 'isEdit' ] } ] } ),
 validate( billingDetailsValid ), updateBillingDetails );
 
-clientRouter.put( '/signatory-details/:id', isAllowedSessionHandler, authorize(
+clientRouter.put( '/signatory-details/:id', isAllowedSessionHandler, accessVerification(
     { userType: [ 'tango', 'client' ], access: [
-      { featureName: 'settings', name: 'brandDetails', permissions: [ 'isEdit' ] } ] } ),
+      { featureName: 'Global', name: 'Configuration', permissions: [ 'isEdit' ] } ] } ),
 validate( signatoryDetailsValid ), updateSignatoryDetails );
 
-clientRouter.put( '/ticket-configuration/:id', isAllowedSessionHandler, authorize(
+clientRouter.put( '/ticket-configuration/:id', isAllowedSessionHandler, accessVerification(
     { userType: [ 'tango' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isEdit' ] } ] } ),
+      { featureName: 'TangoAdmin', name: 'TicketConfiguration', permissions: [ 'isEdit' ] } ] } ),
 validate( ticketConfigurationValid ), updateTicketConfiguration );
 
-clientRouter.put( '/feature-configuration/:id', isAllowedSessionHandler, authorize(
+clientRouter.put( '/feature-configuration/:id', isAllowedSessionHandler, accessVerification(
     { userType: [ 'tango', 'client' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isEdit' ] } ] } ),
+      { featureName: 'Global', name: 'Configuration', permissions: [ 'isEdit' ] } ] } ),
 validate( featureConfigurationValid ), updateFeatureConfiguration );
 
-clientRouter.put( '/domain-details/:id', isAllowedSessionHandler, authorize(
+clientRouter.put( '/domain-details/:id', isAllowedSessionHandler, accessVerification(
     { userType: [ 'tango', 'client' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isEdit' ] } ] } ),
+      { featureName: 'Global', name: 'Configuration', permissions: [ 'isEdit' ] } ] } ),
 validate( domainDetailsValid ), domainDetailsConfiguration );
 
-clientRouter.put( '/user-configuration/:id', isAllowedSessionHandler, authorize(
+clientRouter.put( '/user-configuration/:id', isAllowedSessionHandler, accessVerification(
     { userType: [ 'tango' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isEdit' ] } ] } ),
+      { featureName: 'TangoAdmin', name: 'TicketConfiguration', permissions: [ 'isEdit' ] } ] } ),
 validate( userConfigurationValid ), userConfiguration );
 
-clientRouter.put( '/documents/:id', isAllowedSessionHandler, authorize(
+clientRouter.put( '/documents/:id', isAllowedSessionHandler, accessVerification(
     { userType: [ 'tango', 'client' ], access: [
-      { featureName: 'settings', name: 'documents', permissions: [ 'isEdit' ] } ] } ),
+      { featureName: 'Global', name: 'Configuration', permissions: [ 'isEdit' ] } ] } ),
 validate( documentsValid ), updateDocuments );
 
-clientRouter.get( '/audit-configuration/:id', isAllowedSessionHandler, authorize(
+clientRouter.get( '/audit-configuration/:id', isAllowedSessionHandler, accessVerification(
     { userType: [ 'tango' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isView' ] } ] } ),
+      { featureName: 'TangoAdmin', name: 'TicketConfiguration', permissions: [] } ] } ),
 validate( getAuditConfigValid ), getAuditConfiguration );
 
-clientRouter.post( '/audit-configuration/:id', isAllowedSessionHandler, authorize(
+clientRouter.post( '/audit-configuration/:id', isAllowedSessionHandler, accessVerification(
     { userType: [ 'tango' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isEdit' ] } ] } ),
+      { featureName: 'TangoAdmin', name: 'TicketConfiguration', permissions: [ 'isEdit' ] } ] } ),
 validate( auditConfigValid ), auditConfiguration );
 
-clientRouter.get( '/get-csm-users', isAllowedSessionHandler, authorize(
-    { userType: [ 'tango' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isView' ] } ] } ),
+clientRouter.get( '/get-csm-users', isAllowedSessionHandler, accessVerification(
+    { userType: [ 'tango' ] } ),
 getCsmUsers );
 
-clientRouter.get( '/get-ops-users', isAllowedSessionHandler, authorize(
-    { userType: [ 'tango' ], access: [
-      { featureName: 'settings', name: 'configuration', permissions: [ 'isView' ] } ] } ),
+clientRouter.get( '/get-ops-users', isAllowedSessionHandler, accessVerification(
+    { userType: [ 'tango' ] } ),
 getOpsUsers );
 
 clientRouter.get( '/detailed-all-client-count', isAllowedSessionHandler,
-    authorize( { userType: [ 'tango' ] } ),
+    accessVerification( { userType: [ 'tango' ] } ),
     detailedAllClientCount );
 
 clientRouter.post( '/client-list', isAllowedSessionHandler,
-    authorize( { userType: [ 'tango' ], access: [ { featureName: 'manage', name: 'brands', permissions: [ 'isView' ] } ] } ),
+    accessVerification( { userType: [ 'tango' ] } ),
     validate( clientListValid ), clientList );
 clientRouter.post( '/client-list_v1', isAllowedSessionHandler,
-    authorize( { userType: [ 'tango' ], access: [ { featureName: 'manage', name: 'brands', permissions: [ 'isView' ] } ] } ),
+    accessVerification( { userType: [ 'tango' ] } ),
     validate( clientListValid ), clientListV1 );
 clientRouter.get( '/detailed-client-count', isAllowedSessionHandler,
-    authorize( { userType: [ 'tango', 'client' ] } ),
+    accessVerification( { userType: [ 'tango', 'client' ] } ),
     validate( detailedClientCountValid ), isclientIdExists, detailedClientCount );
 
-clientRouter.post( '/activity-log', isAllowedSessionHandler, authorize(
-    { userType: [ 'tango', 'client' ], access: [
-      { featureName: 'settings', name: 'activityLog', permissions: [ 'isView' ] } ] } ),
+clientRouter.post( '/activity-log', isAllowedSessionHandler, accessVerification(
+    { userType: [ 'tango', 'client' ] } ),
 validate( activityLogValid ), getActivityLogs );
 
 clientRouter.get( '/show-csm-assign-confirmation', isAllowedSessionHandler,

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,
         },
       } );
 }

package/src/validations/client.validations.js

@@ -33,3 +33,17 @@ export async function isclientIdExists( req, res, next ) {
     return res.sendError( 'Internal Server Error', 500 );
   }
 }
+
+export async function roleVerification( req, res, next ) {
+  try {
+    if ( [ 'admin', 'superadmin' ].includes( req?.user?.role ) ) {
+      return next();
+    } else {
+      return res.sendError( 'access forbidden', 403 );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, message: req.body, function: 'roleVerification' } );
+    return res.sendError( error, 500 );
+  }
+}
+