tango-app-api-client 3.4.0-beta.5 → 3.4.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.4.0-beta.5",
+    "version": "3.4.0-beta.7",
     "description": "client",
     "main": "index.js",
     "type": "module",
@@ -27,7 +27,7 @@
         "npm": "^10.9.1",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.2.59",
-        "tango-app-api-middleware": "^3.1.60",
+        "tango-app-api-middleware": "^3.1.67",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/client.controllers.js

@@ -996,7 +996,7 @@ export async function updateTicketConfiguration( req, res ) {
 
     // Map and rename keys from previous client info for UI display and logging
     const oldData = {
-      InfraDowntimeType: findClient?.ticketConfigs?.downTimeType,
+      InfraDowntimeType: findClient?.ticketConfigs?.downTimeType==0? 'Single Camera': 'All Cameras',
       AutoReAssignInstallation: findClient?.ticketConfigs?.installationReAssign,
       InfraDowntime: findClient?.ticketConfigs?.infraDownTime,
       InfraFiles: findClient?.ticketConfigs?.MinFilesCount,
@@ -1009,7 +1009,7 @@ export async function updateTicketConfiguration( req, res ) {
 
     // Map and rename keys from current client info for UI display and logging
     const newData ={
-      InfraDowntimeType: updatedClient?.ticketConfigs?.downTimeType,
+      InfraDowntimeType: updatedClient?.ticketConfigs?.downTimeType==0? 'Single Camera': 'All Cameras',
       AutoReAssignInstallation: updatedClient?.ticketConfigs?.installationReAssign,
       InfraDowntime: updatedClient?.ticketConfigs?.infraDownTime,
       InfraFiles: updatedClient?.ticketConfigs?.MinFilesCount,
@@ -1136,9 +1136,9 @@ export async function updateFeatureConfiguration( req, res ) {
     const oldData = {
       StoreOpenTime: previousData?.featureConfigs?.open,
       StoreCloseTime: previousData?.featureConfigs?.close,
-      ConversionCalculations: previousData?.featureConfigs?.conversionCalculation,
-      MissedOpportunityCalculation: previousData?.featureConfigs?.missedOpportunityCalculation,
-      PotentialCalculations: previousData?.featureConfigs?.billableCalculation,
+      ConversionCalculations: previousData?.featureConfigs?.conversionCalculation=='footfall-count'? 'Footfall Count': postData?.featureConfigs?.conversionCalculation=='engagers-count'?'Engagers Count':'Potential Entities',
+      MissedOpportunityCalculation: previousData?.featureConfigs?.missedOpportunityCalculation=='engagers-conversion'? 'Engagers - Conversion': 'Potential Entities - Conversion',
+      PotentialCalculations: previousData?.featureConfigs?.billableCalculation=='footfall-count'? 'Footfall Count': 'Engagers Count',
       ConversionCondition: previousData?.featureConfigs?.conversion.condition,
       ConversionValue: previousData?.featureConfigs?.conversion.value,
       MissedOpportunityFromCondition: previousData?.featureConfigs?.missedOpportunityFrom?.condition,
@@ -1149,7 +1149,6 @@ export async function updateFeatureConfiguration( req, res ) {
       BouncedLimitValue: previousData?.featureConfigs?.bouncedLimit?.value,
       InfraAlertValue: previousData?.featureConfigs?.infraAlert?.value,
       InfraAlertCondition: previousData?.featureConfigs?.infraAlert?.condition,
-      ConversionCalculations: previousData?.featureConfigs?.conversionCalculation,
       ExcludedArea: previousData?.featureConfigs?.isExcludedArea ==true ? 'Enabled': 'Disabled',
       PasserBydata: previousData?.featureConfigs?.isPasserByData ==true ? 'Enabled': 'Disabled',
       NormalizedDataDuringDowntime: previousData?.featureConfigs?.isNormalized ==true ? 'Enabled': 'Disabled',
@@ -1173,9 +1172,9 @@ export async function updateFeatureConfiguration( req, res ) {
     const newData ={
       StoreOpenTime: postData?.featureConfigs?.open,
       StoreCloseTime: postData?.featureConfigs?.close,
-      ConversionCalculations: postData?.featureConfigs?.conversionCalculation,
-      MissedOpportunityCalculation: postData?.featureConfigs?.missedOpportunityCalculation,
-      PotentialCalculations: postData?.featureConfigs?.billableCalculation,
+      ConversionCalculations: postData?.featureConfigs?.conversionCalculation=='footfall-count'? 'Footfall Count': postData?.featureConfigs?.conversionCalculation=='engagers-count'?'Engagers Count':'Potential Entities',
+      MissedOpportunityCalculation: postData?.featureConfigs?.missedOpportunityCalculation=='engagers-conversion'? 'Engagers - Conversion': 'Potential Entities - Conversion',
+      PotentialCalculations: postData?.featureConfigs?.billableCalculation=='footfall-count'? 'Footfall Count':'Engagers Count',
       ConversionCondition: postData?.featureConfigs?.conversion.condition,
       ConversionValue: postData?.featureConfigs?.conversion.value,
       MissedOpportunityFromCondition: postData?.featureConfigs?.missedOpportunityFrom?.condition,
@@ -1186,23 +1185,22 @@ export async function updateFeatureConfiguration( req, res ) {
       BouncedLimitValue: postData?.featureConfigs?.bouncedLimit?.value,
       InfraAlertValue: postData?.featureConfigs?.infraAlert?.value,
       InfraAlertCondition: postData?.featureConfigs?.infraAlert?.condition,
-      ConversionCalculations: postData?.featureConfigs?.conversionCalculation,
-      ExcludedArea: postData?.featureConfigs?.isExcludedArea ==true ? 'Enable': 'Disable',
-      PasserBydata: postData?.featureConfigs?.isPasserByData ==true ? 'Enable': 'Disable',
-      NormalizedDataDuringDowntime: postData?.featureConfigs?.isNormalized ==true ? 'Enable': 'Disable',
-      Billing: postData?.featureConfigs?.isbillingDisabled ==true ? 'Enable': 'Disable',
-      CameraBlurring: postData?.featureConfigs?.isCameraDisabled ==true ? 'Enable': 'Disable',
-      FootfallDirectory: postData?.featureConfigs?.isFootfallDirectory ==true ? 'Enable': 'Disable',
-      NOBStatus: postData?.featureConfigs?.isNOB ==true ? 'Enable': 'Disable',
-      EnableAnalyze: postData?.featureConfigs?.isNewDashboard ==true ? 'Enable': 'Disable',
-      Traffic: postData?.featureConfigs?.isNewTraffic==true ? 'Enable': 'Disable',
-      Zone: postData?.featureConfigs?.isNewZone ==true ? 'Enable': 'Disable',
-      Zonev2: postData?.featureConfigs?.isNewZoneV2 ==true ? 'Enable': 'Disable',
-      Reports: postData?.featureConfigs?.isNewReports ==true ? 'Enable': 'Disable',
-      Trax: postData?.featureConfigs?.isTrax ==true ? 'Enable': 'Disable',
+      ExcludedArea: postData?.featureConfigs?.isExcludedArea ==true ? 'Enabled': 'Disabled',
+      PasserBydata: postData?.featureConfigs?.isPasserByData ==true ? 'Enabled': 'Disabled',
+      NormalizedDataDuringDowntime: postData?.featureConfigs?.isNormalized ==true ? 'Enabled': 'Disabled',
+      Billing: postData?.featureConfigs?.isbillingDisabled ==true ? 'Enabled': 'Disabled',
+      CameraBlurring: postData?.featureConfigs?.isCameraDisabled ==true ? 'Enabled': 'Disabled',
+      FootfallDirectory: postData?.featureConfigs?.isFootfallDirectory ==true ? 'Enabled': 'Disabled',
+      NOBStatus: postData?.featureConfigs?.isNOB ==true ? 'Enabled': 'Disabled',
+      EnableAnalyze: postData?.featureConfigs?.isNewDashboard ==true ? 'Enabled': 'Disabled',
+      Traffic: postData?.featureConfigs?.isNewTraffic==true ? 'Enabled': 'Disabled',
+      Zone: postData?.featureConfigs?.isNewZone ==true ? 'Enabled': 'Disabled',
+      Zonev2: postData?.featureConfigs?.isNewZoneV2 ==true ? 'Enabled': 'Disabled',
+      Reports: postData?.featureConfigs?.isNewReports ==true ? 'Enabled': 'Disabled',
+      Trax: postData?.featureConfigs?.isTrax ==true ? 'Enabled': 'Disabled',
       StreamType: postData?.featureConfigs?.streamBy =='Edge' ? 'Edge App': 'RTSP',
-      FootfallDirectoryOnlyAudit: postData?.featureConfigs?.isFootfallDirectoryAudit ==true ? 'Enable': 'Disable',
-      FootfallDirectoryOnlyFew: postData?.featureConfigs?.isFootfallDirectoryLimit ==true ? 'Enable': 'Disable',
+      FootfallDirectoryOnlyAudit: postData?.featureConfigs?.isFootfallDirectoryAudit ==true ? 'Enabled': 'Disabled',
+      FootfallDirectoryOnlyFew: postData?.featureConfigs?.isFootfallDirectoryLimit ==true ? 'Enabled': 'Disabled',
 
     };
 
@@ -1246,11 +1244,11 @@ export async function domainDetailsConfiguration( req, res ) {
     const getPreData = await findOneClient(
         { clientId: req.params?.id }, // filter by clientId
         {
-          domainName: '$domainConfig.ssoLogin.domainName',
-          isEnable: '$domainConfig.ssoLogin.isEnable',
-          ipWhitelist: '$domainConfig.ipWhitelisting.enableWhitelisting',
-          WhitelistedIps: '$domainConfig.ipWhitelisting.allowedIps',
-          TwoFactorAuthentication: '$domainConfig.enableOtp',
+          'domainConfig.ssoLogin.domainName': 1,
+          'domainConfig.ssoLogin.isEnable': 1,
+          'domainConfig.ipWhitelisting.enableWhitelisting': 1,
+          'domainConfig.ipWhitelisting.allowedIps': 1,
+          'domainConfig.enableOtp': 1,
         },
     );
     const updateAck = await domainDetailsConfigurationUpdate( {
@@ -1271,35 +1269,35 @@ export async function domainDetailsConfiguration( req, res ) {
     const getPostData = await findOneClient(
         { clientId: req.params?.id }, // Filter by clientId
         {
-          domainName: '$domainConfig.ssoLogin.domainName',
-          isEnable: '$domainConfig.ssoLogin.isEnable',
-          ipWhitelist: '$domainConfig.ipWhitelisting.enableWhitelisting',
-          WhitelistedIps: '$domainConfig.ipWhitelisting.allowedIps',
-          TwoFactorAuthentication: '$domainConfig.enableOtp',
+          'domainConfig.ssoLogin.domainName': 1,
+          'domainConfig.ssoLogin.isEnable': 1,
+          'domainConfig.ipWhitelisting.enableWhitelisting': 1,
+          'domainConfig.ipWhitelisting.allowedIps': 1,
+          'domainConfig.enableOtp': 1,
         },
     );
 
 
     // Map and rename keys from previous client info for UI display and logging
-    // const oldData = {
-    //   DomainName: getPreData?.domainConfig?.ssoLogin?.domainName,
-    //   IsEnable: getPreData?.domainConfig?.ssoLogin?.isEnable ==true ? 'Enable': 'Disable',
-    //   IPWhitelist: getPreData?.domainConfig?.ipWhitelisting?.enableWhitelisting ==true ? 'Enable': 'Disable',
-    //   WhitelistedIps: ( getPreData?.domainConfig?.ipWhitelisting?.allowedIps )?.join( ', ' ),
-    //   TwoFactorAuthentication: getPreData?.domainConfig?.enableOtp ==true ? 'Enable': 'Disable',
+    const oldData = {
+      DomainName: getPreData?.domainConfig?.ssoLogin?.domainName?.join( ', ' ),
+      IsEnable: getPreData?.domainConfig?.ssoLogin?.isEnable ==true ? 'Enable': 'Disable',
+      IPWhitelist: getPreData?.domainConfig?.ipWhitelisting?.enableWhitelisting ==true ? 'Enable': 'Disable',
+      WhitelistedIps: getPreData?.domainConfig?.ipWhitelisting?.allowedIps?.join( ', ' ),
+      TwoFactorAuthentication: getPreData?.domainConfig?.enableOtp ==true ? 'Enable': 'Disable',
 
-    // };
+    };
 
     // Map and rename keys from current client info for UI display and logging
-    // const newData ={
-    //   DomainName: getPostData?.domainConfig?.ssoLogin?.domainName,
-    //   IsEnable: getPostData?.domainConfig?.ssoLogin?.isEnable ==true ? 'Enable': 'Disable',
-    //   IPWhitelist: getPostData?.domainConfig?.ipWhitelisting?.enableWhitelisting ==true ? 'Enable': 'Disable',
-    //   WhitelistedIps: ( getPostData?.domainConfig?.ipWhitelisting?.allowedIps ).join( ', ' ),
-    //   TwoFactorAuthentication: getPostData?.domainConfig?.enableOtp ==true ? 'Enable': 'Disable',
-    // };
-
+    const newData ={
+      DomainName: getPostData?.domainConfig?.ssoLogin?.domainName?.join( ', ' ),
+      IsEnable: getPostData?.domainConfig?.ssoLogin?.isEnable ==true ? 'Enable': 'Disable',
+      IPWhitelist: getPostData?.domainConfig?.ipWhitelisting?.enableWhitelisting ==true ? 'Enable': 'Disable',
+      WhitelistedIps: getPostData?.domainConfig?.ipWhitelisting?.allowedIps?.join( ', ' ),
+      TwoFactorAuthentication: getPostData?.domainConfig?.enableOtp ==true ? 'Enable': 'Disable',
+    };
 
+    logger.info( { getPreData: getPreData, getPostData: getPostData, newData: newData, oldData: oldData } );
     // Prepare activity log object with all relevant details for OpenSearch logging
     const logObj = {
       clientId: req.params?.id, // ID of the client whose data was updated
@@ -1313,8 +1311,8 @@ export async function domainDetailsConfiguration( req, res ) {
       showTo: [ 'client', 'tango' ], // Visibility of the log (who can see this log)
       previous: getPreData, // Previous (old) client information before update based on DB keys (for internal reference and comparison).
       current: getPostData, // Current (new) client information after update based on DB keys (for internal reference and comparison).
-      // oldData: oldData, // Previous (old) client information before update (used for showing detailed changes in the UI).
-      // newData: newData, // Current (new) client information after update (used for showing detailed changes in the UI).
+      oldData: oldData, // Previous (old) client information before update (used for showing detailed changes in the UI).
+      newData: newData, // Current (new) client information after update (used for showing detailed changes in the UI).
     };
 
     // Insert activity log into OpenSearch if there are fields that were updated
@@ -1490,20 +1488,22 @@ export async function auditConfiguration( req, res ) {
     };
     await updateOneClient( query, record );
 
-
     // Map and rename keys from previous client info for UI display and logging
-    const oldData = {
-      AuditStatus: inputData?.audit ==true ? 'Enable': 'Disable',
-      MappingPercentage: inputData?.ratio,
-      AuditCount: inputData?.count,
-
+    const oldData ={
+      AuditStatus: previousClient?.auditConfigs?.audit ==true ? 'Enable': 'Disable',
+      MappingPercentage: previousClient?.auditConfigs?.ratio,
+      AuditCount: previousClient?.auditConfigs?.count,
     };
 
+    const currentClient = await findOneClient( query, fields );
+    currentClient.auditConfigs.ratio = currentClient?.auditConfigs?.ratio? ( currentClient.auditConfigs.ratio )*100 : null;
+
     // Map and rename keys from current client info for UI display and logging
-    const newData ={
-      AuditStatus: previousClient.auditConfigs?.audit ==true ? 'Enable': 'Disable',
-      MappingPercentage: previousClient.auditConfigs?.ratio,
-      AuditCount: previousClient.auditConfigs?.count,
+    const newData = {
+      AuditStatus: currentClient?.auditConfigs?.audit ==true ? 'Enable': 'Disable',
+      MappingPercentage: currentClient?.auditConfigs?.ratio,
+      AuditCount: currentClient?.auditConfigs?.count,
+
     };
     const logObj = {
       clientId: req.params?.id,
@@ -1516,12 +1516,7 @@ export async function auditConfiguration( req, res ) {
       showTo: [ 'tango' ],
       changes: [ `Audit config for client id ${req.params?.id}` ],
       previous: previousClient.auditConfigs,
-      current: {
-        clientId: req.params?.id,
-        count: inputData.count,
-        audit: inputData.audit,
-        ratio: inputData.ratio,
-      },
+      current: currentClient.auditConfigs,
       oldData: oldData,
       newData: newData,
     };
@@ -2276,7 +2271,7 @@ export async function detailedClientCount( req, res ) {
   }
 }
 
-export async function getActivityLogs( req, res ) {
+export async function getActivityLogs1( req, res ) {
   try {
     const inputData = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
@@ -2536,7 +2531,7 @@ function getUserFriendlyKey( keyPath, mapping ) {
   return typeof value === 'string' ? value : keyPath; // Return mapped value or original key
 }
 
-export async function getActivityLogs1( req, res ) {
+export async function getActivityLogs( req, res ) {
   try {
     const inputData = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
@@ -2688,8 +2683,10 @@ function findDifferences( oldData, newData ) {
 
 function splitCamelCase( text ) {
   return text.replace( /([a-z])([A-Z])/g, '$1 $2' ) // Add space between camelCase words
-      .replace( /(\d+)/g, ' $1 ' ) // Add space between numbers
-      .trim();
+      .replace( /([a-zA-Z])(\d+)/g, '$1 $2' ) // Add space between letters and numbers
+      .replace( /(\d+)([a-zA-Z])/g, '$1 $2' )
+      .trim()
+      .replace( /^./, ( match ) => match.toUpperCase() ); // Capitalize the first letter
 }
 
 async function postApi( url, data ) {

package/src/dtos/client.dtos.js

@@ -52,8 +52,8 @@ export const signatoryDetailsSchemaBody = joi.object( {
   name: joi.string().optional(),
   email: joi.string().email().message( 'Enter a valid email' ).optional(),
   number: joi.string()
-      .pattern( /^\d{4,12}$/ )
-      .message( 'Enter a valid mobile number' )
+      .pattern( /^\d{7,15}$/ )
+      .message( 'Mobile Number Must be Valid' )
       .optional(),
   designation: joi.string().optional(),
 } );