tango-app-api-client 3.3.3-beta.14 → 3.3.3-beta.16

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.3.3-beta.14",
+    "version": "3.3.3-beta.16",
     "description": "client",
     "main": "index.js",
     "type": "module",

package/src/controllers/client.controllers.js

@@ -885,14 +885,14 @@ export async function updateSignatoryDetails( req, res ) {
 export async function updateTicketConfiguration( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    let findClient = await findOneClient( { clientId: req.params?.id } );
+    const fields ={ 'ticketConfigs.downTimeType': 1, 'ticketConfigs.installationReAssign': 1, 'ticketConfigs.downTimeType': 1, 'ticketConfigs.infraDownTime': 1, 'ticketConfigs.MinFilesCount': 1, 'ticketConfigs.rcaTicketAssign': 1, 'ticketConfigs.refreshAlert': 1, 'ticketConfigs.statusCheckAlert': 1, 'ticketConfigs.accuracyPercentage': 1, 'ticketConfigs.reTrain': 1 };
+    let findClient = await findOneClient( { clientId: req.params?.id }, fields );
     const updateAck = await ticketConfigurationUpdate( {
       clientId: req.params?.id, MinFilesCount: req.body?.MinFilesCount, accuracyPercentage: req.body?.accuracyPercentage, downTimeType: req.body?.downTimeType,
       infraDownTime: req.body?.infraDownTime, installationReAssign: req.body?.installationReAssign, isRcaTicketAssign: req.body?.isRcaTicketAssign,
       isRefreshAlert: req.body?.isRefreshAlert, isStatusCheckAlert: req.body?.isStatusCheckAlert, rcaTicketAssign: req.body?.rcaTicketAssign, reTrain: req.body?.reTrain,
       refreshAlert: req.body?.refreshAlert, sendToAdmin: req.body?.sendToAdmin, sendToUser: req.body?.sendToUser, statusCheckAlert: req.body?.statusCheckAlert,
     } );
-
     let updateKeys = [];
     if ( Object.keys( req.body ).length > 0 ) {
       Object.keys( req.body ).forEach( ( element ) => {
@@ -901,7 +901,7 @@ export async function updateTicketConfiguration( req, res ) {
     }
 
     const user = await getUserNameEmailById( req.userId );
-    let updatedClient = await findOneClient( { clientId: req.params?.id } );
+    let updatedClient = await findOneClient( { clientId: req.params?.id }, fields );
 
     const logObj = {
       clientId: req.params?.id,
@@ -1034,7 +1034,7 @@ export async function updateFeatureConfiguration( req, res ) {
 export async function domainDetailsConfiguration( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    const getPreData = await findOneClient( { clientId: req.params?.id }, { domainName: '$domainConfig.ssoLogin.domainName', TwoFactorAuthentication: '$domainConfig.ssoLogin.isEnable', ipWhitelist: '$domainConfig.ipWhitelisting.enableWhitelisting', WhitelistesIps: '$domainConfig.ipWhitelisting.allowedIps', enableOtp: '$domainConfig.enableOtp' } );
+    const getPreData = await findOneClient( { clientId: req.params?.id }, { domainName: '$domainConfig.ssoLogin.domainName', isEnable: '$domainConfig.ssoLogin.isEnable', ipWhitelist: '$domainConfig.ipWhitelisting.enableWhitelisting', WhitelistedIps: '$domainConfig.ipWhitelisting.allowedIps', TwoFactorAuthentication: '$domainConfig.enableOtp' } );
     const updateAck = await domainDetailsConfigurationUpdate( {
       clientId: req.params?.id, domainName: req.body?.domainName, isEnable: req.body?.isEnable,
       enableWhitelisting: req.body?.enableWhitelisting, allowedIps: req.body?.allowedIps, enableOtp: req.body?.enableOtp,
@@ -1049,7 +1049,7 @@ export async function domainDetailsConfiguration( req, res ) {
       } );
     }
 
-    const getPostData = await findOneClient( { clientId: req.params?.id }, { domainName: '$domainConfig.ssoLogin.domainName', TwoFactorAuthentication: '$domainConfig.enableOtp', ipWhitelist: '$domainConfig.ipWhitelisting.enableWhitelisting', WhitelistesIps: '$domainConfig.ipWhitelisting.allowedIps', isEnable: '$domainConfig.ssoLogin.isEnable' } );
+    const getPostData = await findOneClient( { clientId: req.params?.id }, { domainName: '$domainConfig.ssoLogin.domainName', isEnable: '$domainConfig.ssoLogin.isEnable', ipWhitelist: '$domainConfig.ipWhitelisting.enableWhitelisting', WhitelistedIps: '$domainConfig.ipWhitelisting.allowedIps', TwoFactorAuthentication: '$domainConfig.enableOtp' } );
 
     const logObj = {
       clientId: req.params?.id,
@@ -1230,6 +1230,7 @@ export async function auditConfiguration( req, res ) {
       auditConfigs: 1, _id: 0,
     };
     const previousClient = await findOneClient( query, fields );
+    previousClient.auditConfigs.ratio = previousClient?.auditConfigs?.ratio? ( previousClient.auditConfigs.ratio )*100 : null;
     const record = {
       'auditConfigs.count': inputData.count,
       'auditConfigs.audit': inputData.audit,
@@ -1253,7 +1254,7 @@ export async function auditConfiguration( req, res ) {
         clientId: req.params?.id,
         count: inputData.count,
         audit: inputData.audit,
-        ratio: normalizeNumber( inputData.ratio, 0, 100 ),
+        ratio: inputData.ratio,
       },
     };
 
@@ -2097,7 +2098,7 @@ export async function getActivityLogs( req, res ) {
     if ( totalDocuments ) {
       hits.map( ( hit, i ) => {
         let respo ={};
-        hit._source.logSubType = hit._source.logSubType === 'documentUpload'? 'documentsUpload': hit?._source?.logSubType;
+        hit._source.logSubType = hit._source.logSubType === 'documentUpload'? 'documentsUpload': hit._source.logSubType === 'domainDetails'? 'securityFeatures': hit?._source?.logSubType;
         if ( ( ( hit?._source?.eventType ).match( /update/ ) || ( hit?._source?.eventType ).match( /edit/ ) )&& hit?._source?.previous ) {
           const previous = hit?._source?.previous;
           const current=hit?._source?.current;
@@ -2106,7 +2107,9 @@ export async function getActivityLogs( req, res ) {
           const logSubType =hit?._source?.logSubType;
           respo = findDifferences( previous, current, logType, logSubType );
           hit._source.updatedValue = respo;
+          //  Object.keys( respo ).length === 0?null:
           temp.push( hit?._source );
+          hit._source.changes =logSubType === 'ticketConfig'? Object.keys( respo ).map( ( item ) => item ) : hit._source.changes;
         } else {
           temp.push( hit?._source );
         }
@@ -2127,12 +2130,13 @@ function findDifferences( previous, current, logType, logSubType, path = '' ) {
   const dbKeys = JSON.parse( process.env.DB_KEYS );
   const ignoredKeys = new Set( [
     '_id', 'updatedAt', 'createdAt', 'password', 'clientId',
-    'storeId', 'refreshToken', 'employeeId', 'fcmToken', 'permission',
+    'storeId', 'refreshToken', 'employeeId', 'fcmToken', 'permission', 'updateFeatureConfig',
   ] );
   const documents = dbKeys.DOCUMENTS;
   // Get correct key mapping based on logType
   const keyMapping = logType == 'stores' ?documents.stores: logType == 'users' ?documents.users :logSubType=='reportConfig'?documents.reports: logType=='brandInfo'?documents.client:documents.client;
 
+
   let differences = {};
 
   for ( const key in current ) {
@@ -2142,8 +2146,24 @@ function findDifferences( previous, current, logType, logSubType, path = '' ) {
     const currValue = current[key];
 
     if ( typeof prevValue === 'object' && typeof currValue === 'object' && prevValue !== null && currValue !== null ) {
-      const nestedDiffs = findDifferences( prevValue, currValue, logType, logSubType, `${path}${key}.` );
-      Object.assign( differences, nestedDiffs );
+      if ( logSubType!== 'userUpdated' ) {
+        if ( key == 'spocDetails' ) {
+          if ( _.isEqual( prevValue, currValue ) ) {
+            continue;
+          } else {
+            let result = compareArrayObjects( prevValue, currValue );
+            differences = { ...differences, ...result };
+          }
+        } else if ( Array.isArray( prevValue ) && prevValue.every( ( item ) => typeof item === 'string' ) ||Array.isArray( currValue ) && currValue.every( ( item ) => typeof item === 'string' ) ) {
+      JSON.stringify( prevValue ) !== JSON.stringify( currValue )?
+      differences[`${path}${key}`] = { previous: prevValue.length> 0 ? prevValue.join( ',' ): null, current: currValue.length > 0? currValue.join( ',' ): null } : null;
+
+          // differences[`${path}${key}`] = { previous: removed.length> 0 ? prevValue.join( ',' ): prevValue.join( ', ' ) :, current: added.length > 0? addedUsers.join( ', ' ) : currValue.join( ',' ) } : null;
+        }
+      } else {
+        const nestedDiffs = findDifferences( prevValue, currValue, logType, logSubType, `${path}${key}.` );
+        Object.assign( differences, nestedDiffs );
+      }
     } else if ( prevValue !== currValue ) {
       if (
         ( prevValue === '' && currValue === '' ) ||
@@ -2158,9 +2178,8 @@ function findDifferences( previous, current, logType, logSubType, path = '' ) {
   // **Transform & Filter Differences**
   let updatedDifferences = {};
   Object.keys( differences ).forEach( ( key ) => {
-    let newKey = key.replace( /spocDetails\.\d+\./, 'spocDetails.' ).replace( /WhitelistesIps\.\d+/, 'Whitelisted Ips' );
+    let newKey = key.replace( /spocDetails\.\d+\./, 'spocDetails.' ).replace( /WhitelistedIps\.\d+/, 'Whitelisted Ips' );
     let diff = differences[key];
-
     if ( newKey.toLowerCase().includes( 'isactive' ) ) {
       diff = {
         previous: diff.previous ? 'Active' : 'Deactive',
@@ -2172,22 +2191,21 @@ function findDifferences( previous, current, logType, logSubType, path = '' ) {
     if ( userFriendlyKey ) {
       newKey = userFriendlyKey;
     }
-
-    if ( newKey === 'Infra Email Alert' || newKey === 'Ip Whitelist' || newKey === 'Excluded Area'|| newKey === 'Passer By Data'|| newKey === 'Normalized'|| newKey === 'Billing'|| newKey === 'Camera'|| newKey === 'Footfall Directory'|| newKey === 'NOB'|| newKey === 'New Traffic'|| newKey === 'Trax'|| newKey === 'New Zone'|| newKey === 'New Reports'|| newKey === 'New Dashboard'|| newKey === 'Stream Type' ) {
+    const binaryKeys = [ 'Two Factor Authentication', 'Mat Enabled', 'Audit', 'Infra Email Alert', 'Ip Whitelist', 'Excluded Area', 'Passer-by data', 'Normalized data during downtime', 'Billing', 'Camera Blurring', 'Footfall Directory', 'Footfall Directory Audit', 'Footfall Directory Limit', 'NOB Status', 'Traffic', 'Trax', 'Zone V1', 'Zone V2', 'Reports', 'Analyze' ];
+    if ( binaryKeys.includes( newKey ) ) {
       diff.previous = ( diff.previous == true || diff.previous == 'Enabled' ) ? 'Enabled' : 'Disabled';
       diff.current = ( diff.current == true || diff.current == 'Enabled' ) ? 'Enabled' : 'Disabled';
     }
-    if ( newKey === 'Mat Enabled' ) {
-      diff.previous = ( diff.previous == true || diff.previous == 'Enabled' )?'Enabled' : 'Disabled';
-      diff.current = ( diff.current == true || diff.current == 'Enabled' ) ? 'Enabled' : 'Disabled';
+    if ( newKey === 'Server Type' ) {
+      diff.previous = ( diff.previous == true || diff.previous == 'Server' ) ? 'Server' : 'Serverless';
+      diff.current = ( diff.current == true || diff.current == 'Server' ) ? 'Server' : 'Serverless';
     }
 
-    if ( newKey === 'Two Factor Authentication' ) {
-      diff.previous = ( diff.previous == true || diff.previous == 'Enabled' ) ? 'Enabled' : 'Disabled';
-      diff.current = ( diff.current == true || diff.current == 'Enabled' ) ? 'Enabled' : 'Disabled';
+    if ( newKey === 'Stream Type' ) {
+      diff.previous = ( diff.previous == 'Edge' || diff.previous == 'Edge App' ) ? 'Edge App' : 'RTSP';
+      diff.current = ( diff.current == 'Edge' || diff.current == 'Edge App' ) ? 'Edge App' : 'RTSP';
     }
 
-
     // **Transform Roles Permission Keys**
     const rolesPermissionMatch = newKey.match( /rolespermission\.(\d+)\.modules\.(\d+)\.(isAdd|isEdit)/ );
     if ( rolesPermissionMatch ) {
@@ -2306,3 +2324,34 @@ export async function clientCsmAssignAction( req, res ) {
     return res.sendError( 'Internal Server Error', 500 );
   }
 }
+
+function compareArrayObjects( prevArray, currArray ) {
+  let changes = {};
+  logger.info( { prevArray: prevArray, currArray: currArray } );
+  // Find the longest array length to avoid index mismatch
+  let maxLength = Math.max( prevArray.length, currArray.length );
+
+  for ( let i = 0; i < maxLength; i++ ) {
+    let prevObj = prevArray[i] || {}; // Default to empty object if missing
+    let currObj = currArray[i] || {};
+    let diff = {};
+
+    Object.keys( { ...prevObj, ...currObj } ).forEach( ( key ) => {
+      if ( prevObj[key] !== currObj[key] && key !== '_id' ) {
+        const key1 = key == 'contact'? 'Contact Number': key == 'email'? 'Email ID':key == 'name'?'Name': key == 'designation'?'Designation':key;
+        const name = i ==0? 'Primary Spoc': `Alternate Spoc ${i+1}`;
+        diff[`${name} ${key1}`] = {
+          previous: prevObj[key] || 'null',
+          current: currObj[key] || 'null',
+        };
+      }
+    } );
+
+    if ( Object.keys( diff ).length > 0 ) {
+      // changes.push( { index: i, changes: diff } );
+      changes = { ...changes, ...diff };
+    }
+  }
+
+  return changes;
+}