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

package/package.json

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

package/src/controllers/client.controllers.js

@@ -1249,7 +1249,7 @@ export async function auditConfiguration( req, res ) {
       eventType: 'update',
       showTo: [ 'tango' ],
       changes: [ `Audit config for client id ${req.params?.id}` ],
-      previous: previousClient,
+      previous: previousClient.auditConfigs,
       current: {
         clientId: req.params?.id,
         count: inputData.count,
@@ -2030,9 +2030,37 @@ 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 );
+    const clientQuery =[
+      {
+        $match: {
+          $and: [
+            {
+              clientId: { $in: inputData },
+            },
+          ],
+        },
+      },
+      {
+        $group: {
+          _id: null,
+          clientName: { $push: '$clientName' },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          clientName: 1,
+        },
+      },
+    ];
+    const getClientName = await aggregateClient( clientQuery );
+    if ( getClientName?.length == 0 || getClientName[0]?.clientName?.length ===0 ) {
+      return res.sendError( 'No Data Found', 204 );
+    }
     const query = {
       '_source': [
         'userId', 'userName', 'email', 'date', 'logType', 'logSubType',
@@ -2040,13 +2068,27 @@ export async function getActivityLogs( req, res ) {
       ],
       'query': {
         'bool': {
-          'must': [
+          // 'must': [
+          //   {
+          //     'terms': {
+          //       'clientId.keyword': [ req.body.clientId ],
+          //     },
+          //   },
+          // ],
+
+          'should': [
             {
               'terms': {
-                'clientId.keyword': [ req.body.clientId ],
+                'clientId.keyword': [ inputData.clientId ],
+              },
+            },
+            {
+              'terms': {
+                'clientName.keyword': [ getClientName[0].clientName ], // Add clientName condition
               },
             },
           ],
+          'minimum_should_match': 1, // Ensures at least one condition must match
         },
       },
       'from': ( req.body.offset - 1 ) * req.body.limit,
@@ -2105,9 +2147,8 @@ export async function getActivityLogs( req, res ) {
           const logType =hit?._source?.logType;
 
           const logSubType =hit?._source?.logSubType;
-          respo = findDifferences( previous, current, logType, logSubType );
+          respo = findDifferences1( 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 {
@@ -2126,7 +2167,7 @@ export async function getActivityLogs( req, res ) {
 }
 
 
-function findDifferences( previous, current, logType, logSubType, path = '' ) {
+function findDifferences1( previous, current, logType, logSubType, path = '' ) {
   const dbKeys = JSON.parse( process.env.DB_KEYS );
   const ignoredKeys = new Set( [
     '_id', 'updatedAt', 'createdAt', 'password', 'clientId',
@@ -2159,9 +2200,12 @@ function findDifferences( previous, current, logType, logSubType, path = '' ) {
       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 = findDifferences1( prevValue, currValue, logType, logSubType, `${path}${key}.` );
+          Object.assign( differences, nestedDiffs );
         }
       } else {
-        const nestedDiffs = findDifferences( prevValue, currValue, logType, logSubType, `${path}${key}.` );
+        const nestedDiffs = findDifferences1( prevValue, currValue, logType, logSubType, `${path}${key}.` );
         Object.assign( differences, nestedDiffs );
       }
     } else if ( prevValue !== currValue ) {
@@ -2191,7 +2235,7 @@ function findDifferences( previous, current, logType, logSubType, path = '' ) {
     if ( userFriendlyKey ) {
       newKey = userFriendlyKey;
     }
-    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' ];
+    const binaryKeys = [ 'Two Factor Authentication', 'Mat Enabled', 'Audit Status', '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';
@@ -2257,6 +2301,149 @@ function getUserFriendlyKey( keyPath, mapping ) {
   return typeof value === 'string' ? value : keyPath; // Return mapped value or original key
 }
 
+export async function getActivityLogs( req, res ) {
+  try {
+    const inputData = req.body;
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const clientQuery =[
+      {
+        $match: {
+          $and: [
+            {
+              clientId: { $eq: inputData.clientId },
+            },
+          ],
+        },
+      },
+      {
+        $group: {
+          _id: null,
+          clientName: { $push: '$clientName' },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          clientName: 1,
+        },
+      },
+    ];
+    const getClientName = await aggregateClient( clientQuery );
+    if ( getClientName?.length == 0 || getClientName[0]?.clientName?.length ===0 ) {
+      return res.sendError( 'No Data Found', 204 );
+    }
+    const query = {
+      '_source': [
+        'userId', 'userName', 'email', 'date', 'logType', 'logSubType',
+        'changes', 'eventType', 'previous', 'current', 'oldData', 'newData',
+      ],
+      'query': {
+        'bool': {
+          'must': [
+            {
+              'terms': {
+                'clientId.keyword': [ inputData.clientId ],
+              },
+            },
+
+          ],
+          'should': [
+            {
+              'terms': {
+                'clientName.keyword': getClientName[0].clientName, // Add clientName condition
+              },
+            },
+          ],
+        },
+      },
+      'from': ( req.body.offset - 1 ) * req.body.limit,
+      'size': req.body.limit,
+      'sort': [
+        {
+          'date': {
+            'order': 'desc',
+          },
+        },
+      ],
+    };
+
+    if ( req.body?.logTypeFilters?.length ) {
+      query.query.bool.must.push(
+          {
+            'terms': {
+              'logType.keyword': req.body.logTypeFilters,
+            },
+          },
+      );
+    }
+
+    if ( req.body?.startDate || req.body?.endDate ) {
+      query.query.bool.must.push( {
+        'range': {
+          'date': {
+            'gte': req.body?.startDate ? req.body.startDate : '',
+            'lte': req.body?.endDate ? req.body.endDate : '',
+          },
+        },
+      } );
+    }
+
+    query.query.bool.must.push(
+        {
+          'terms': {
+            'showTo.keyword': [ req.user.userType ],
+          },
+        },
+    );
+
+    const logs = await getOpenSearchData( openSearch.activityLog, query );
+
+    const hits = logs?.body?.hits?.hits;
+    const totalDocuments = logs?.body?.hits?.total?.value;
+
+    let temp = [];
+    if ( totalDocuments ) {
+      hits.map( ( hit, i ) => {
+        let respo ={};
+        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?.oldData;
+          const current=hit?._source?.newData;
+          respo = findDifferences( previous, current );
+          hit._source.updatedValue = respo;
+          temp.push( hit?._source );
+          // hit._source.changes =logSubType === 'ticketConfig'? Object.keys( respo ).map( ( item ) => item ) : hit._source.changes;
+        } else {
+          temp.push( hit?._source );
+        }
+      },
+      );
+      res.sendSuccess( { data: temp, count: totalDocuments } );
+    } else {
+      res.sendError( 'No data found', 204 );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, message: req.body, function: 'getActivityLogs' } );
+    return res.sendError( 'Internal Server Error', 500 );
+  }
+}
+
+function findDifferences( obj1, obj2 ) {
+  let differences = {};
+
+  for ( let key in obj1 ) {
+    if ( obj1[key] !== obj2[key] ) {
+      differences[splitCamelCase( key )] = { oldValue: obj1[key], newValue: obj2[key] };
+    }
+  }
+
+  return differences;
+}
+
+function splitCamelCase( text ) {
+  return text.replace( /([a-z])([A-Z])/g, '$1 $2' );
+}
+
 async function postApi( url, data ) {
   const requestOptions = {
     method: 'POST',
@@ -2327,7 +2514,7 @@ export async function clientCsmAssignAction( req, res ) {
 
 function compareArrayObjects( prevArray, currArray ) {
   let changes = {};
-  logger.info( { prevArray: prevArray, currArray: currArray } );
+  // logger.info( { prevArray: prevArray, currArray: currArray } );
   // Find the longest array length to avoid index mismatch
   let maxLength = Math.max( prevArray.length, currArray.length );
 

package/src/docs/client.docs.js

@@ -400,20 +400,12 @@ export const clientDocs = {
     },
   },
 
-  '/v3/client/activity-log/{id}': {
+  '/v3/client/activity-log': {
     post: {
       tags: [ 'Client' ],
       description: 'Activity log',
       operationId: 'activity-log',
-      parameters: [ {
-        in: 'path',
-        name: 'id',
-        required: true,
-        description: 'The ID of the client.',
-        schema: {
-          type: 'string',
-        },
-      } ],
+      parameters: [],
       requestBody: {
         content: {
           'application/json': {