tango-app-api-client 3.3.3-beta.6 → 3.3.3-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.3.3-beta.6",
+    "version": "3.3.3-beta.8",
     "description": "client",
     "main": "index.js",
     "type": "module",
@@ -27,7 +27,7 @@
         "nodemon": "^3.0.3",
         "npm": "^10.9.1",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.2.38",
+        "tango-api-schema": "^2.2.42",
         "tango-app-api-middleware": "3.1.43-alpha.10",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/client.controllers.js

@@ -396,7 +396,7 @@ export async function changeStatus( req, res, next ) {
 
 export async function getClients( req, res ) {
   try {
-    const field = { clientName: 1, clientId: 1, traxDateRange: '$featureConfigs.traxDateRange' };
+    const field = { clientName: 1, clientId: 1, traxDateRange: '$featureConfigs.traxDateRange', trafficDateRange: '$featureConfigs.trafficDateRange' };
     let result = [];
     if ( req?.user?.role === 'superadmin' ) {
       result = await findClient( {}, field );
@@ -2015,7 +2015,7 @@ export async function getActivityLogs( req, res ) {
     const query = {
       '_source': [
         'userId', 'userName', 'email', 'date', 'logType', 'logSubType',
-        'changes', 'eventType',
+        'changes', 'eventType', 'previous', 'current',
       ],
       'query': {
         'bool': {
@@ -2072,9 +2072,36 @@ export async function getActivityLogs( req, res ) {
 
     const hits = logs?.body?.hits?.hits;
     const totalDocuments = logs?.body?.hits?.total?.value;
+    let temp = [];
     if ( totalDocuments ) {
-      const dataArray = hits.map( ( hit ) => hit._source );
-      res.sendSuccess( { data: dataArray, count: totalDocuments } );
+      hits.map( ( hit, i ) => {
+        temp.push( hit?._source );
+        if ( ( ( hit?._source?.eventType ).match( /update/ ) || ( hit?._source?.eventType ).match( /edit/ ) )&& hit?._source?.previous ) {
+          const previous = removeIndexedKeysAndFlatten( hit?._source?.previous );
+          const current=removeIndexedKeysAndFlatten( hit?._source?.current );
+          delete previous?._id;
+          delete current?._id;
+          delete previous?.updatedAt;
+          delete current?.updatedAt;
+          delete current?.createdAt;
+
+          logger.info( { previous2: hit?._source?.previous, previous: previous, current: hit?._source?.current, current: current } );
+          const diff = Object.entries( current )
+              .reduce( ( acc, [ key, value ] ) => {
+                if ( value !== previous[key] & typeof previous[key] === 'string' ) {
+                  acc[key] = { previous: previous[key], current: value };
+                }
+
+                return acc;
+              }, {} );
+          logger.info( { diff: diff } );
+          temp[i].updatedValue = diff;
+        } else {
+          temp.push( hit?._source );
+        }
+      },
+      );
+      res.sendSuccess( { data: temp, count: totalDocuments } );
     } else {
       res.sendError( 'No data found', 204 );
     }
@@ -2083,6 +2110,24 @@ export async function getActivityLogs( req, res ) {
     return res.sendError( 'Internal Server Error', 500 );
   }
 }
+function removeIndexedKeysAndFlatten( obj ) {
+  const result = {};
+
+  for ( const [ key, value ] of Object.entries( obj ) ) {
+    // Skip numeric keys and preserve arrays intact
+    if ( /^\d+$/.test( key ) ) continue;
+
+    if ( Array.isArray( value ) ) {
+      result[key] = value;
+    } else if ( typeof value === 'object' && value !== null ) {
+      Object.assign( result, removeIndexedKeysAndFlatten( value ) );
+    } else {
+      result[key] = value;
+    }
+  }
+
+  return result;
+}
 
 
 async function postApi( url, data ) {