tango-app-api-client 3.4.3-beta.4 → 3.6.0

package/src/controllers/client.controllers.js

@@ -1,5 +1,5 @@
 import { billingDetailsUpdate, brandInfoUpdate, domainDetailsConfigurationUpdate, featureConfigurationUpdate, getClientData, signatoryDetailsUpdate, ticketConfigurationUpdate, documentsUpdate, getUserData, CsmUsersGet, OpsUsersGet, userConfigurationUpdate, findClient, aggregateClient, createAuditQueue, findOne, insert, update, findOneClient, updateOneClient } from '../service/client.service.js';
-import { checkFileExist, fileUpload, signedUrl, chunkArray, download, logger, getOpenSearchData, insertOpenSearchData, sendEmailWithSES, createCustomer, createVirtualAccount } from 'tango-app-api-middleware';
+import { checkFileExist, signedUrl, chunkArray, download, logger, getOpenSearchData, insertOpenSearchData, sendEmailWithSES, createCustomer, createVirtualAccount, getUuid, fileRestrictedUpload, getXsscheck } from 'tango-app-api-middleware';
 import { countDocumentsUser, findOneAndUpdateUser, findOneUser, getUserNameEmailById, updateManyUser } from '../service/user.service.js';
 import { aggregateStore, countDocumentsStore, findStore, updateManyStore } from '../service/store.service.js';
 import { aggregateCamera, countDocumentsCamera } from '../service/camera.service.js';
@@ -10,16 +10,18 @@ import { aggregateTickets } from '../service/tangoticket.service.js';
 import { join } from 'path';
 import { readFileSync } from 'fs';
 import handlebars from 'handlebars';
-import { countDocumentsGroup, createGroupModel, findOneGroup } from '../service/group.service.js';
+import { countDocumentsGroup, createGroupModel } from '../service/group.service.js';
 // import { deleteOneAuthentication } from '../service/authentication.service.js';
 import { createBilling } from '../service/billing.service.js';
 import { createPaymentAccount } from '../service/paymentAccount.service.js';
 import { countDocumentsClusters, createclusterModel } from '../service/cluster.service.js';
 import { countDocumentsTeams } from '../service/teams.service.js';
+import { createauditConfig, updateauditConfig, aggregateAuditconfig } from '../service/auditConfig.service.js';
+import { findOnerevopConfig, createrevopConfig, updaterevopConfig } from '../service/revopConfig.service.js';
 
 export async function create( req, res ) {
   try {
-    const url = JSON.parse( process.env.URL );
+    // const url = JSON.parse( process.env.URL );
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
     const countQuery = [
@@ -37,7 +39,6 @@ export async function create( req, res ) {
     ];
     const ID = await aggregateClient( countQuery );
     const count = ID[0]?.tangoId || 0;
-    logger.info( { count: count } );
     const query = { clientName: inputData.clientName };
     const leadRecord = await findOne( query );
     const tangoId = count + 1;
@@ -71,14 +72,19 @@ export async function create( req, res ) {
       'planDetails.product': product,
       'profileDetails.website': leadRecord?.websiteUrl,
       'reportConfigs.reportName': generatedName,
-      'auditConfigs.queueName': generatedName,
       'auditConfigs.zoneQueueName': `${generatedName}-zone`,
       'auditConfigs.trafficQueueName': `${generatedName}-traffic`,
+      'auditConfigs.trackQueueName': `${generatedName}-track`,
       'auditConfigs.traxQueueName.unattendedCustomer': `${generatedName}-unattendedCustomer`,
       'auditConfigs.traxQueueName.leftInMiddle': `${generatedName}-leftInMiddle`,
       'auditConfigs.traxQueueName.uniformDetection': `${generatedName}-uniformDetection`,
       'auditConfigs.traxQueueName.mobileDetection': `${generatedName}-mobileDetection`,
       'auditConfigs.traxQueueName.cameraAngleChange': `${generatedName}-cameraAngleChange`,
+      'auditConfigs.traxQueueName.hygiene': `${generatedName}-hygiene`,
+      'clientApi.apiKey': await getUuid(),
+      'clientApi.status': true,
+      'clientApi.allowedIps': [ '*' ],
+
     };
 
     record.featureConfigs = {};
@@ -94,7 +100,7 @@ export async function create( req, res ) {
           record.featureConfigs.isNewZone = true;
         }
         if ( data.productName === 'tangoTrax' ) {
-          record.featureConfigs. isTrax= true;
+          record.featureConfigs.isTrax = true;
         }
       }
     }
@@ -140,7 +146,23 @@ export async function create( req, res ) {
       'isDefaults': true,
     };
 
-    await createclusterModel( defaultcluster );
+    const cluster = await createclusterModel( defaultcluster );
+
+    const logClusterObj = {
+      clientId: insertedClientRecord.clientId,
+      userName: req.user?.userName,
+      userId: req?.user?._id,
+      email: req.user?.email,
+      clusterId: cluster._id,
+      date: new Date(),
+      logType: 'cluster',
+      logSubType: 'clusterCreated',
+      changes: [ 'All stores' ],
+      eventType: 'create',
+      showTo: [ 'client', 'tango' ],
+    };
+
+    await insertOpenSearchData( openSearch.activityLog, logClusterObj );
 
 
     const defaultGroup = {
@@ -160,128 +182,122 @@ export async function create( req, res ) {
 
     await createBilling( primaryBillingGroup );
 
-    const createdGroup = await findOneGroup( { clientId: insertedClientRecord.clientId, isDefault: true }, {} );
-
-    let oldGroup = {
-      '_id': createdGroup._id,
-      'client_id': createdGroup.clientId,
-      'groupName': createdGroup.groupName,
-      'description': createdGroup.description,
-      'storeList': createdGroup.storeList,
-    };
-
-
-    await postApi( `${url.oldapidomain}/oldGroupAdd`, [ oldGroup ] );
-
     // For old dashboard insert
+    // const createdGroup = await findOneGroup( { clientId: insertedClientRecord.clientId, isDefault: true }, {} );
+    // let oldGroup = {
+    //   '_id': createdGroup._id,
+    //   'client_id': createdGroup.clientId,
+    //   'groupName': createdGroup.groupName,
+    //   'description': createdGroup.description,
+    //   'storeList': createdGroup.storeList,
+    // };
+    // await postApi( `${url.oldapidomain}/oldGroupAdd`, [ oldGroup ] );
+
+    // const oldBrandInsertData = {
+    //   '_id': insertedClientRecord._id,
+    //   'brandName': insertedClientRecord.clientName,
+    //   'brandIndex': insertedClientRecord.tangoId,
+    //   'client_id': insertedClientRecord.clientId,
+    //   'phone': user.mobileNumber,
+    //   'email': user.email,
+    //   'dialCode': user.countryCode,
+    //   'name': user.userName,
+    //   'cameraCount': insertedClientRecord.planDetails.totalCamera,
+    //   'apiKey': insertedClientRecord.clientApi.apiKey,
+    //   'clientStatus': insertedClientRecord.status,
+    //   'client_type': insertedClientRecord.planDetails.paymentStatus,
+    //   'activeMenu': [
+    //     'reports',
+    //     'birdsEye',
+    //     'tangoZone',
+    //     'tangoTraffic',
+    //     'support',
+    //   ],
+    //   'planType': insertedClientRecord.planDetails.subscriptionPeriod,
+    //   'storeCount': insertedClientRecord.planDetails.totalStores,
+    //   'squareFeet': insertedClientRecord.planDetails.storeSize,
+    //   'subscription': insertedClientRecord.planDetails.subscriptionType,
+    //   'subscription_status': true,
+    //   'subscribed_features': {
+    //     'tango_traffic': false,
+    //     'tango_zone': false,
+    //     'tango_revop': false,
+    //     'tango_storeops': false,
+    //     'controlroom': false,
+    //     'live_data': false,
+    //     'normalization_features': false,
+    //     'actual_features': false,
+    //   },
+    //   'store_added_status': true,
+    //   'terms_conditions': true,
+    //   'otp_verified': true,
+    //   'price': 6510,
+    //   'currency_type': 'rupees',
+    //   'domains': [],
+    //   'store_radius_config': 500,
+    // };
+
+    // insertedClientRecord.planDetails.product.forEach( ( element ) => {
+    //   if ( element.productName === 'tangoTraffic' ) {
+    //     oldBrandInsertData.subscribed_features.tango_traffic = true;
+    //   }
+    //   if ( element.productName === 'tangoZone' ) {
+    //     oldBrandInsertData.subscribed_features.tango_zone = true;
+    //   }
+    //   if ( element.productName === 'prioritySupport' ) {
+    //     oldBrandInsertData.subscribed_features.tango_storeops = true;
+    //   }
+    // } );
+
+    // switch ( insertedClientRecord.status ) {
+    //   case 'active':
+    //     oldBrandInsertData.clientStatus = 'live';
+    //     break;
+    //   case 'hold':
+    //     oldBrandInsertData.clientStatus = 'hold';
+    //     break;
+    //   case 'suspended':
+    //     oldBrandInsertData.clientStatus = 'suspended';
+    //     break;
+    //   case 'deactive':
+    //     oldBrandInsertData.clientStatus = 'deactivated';
+    //     break;
+    //   default:
+    //     oldBrandInsertData.clientStatus = 'live';
+    // }
+
+    // switch ( insertedClientRecord.planDetails.paymentStatus ) {
+    //   case 'free':
+    //     oldBrandInsertData.client_type = 'free';
+    //     break;
+    //   case 'trial':
+    //     oldBrandInsertData.client_type = 'trial';
+    //     break;
+    //   case 'paid':
+    //     oldBrandInsertData.client_type = 'paid';
+    //     break;
+    //   default:
+    //     oldBrandInsertData.client_type = 'trial';
+    // }
+    // await postApi( `${url.oldapidomain}/oldBrandAdd`, oldBrandInsertData );
+
+    // const oldDefaultRolesInsertData = {
+    //   '_id': user._id,
+    //   'client_id': insertedClientRecord.clientId,
+    //   'brandId': insertedClientRecord._id,
+    //   'name': user.userName,
+    //   'email': user.email,
+    //   'phone': user.mobileNumber,
+    //   'password': user.password,
+    //   'role': 'storesuperadmin',
+    // };
+    // await postApi( `${url.oldapidomain}/oldDefaultRoleInsert`, oldDefaultRolesInsertData );
 
 
-    const oldBrandInsertData = {
-      '_id': insertedClientRecord._id,
-      'brandName': insertedClientRecord.clientName,
-      'brandIndex': insertedClientRecord.tangoId,
-      'client_id': insertedClientRecord.clientId,
-      'phone': user.mobileNumber,
-      'email': user.email,
-      'dialCode': user.countryCode,
-      'name': user.userName,
-      'cameraCount': insertedClientRecord.planDetails.totalCamera,
-      'apiKey': insertedClientRecord.clientApi.apiKey,
-      'clientStatus': insertedClientRecord.status,
-      'client_type': insertedClientRecord.planDetails.paymentStatus,
-      'activeMenu': [
-        'reports',
-        'birdsEye',
-        'tangoZone',
-        'tangoTraffic',
-        'support',
-      ],
-      'planType': insertedClientRecord.planDetails.subscriptionPeriod,
-      'storeCount': insertedClientRecord.planDetails.totalStores,
-      'squareFeet': insertedClientRecord.planDetails.storeSize,
-      'subscription': insertedClientRecord.planDetails.subscriptionType,
-      'subscription_status': true,
-      'subscribed_features': {
-        'tango_traffic': false,
-        'tango_zone': false,
-        'tango_revop': false,
-        'tango_storeops': false,
-        'controlroom': false,
-        'live_data': false,
-        'normalization_features': false,
-        'actual_features': false,
-      },
-      'store_added_status': true,
-      'terms_conditions': true,
-      'otp_verified': true,
-      'price': 6510,
-      'currency_type': 'rupees',
-      'domains': [],
-      'store_radius_config': 500,
-    };
-
-    insertedClientRecord.planDetails.product.forEach( ( element ) => {
-      if ( element.productName === 'tangoTraffic' ) {
-        oldBrandInsertData.subscribed_features.tango_traffic = true;
-      }
-      if ( element.productName === 'tangoZone' ) {
-        oldBrandInsertData.subscribed_features.tango_zone = true;
-      }
-      if ( element.productName === 'prioritySupport' ) {
-        oldBrandInsertData.subscribed_features.tango_storeops = true;
-      }
-    } );
-
-    switch ( insertedClientRecord.status ) {
-      case 'active':
-        oldBrandInsertData.clientStatus = 'live';
-        break;
-      case 'hold':
-        oldBrandInsertData.clientStatus = 'hold';
-        break;
-      case 'suspended':
-        oldBrandInsertData.clientStatus = 'suspended';
-        break;
-      case 'deactive':
-        oldBrandInsertData.clientStatus = 'deactivated';
-        break;
-      default:
-        oldBrandInsertData.clientStatus = 'live';
-    }
-
-    switch ( insertedClientRecord.planDetails.paymentStatus ) {
-      case 'free':
-        oldBrandInsertData.client_type = 'free';
-        break;
-      case 'trial':
-        oldBrandInsertData.client_type = 'trial';
-        break;
-      case 'paid':
-        oldBrandInsertData.client_type = 'paid';
-        break;
-      default:
-        oldBrandInsertData.client_type = 'trial';
-    }
-
-
-    const oldDefaultRolesInsertData = {
-      '_id': user._id,
-      'client_id': insertedClientRecord.clientId,
-      'brandId': insertedClientRecord._id,
-      'name': user.userName,
-      'email': user.email,
-      'phone': user.mobileNumber,
-      'password': user.password,
-      'role': 'storesuperadmin',
-    };
-
-    await postApi( `${url.oldapidomain}/oldBrandAdd`, oldBrandInsertData );
-
-    await postApi( `${url.oldapidomain}/oldDefaultRoleInsert`, oldDefaultRolesInsertData );
-
     const logObj = {
       clientId: insertedClientRecord.clientId,
       userName: req.user?.userName,
+      userId: req?.user?._id,
       email: req.user?.email,
       date: new Date(),
       logType: 'brandDetails',
@@ -330,15 +346,15 @@ export async function create( req, res ) {
       // await deleteOneAuthentication( { user: user?._id, type: 'retail' } );
       await findOneAndUpdateUser( userQuery, userRecord );
       await Promise.all( [
-        createAuditQueue( generatedName ),
         createAuditQueue( `${generatedName}-zone` ),
         createAuditQueue( `${generatedName}-traffic` ),
+        createAuditQueue( `${generatedName}-track` ),
         createAuditQueue( `${generatedName}-unattendedCustomer` ),
         createAuditQueue( `${generatedName}-leftInMiddle` ),
         createAuditQueue( `${generatedName}-uniformDetection` ),
         createAuditQueue( `${generatedName}-mobileDetection` ),
         createAuditQueue( `${generatedName}-cameraAngleChange` ),
-      ] );
+        createAuditQueue( `${generatedName}-hygiene` ) ] );
       return res.sendSuccess( { result: { clientId: String( tangoId ) } } );
     }
   } catch ( error ) {
@@ -395,7 +411,7 @@ export async function changeStatus( req, res, next ) {
 
 export async function getClients( req, res ) {
   try {
-    const field = { clientName: 1, clientId: 1 };
+    const field = { clientName: 1, clientId: 1, traxDateRange: '$featureConfigs.traxDateRange', trafficDateRange: '$featureConfigs.trafficDateRange' };
     let result = [];
     if ( req?.user?.role === 'superadmin' ) {
       result = await findClient( {}, field );
@@ -405,18 +421,6 @@ export async function getClients( req, res ) {
           $match: {
             userEmail: req?.user?.email,
             assignedType: { $eq: 'client' },
-            // $expr: {
-            //   $cond: {
-            //     if: {
-            //       $and: [
-            //         { $eq: [ '$userType', 'tango' ] },
-            //         { $eq: [ '$tangoUserType', 'csm' ] },
-            //       ],
-            //     },
-            //     then: { $eq: [ '$isClientApproved', true ] },
-            //     else: true,
-            //   },
-            // },
           },
         },
         {
@@ -450,9 +454,9 @@ export async function getClients( req, res ) {
         },
         {
           $project: {
-            _id: 0,
             clientId: 1,
             clientName: 1,
+            traxDateRange: '$featureConfigs.traxDateRange',
           },
         },
       ];
@@ -471,6 +475,7 @@ export async function getClients( req, res ) {
 export async function clientDetails( req, res ) {
   try {
     const bucket = JSON.parse( process.env.BUCKET );
+    const url=JSON.parse( process.env.URL );
     const client = await getClientData( { id: req.params.id } );
     if ( client ) {
       const isLogoExist = await checkFileExist( { Bucket: bucket.assets, Key: `${client.clientId}/logo/${client.profileDetails?.logo}` } );
@@ -483,49 +488,48 @@ export async function clientDetails( req, res ) {
 
 
       if ( isLogoExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: bucket.assets, file_path: `${client.clientId}/logo/${client.profileDetails?.logo}` } );
+        const signedFilUrl = `${url.assests}/${client.clientId}/logo/${client.profileDetails?.logo}`; // await signedUrl( { Bucket: bucket.assets, file_path: `${client.clientId}/logo/${client.profileDetails?.logo}` } );
         client.profileDetails.logo = signedFilUrl;
       } else {
         client.profileDetails.logo = '';
       }
 
       if ( isGstCertificateExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: bucket.assets, file_path: `${client.clientId}/documents/${client.document?.gst?.path}` } );
+        const signedFilUrl = `${url.assests}/${client.clientId}/documents/${client.document?.gst?.path}`;// await signedUrl( { Bucket: bucket.assets, file_path: `${client.clientId}/documents/${client.document?.gst?.path}` } );
         client.document.gst.path = signedFilUrl;
       } else {
         client.document.gst.path = '';
       }
 
       if ( isAddressCertificateExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: bucket.assets, file_path: `${client.clientId}/documents/${client.document?.addressProof?.path}` } );
+        const signedFilUrl = `${url.assests}/${client.clientId}/documents/${client.document?.addressProof?.path}`;// await signedUrl( { Bucket: bucket.assets, file_path: `${client.clientId}/documents/${client.document?.addressProof?.path}` } );
         client.document.addressProof.path = signedFilUrl;
       } else {
         client.document.addressProof.path = '';
       }
-
       if ( isPanCertificateExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: bucket.assets, file_path: `${client.clientId}/documents/${client.document?.pan?.path}` } );
+        const signedFilUrl =`${url.assests}/${client.clientId}/documents/${client.document?.pan?.path}`;// await signedUrl( { Bucket: bucket.assets, file_path: `${client.clientId}/documents/${client.document?.pan?.path}` } );
         client.document.pan.path = signedFilUrl;
       } else {
         client.document.pan.path = '';
       }
 
       if ( isCinCertificateExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: bucket.assets, file_path: `${client.clientId}/documents/${client.document?.cin?.path}` } );
+        const signedFilUrl =`${url.assests}/${client.clientId}/documents/${client.document?.cin?.path}`;// await signedUrl( { Bucket: bucket.assets, file_path: `${client.clientId}/documents/${client.document?.cin?.path}` } );
         client.document.cin.path = signedFilUrl;
       } else {
         client.document.cin.path = '';
       }
 
       if ( isContractCertificateExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: bucket.assets, file_path: `documents/contract.pdf` } );
+        const signedFilUrl =`${url.assests}/documents/contract.pdf`;// await signedUrl( { Bucket: bucket.assets, file_path: `documents/contract.pdf` } );
         client._doc.document.contract = signedFilUrl;
       } else {
         client._doc.document.contract = '';
       }
 
       if ( isTermsAndConditionsExist ) {
-        const signedFilUrl = await signedUrl( { Bucket: bucket.assets, file_path: `documents/terms&conditions.pdf` } );
+        const signedFilUrl =`${url.assests}/documents/terms&conditions.pdf`;// await signedUrl( { Bucket: bucket.assets, file_path: `documents/terms&conditions.pdf` } );
         client._doc.document.termsAndconditions = signedFilUrl;
       } else {
         client._doc.document.termsAndconditions = '';
@@ -672,7 +676,7 @@ export async function detailedAllClientCount( req, res ) {
     if ( result.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
-    result[0].activeStoresCount = activeStores.length>0?Math.abs( activeStores.length - yettoInstallCount.length ):0;
+    result[0].activeStoresCount = activeStores.length > 0 ? Math.abs( activeStores.length - yettoInstallCount.length ) : 0;
     result[0].activeCameraCount = activeCameras;
     return res.sendSuccess( { result: result } );
   } catch ( error ) {
@@ -691,9 +695,8 @@ export async function updateBrandInfo( req, res ) {
   try {
     const bucket = JSON.parse( process.env.BUCKET );
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    const url = JSON.parse( process.env.URL );
+    // const url = JSON.parse( process.env.URL );
     let updateKeys = [];
-
     if ( req.files?.logo ) {
       const uploadDataParams = {
         Bucket: bucket.assets,
@@ -702,8 +705,12 @@ export async function updateBrandInfo( req, res ) {
         ContentType: req.files.logo.mimetype,
         body: req.files.logo.data,
       };
-      updateKeys.push( 'Logo' );
-      await fileUpload( uploadDataParams );
+      updateKeys.push( 'Brand Logo' );
+      let uploadStatus= await fileRestrictedUpload( uploadDataParams );
+
+      if ( uploadStatus==false ) {
+        return res.sendError( 'Unsupported Media Type', 415 );
+      }
     }
 
     if ( Object.keys( req.body ).length > 0 ) {
@@ -712,32 +719,93 @@ export async function updateBrandInfo( req, res ) {
       } );
     }
 
-    const user = await getUserNameEmailById( req.userId );
+    // Get updated client information before the update operation (fetch selected fields only)
+    const getPreCientInfo = await findOneClient(
+        { clientId: req.params.id }, // Filter by clientId
+        {
+          '_id': 0,
+          'profileDetails.registeredCompanyName': 1,
+          'profileDetails.industry': 1,
+          'profileDetails.clientType': 1,
+          'profileDetails.registeredAddress': 1,
+          'profileDetails.headQuarters': 1,
+          'profileDetails.website': 1,
+          'status': 1,
+          'averageTransactionValue': 1,
+        },
+    );
+
 
+    const updateAck = await brandInfoUpdate( {
+      clientId: req.params?.id, registeredCompanyName: req.body?.registeredCompanyName, industry: req.body?.industry,
+      clientType: req.body?.clientType, registeredAddress: req.body?.registeredAddress, headQuarters: req.body?.headQuarters,
+      website: req.body?.website, status: req.body?.status, logo: req.files?.logo ? `brandLogo.${req.files.logo.name.split( '.' )[1]}` : undefined, averageTransactionValue: req.body?.averageTransactionValue,
+    } );
+
+    // Get updated client information after the update operation (fetch selected fields only)
+    const getPosCientInfo = await findOneClient(
+        { clientId: req.params.id }, // Filter by clientId
+        {
+          '_id': 0,
+          'profileDetails.registeredCompanyName': 1,
+          'profileDetails.industry': 1,
+          'profileDetails.clientType': 1,
+          'profileDetails.registeredAddress': 1,
+          'profileDetails.headQuarters': 1,
+          'profileDetails.website': 1,
+          'status': 1,
+          'averageTransactionValue': 1,
+        },
+    );
+    // Map and rename keys from previous client info for UI display and logging
+    const oldData = {
+      RegisteredCompanyName: getPreCientInfo?.profileDetails?.registeredCompanyName,
+      IndustryType: getPreCientInfo?.profileDetails?.industry,
+      FirmType: getPreCientInfo?.profileDetails?.clientType,
+      RegisteredAddress: getPreCientInfo?.profileDetails?.registeredAddress,
+      HeadQuarters: getPreCientInfo?.profileDetails?.headQuarters,
+      CompanyWebsite: getPreCientInfo?.profileDetails?.website,
+      ProcessingStatus: getPreCientInfo?.status,
+      AverageTransactionValue: getPreCientInfo?.averageTransactionValue,
+    };
+
+    // Map and rename keys from current client info for UI display and logging
+    const newData = {
+      RegisteredCompanyName: getPosCientInfo?.profileDetails?.registeredCompanyName,
+      IndustryType: getPosCientInfo?.profileDetails?.industry,
+      FirmType: getPosCientInfo?.profileDetails?.clientType,
+      RegisteredAddress: getPosCientInfo?.profileDetails?.registeredAddress,
+      HeadQuarters: getPosCientInfo?.profileDetails?.headQuarters,
+      CompanyWebsite: getPosCientInfo?.profileDetails?.website,
+      ProcessingStatus: getPosCientInfo?.status,
+      AverageTransactionValue: getPosCientInfo?.averageTransactionValue,
+
+    };
 
+    // Prepare activity log object with all relevant details for OpenSearch logging
     const logObj = {
-      clientId: req.params?.id,
-      userName: user?.userName,
-      email: user?.email,
-      date: new Date(),
-      logType: 'brandDetails',
-      logSubType: 'brandInfo',
-      changes: updateKeys,
-      eventType: 'update',
-      showTo: [ 'client', 'tango' ],
+      clientId: req.params?.id, // ID of the client whose data was updated
+      userName: req?.user?.userName, // Name of the user performing the update
+      email: req?.user?.email, // Email of the user performing the update
+      date: new Date(), // Timestamp of the update event
+      logType: 'brandDetails', // Type of log (e.g., related to brand details)
+      logSubType: 'brandInfo', // Subtype for more specific categorization
+      changes: updateKeys, // List of fields that were updated.these will shown in the UI as part of activity log
+      eventType: 'update', // Type of event (update operation)
+      showTo: [ 'client', 'tango' ], // Visibility of the log (who can see this log)
+      previous: getPreCientInfo, // Previous (old) client information before update based on DB keys (for internal reference and comparison).
+      current: getPosCientInfo, // 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).
     };
+    logger.info( { logObj: logObj, updateKeys: updateKeys, length: updateKeys?.length } );
 
+    // Insert activity log into OpenSearch if there are fields that were updated
     if ( updateKeys.length ) {
-      await insertOpenSearchData( openSearch.activityLog, logObj );
+      await insertOpenSearchData( openSearch.activityLog, logObj ); // Insert activity log
     }
 
 
-    const updateAck = await brandInfoUpdate( {
-      clientId: req.params?.id, registeredCompanyName: req.body?.registeredCompanyName, industry: req.body?.industry,
-      clientType: req.body?.clientType, registeredAddress: req.body?.registeredAddress, headQuarters: req.body?.headQuarters,
-      website: req.body?.website, status: req.body?.status, logo: req.files?.logo ? `brandLogo.${req.files.logo.name.split( '.' )[1]}` : undefined, averageTransactionValue: req.body?.averageTransactionValue,
-    } );
-
     if ( req.body?.status === 'active' ) {
       await updateManyStore( { clientId: req.params?.id }, { status: 'active' } );
       await updateManyUser( { clientId: req.params?.id }, { isActive: true } );
@@ -754,33 +822,30 @@ export async function updateBrandInfo( req, res ) {
 
     if ( req.body?.status === 'deactive' ) {
       await updateManyStore( { clientId: req.params?.id }, { status: 'deactive' } );
-      // await updateManyCamera( { clientId: req.params?.id }, { isUp: false, isActivated: false } );
       await updateManyUser( { clientId: req.params?.id }, { isActive: false } );
     }
 
-    const { data } = await getApi( `${url.oldapidomain}/oldBrandGet/${req.params?.id}` );
-
-    switch ( req.body?.status ) {
-      case 'active':
-        data.clientStatus = 'live';
-        break;
-      case 'hold':
-        data.clientStatus = 'hold';
-        break;
-      case 'suspended':
-        data.clientStatus = 'suspended';
-        break;
-      case 'deactive':
-        data.clientStatus = 'deactivated';
-        break;
-      default:
-        data.clientStatus = 'live';
-    }
-
-    await postApi( `${url.oldapidomain}/oldBrandUpdate/${data?._id}`, { clientStatus: data.clientStatus } );
+    // const { data } = await getApi( `${url.oldapidomain}/oldBrandGet/${req.params?.id}` );
+    // switch ( req.body?.status ) {
+    //   case 'active':
+    //     data.clientStatus = 'live';
+    //     break;
+    //   case 'hold':
+    //     data.clientStatus = 'hold';
+    //     break;
+    //   case 'suspended':
+    //     data.clientStatus = 'suspended';
+    //     break;
+    //   case 'deactive':
+    //     data.clientStatus = 'deactivated';
+    //     break;
+    //   default:
+    //     data.clientStatus = 'live';
+    // }
+    // await postApi( `${url.oldapidomain}/oldBrandUpdate/${data?._id}`, { clientStatus: data.clientStatus } );
 
     if ( updateAck ) {
-      res.sendSuccess( { result: 'Updated Successfully' } );
+      return res.sendSuccess( { result: 'Updated Successfully' } );
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.params, function: 'updateBrandInfo' } );
@@ -803,7 +868,11 @@ export async function updateBillingDetails( req, res ) {
         body: req.files.gstCertificate.data,
       };
       updateKeys.push( 'GST certificate' );
-      await fileUpload( uploadDataParams );
+      let uploadStatus= await fileRestrictedUpload( uploadDataParams );
+
+      if ( uploadStatus==false ) {
+        return res.sendError( 'Unsupported Media Type', 415 );
+      }
     }
 
     if ( Object.keys( req.body ).length > 0 ) {
@@ -889,6 +958,25 @@ export async function updateSignatoryDetails( req, res ) {
 export async function updateTicketConfiguration( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const fields = {
+      'ticketConfigs.downTimeType': 1,
+      'ticketConfigs.installationReAssign': 1,
+      'ticketConfigs.infraDownTime': 1,
+      'ticketConfigs.MinFilesCount': 1,
+      'ticketConfigs.rcaTicketAssign': 1,
+      'ticketConfigs.refreshAlert': 1,
+      'ticketConfigs.statusCheckAlert': 1,
+      'ticketConfigs.accuracyPercentage': 1,
+      'ticketConfigs.reTrain': 1,
+    };
+
+    // Get updated client ticket configuration before the update operation (fetch selected fields only)
+    let findClient = await findOneClient(
+        { clientId: req.params?.id }, // Filter by clientId
+        fields,
+    );
+
+    // update the requested values in Mongo DB
     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,
@@ -896,44 +984,85 @@ export async function updateTicketConfiguration( req, res ) {
       refreshAlert: req.body?.refreshAlert, sendToAdmin: req.body?.sendToAdmin, sendToUser: req.body?.sendToUser, statusCheckAlert: req.body?.statusCheckAlert,
     } );
 
-    let updateKeys = [];
+    let updateKeys = []; // List of updated field names in readable format
+
+    // Check if request body has any fields to update
     if ( Object.keys( req.body ).length > 0 ) {
       Object.keys( req.body ).forEach( ( element ) => {
-        updateKeys.push( camelCaseToWords( element ) );
+        updateKeys.push( camelCaseToWords( element ) ); // Convert camelCase field name to readable format and add to updateKeys
       } );
     }
 
-    const user = await getUserNameEmailById( req.userId );
 
+    // Get updated client ticket configuration after the update operation (fetch selected fields only)
+    let updatedClient = await findOneClient( { clientId: req.params?.id }, fields );
+
+    // Map and rename keys from previous client info for UI display and logging
+    const oldData = {
+      InfraDowntimeType: findClient?.ticketConfigs?.downTimeType == 0 ? 'Single Camera' : 'All Cameras',
+      AutoReAssignInstallation: findClient?.ticketConfigs?.installationReAssign,
+      InfraDowntime: findClient?.ticketConfigs?.infraDownTime,
+      InfraFiles: findClient?.ticketConfigs?.MinFilesCount,
+      RcaTicket: findClient?.ticketConfigs?.rcaTicketAssign,
+      RefreshTicketAlert: findClient?.ticketConfigs?.refreshAlert,
+      StatusCheckAlert: findClient?.ticketConfigs?.statusCheckAlert,
+      DataMismatchAccuracyPercentage: findClient?.ticketConfigs?.accuracyPercentage,
+      DataMismatchReTraining: findClient?.ticketConfigs?.reTrain,
+    };
+
+    // Map and rename keys from current client info for UI display and logging
+    const newData = {
+      InfraDowntimeType: updatedClient?.ticketConfigs?.downTimeType == 0 ? 'Single Camera' : 'All Cameras',
+      AutoReAssignInstallation: updatedClient?.ticketConfigs?.installationReAssign,
+      InfraDowntime: updatedClient?.ticketConfigs?.infraDownTime,
+      InfraFiles: updatedClient?.ticketConfigs?.MinFilesCount,
+      RcaTicket: updatedClient?.ticketConfigs?.rcaTicketAssign,
+      RefreshTicketAlert: updatedClient?.ticketConfigs?.refreshAlert,
+      StatusCheckAlert: updatedClient?.ticketConfigs?.statusCheckAlert,
+      DataMismatchAccuracyPercentage: updatedClient?.ticketConfigs?.accuracyPercentage,
+      DataMismatchReTraining: updatedClient?.ticketConfigs?.reTrain,
+
+    };
+
+    // Prepare activity log object with all relevant details for OpenSearch logging
     const logObj = {
-      clientId: req.params?.id,
-      userName: user.userName,
-      email: user.email,
-      date: new Date(),
-      logType: 'configuration',
-      logSubType: 'ticketConfig',
-      changes: updateKeys,
-      eventType: 'update',
-      showTo: [ 'tango' ],
+      clientId: req.params?.id, // ID of the client whose data was updated
+      userName: req?.user?.userName, // Name of the user performing the update
+      email: req?.user?.email, // Email of the user performing the update
+      date: new Date(), // Timestamp of the update event
+      logType: 'configuration', // Type of log (e.g., related to brand details)
+      logSubType: 'ticketConfig', // Subtype for more specific categorization
+      changes: updateKeys, // List of fields that were updated.these will shown in the UI as part of activity log
+      eventType: 'update', // Type of event (update operation)
+      showTo: [ 'tango' ], // Visibility of the log (who can see this log)
+      current: updatedClient.ticketConfigs, // Previous (old) client information before update based on DB keys (for internal reference and comparison).
+      previous: findClient.ticketConfigs, // 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).
     };
 
+    // Insert activity log into OpenSearch if there are fields that were updated
     if ( updateKeys.length ) {
-      await insertOpenSearchData( openSearch.activityLog, logObj );
+      await insertOpenSearchData( openSearch.activityLog, logObj ); // Insert activity log
     }
 
     if ( updateAck ) {
       res.sendSuccess( { result: 'Updated Successfully' } );
     }
   } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
     logger.error( { error: error, message: req.params, function: 'updateTicketConfiguration' } );
-    return res.sendError( 'Internal Server Error', 500 );
+    return res.sendError( err, 500 );
   }
 }
 
 export async function updateFeatureConfiguration( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    const url = JSON.parse( process.env.URL );
+    // const url = JSON.parse( process.env.URL );
+
+    // Get updated client Feature configuration before the update operation (fetch selected fields only)
+    const previousData = await findOneClient( { clientId: req.params?.id }, { featureConfigs: 1 } );
     const inputData = req.body;
     if ( inputData?.bouncedLimitValue ) {
       inputData.missedOpportunityFromValue = inputData?.bouncedLimitValue;
@@ -944,74 +1073,156 @@ export async function updateFeatureConfiguration( req, res ) {
     }
     const updateAck = await featureConfigurationUpdate( { clientId: req.params?.id }, inputData );
 
-    let updateKeys = [];
+    // Get updated client Feature configuration after the update operation (fetch selected fields only)
+    const postData = await findOneClient( { clientId: req.params?.id }, { featureConfigs: 1 } );
+    let updateKeys = []; // List of updated field names in readable format
 
+    // Check if request body has any fields to update
     if ( Object.keys( inputData ).length > 0 ) {
       Object.keys( inputData ).forEach( ( element ) => {
-        updateKeys.push( camelCaseToWords( element ) );
+        element === 'billableCalculation' ? 'potentialCalculation' : element; // Replace 'billableCalculation' with 'potentialCalculation' if present
+        updateKeys.push( camelCaseToWords( element ) ); // Convert camelCase field name to readable format and add to updateKeys
       } );
     }
 
     const user = req.user;
 
-    const { data } = await getApi( `${url.oldapidomain}/oldBrandGet/${req.params?.id}` );
-
-    if ( inputData?.open ) {
-      data.brandConfigs.storeOpenTime = inputData?.open;
-    }
-
-    if ( inputData?.close ) {
-      data.brandConfigs.storeCloseTime = inputData?.open;
-    }
-
-    if ( inputData?.missedOpportunityCalculation ) {
-      data.brandConfigs.missedOpportunityCalculate = inputData?.missedOpportunityCalculation;
-    }
-
-    if ( inputData?.conversionCalculation ) {
-      data.brandConfigs.conversionCalculate = inputData?.conversionCalculation;
-    }
-
-    if ( inputData?.billableCalculation ) {
-      data.brandConfigs.billableCalculate = inputData?.billableCalculation;
-    }
-
-    if ( inputData?.bouncedLimitCondition ) {
-      data.brandConfigs.bouncedConfigTime = data.brandConfigs.bouncedConfigTime.replace( /^.+(?=\d)/, inputData?.bouncedLimitCondition );
-      data.brandConfigs.missedOpportunityEndTime = data.brandConfigs.missedOpportunityEndTime.replace( /^.+(?=\d)/, inputData?.bouncedLimitCondition );
-    }
-
-    if ( inputData?.bouncedLimitValue ) {
-      data.brandConfigs.bouncedConfigTime = data.brandConfigs.bouncedConfigTime.replace( /\d+/, inputData?.bouncedLimitValue );
-      data.brandConfigs.missedOpportunityStartTime = data.brandConfigs.missedOpportunityStartTime.replace( /\d+/, inputData?.bouncedLimitValue );
-    }
-
-    if ( inputData?.conversionCondition ) {
-      data.brandConfigs.conversionConfigTime = data.brandConfigs.conversionConfigTime.replace( /^.+(?=\d)/, inputData?.conversionCondition );
-      data.brandConfigs.missedOpportunityStartTime = data.brandConfigs.missedOpportunityStartTime.replace( /^.+(?=\d)/, inputData?.conversionCondition );
-    }
-
-    if ( inputData?.conversionValue ) {
-      data.brandConfigs.conversionConfigTime = data.brandConfigs.conversionConfigTime.replace( /\d+/, inputData?.conversionValue );
-      data.brandConfigs.missedOpportunityEndTime = data.brandConfigs.missedOpportunityEndTime.replace( /\d+/, inputData?.conversionValue );
-    }
-
-    await postApi( `${url.oldapidomain}/oldBrandUpdate/${data?._id}`, { brandConfigs: data.brandConfigs } );
+    // const { data } = await getApi( `${url.oldapidomain}/oldBrandGet/${req.params?.id}` );
+    // if ( inputData?.open ) {
+    //   data.brandConfigs.storeOpenTime = inputData?.open;
+    // }
+    // if ( inputData?.close ) {
+    //   data.brandConfigs.storeCloseTime = inputData?.open;
+    // }
+    // if ( inputData?.missedOpportunityCalculation ) {
+    //   data.brandConfigs.missedOpportunityCalculate = inputData?.missedOpportunityCalculation;
+    // }
+    // if ( inputData?.conversionCalculation ) {
+    //   data.brandConfigs.conversionCalculate = inputData?.conversionCalculation;
+    // }
+    // if ( inputData?.billableCalculation ) {
+    //   data.brandConfigs.billableCalculate = inputData?.billableCalculation;
+    // }
+    // if ( inputData?.bouncedLimitCondition ) {
+    //   data.brandConfigs.bouncedConfigTime = data.brandConfigs.bouncedConfigTime.replace( /^.+(?=\d)/, inputData?.bouncedLimitCondition );
+    //   data.brandConfigs.missedOpportunityEndTime = data.brandConfigs.missedOpportunityEndTime.replace( /^.+(?=\d)/, inputData?.bouncedLimitCondition );
+    // }
+    // if ( inputData?.bouncedLimitValue ) {
+    //   data.brandConfigs.bouncedConfigTime = data.brandConfigs.bouncedConfigTime.replace( /\d+/, inputData?.bouncedLimitValue );
+    //   data.brandConfigs.missedOpportunityStartTime = data.brandConfigs.missedOpportunityStartTime.replace( /\d+/, inputData?.bouncedLimitValue );
+    // }
+    // if ( inputData?.conversionCondition ) {
+    //   data.brandConfigs.conversionConfigTime = data.brandConfigs.conversionConfigTime.replace( /^.+(?=\d)/, inputData?.conversionCondition );
+    //   data.brandConfigs.missedOpportunityStartTime = data.brandConfigs.missedOpportunityStartTime.replace( /^.+(?=\d)/, inputData?.conversionCondition );
+    // }
+    // if ( inputData?.conversionValue ) {
+    //   data.brandConfigs.conversionConfigTime = data.brandConfigs.conversionConfigTime.replace( /\d+/, inputData?.conversionValue );
+    //   data.brandConfigs.missedOpportunityEndTime = data.brandConfigs.missedOpportunityEndTime.replace( /\d+/, inputData?.conversionValue );
+    // }
+    // await postApi( `${url.oldapidomain}/oldBrandUpdate/${data?._id}`, { brandConfigs: data.brandConfigs } );
+
+    const keysArray = [
+      'isExcludedArea', 'isPasserByData', 'isNormalized', 'isbillingDisabled', 'isCameraDisabled', 'isFootfallDirectory', 'isNOB', 'isNewTraffic', 'isTrax', 'isNewZone', 'isNewReports', 'isNewDashboard', 'streamBy', 'isFootfallView', 'isAIManager', 'isAIManagerAccessControl', 'isCameraEdit' ];
+    // Map and rename keys from previous client info for UI display and logging
+    const oldData = {
+      StoreOpenTime: previousData?.featureConfigs?.open,
+      StoreCloseTime: previousData?.featureConfigs?.close,
+      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,
+      MissedOpportunityToCondition: previousData?.featureConfigs?.missedOpportunityTo?.condition,
+      MissedOpportunityFromValue: previousData?.featureConfigs?.missedOpportunityFrom?.value,
+      MissedOpportunityToValue: previousData?.featureConfigs?.missedOpportunityTo?.value,
+      BouncedLimitCondition: previousData?.featureConfigs?.bouncedLimit?.condition,
+      BouncedLimitValue: previousData?.featureConfigs?.bouncedLimit?.value,
+      InfraAlertValue: previousData?.featureConfigs?.infraAlert?.value,
+      InfraAlertCondition: previousData?.featureConfigs?.infraAlert?.condition,
+      ExcludedArea: previousData?.featureConfigs?.isExcludedArea == true ? 'Enabled' : 'Disabled',
+      PasserBydata: previousData?.featureConfigs?.isPasserByData == true ? 'Enabled' : 'Disabled',
+      NormalizedDataDuringDowntime: previousData?.featureConfigs?.isNormalized == true ? 'Enabled' : 'Disabled',
+      Billing: previousData?.featureConfigs?.isbillingDisabled == true ? 'Enabled' : 'Disabled',
+      CameraBlurring: previousData?.featureConfigs?.isCameraDisabled == true ? 'Enabled' : 'Disabled',
+      FootfallDirectory: previousData?.featureConfigs?.isFootfallDirectory == true ? 'Enabled' : 'Disabled',
+      NOBStatus: previousData?.featureConfigs?.isNOB == true ? 'Enabled' : 'Disabled',
+      EnableAnalyze: previousData?.featureConfigs?.isNewDashboard == true ? 'Enabled' : 'Disabled',
+      Traffic: previousData?.featureConfigs?.isNewTraffic == true ? 'Enabled' : 'Disabled',
+      Zone: previousData?.featureConfigs?.isNewZone == true ? 'Enabled' : 'Disabled',
+      Zonev2: previousData?.featureConfigs?.isNewZoneV2 == true ? 'Enabled' : 'Disabled',
+      Reports: previousData?.featureConfigs?.isNewReports == true ? 'Enabled' : 'Disabled',
+      Trax: previousData?.featureConfigs?.isTrax == true ? 'Enabled' : 'Disabled',
+      Revops: previousData?.featureConfigs?.isRevops == true ? 'Enabled' : 'Disabled',
+      StreamType: previousData?.featureConfigs?.streamBy == 'Edge' ? 'Edge App' : 'RTSP',
+      FootfallDirectoryOnlyAudit: previousData?.featureConfigs?.isFootfallDirectoryAudit == true ? 'Enabled' : 'Disabled',
+      FootfallDirectoryOnlyFew: previousData?.featureConfigs?.isFootfallDirectoryLimit == true ? 'Enabled' : 'Disabled',
+      FootfallView: previousData?.featureConfigs?.isFootfallView == true ? 'Enabled' : 'Disabled',
+      AIManager: previousData?.featureConfigs?.isAIManager == true ? 'Enabled' : 'Disabled',
+      AIManagerAccessControl: previousData?.featureConfigs?.isAIManagerAccessControl == true ? 'Enabled' : 'Disabled',
+      CameraEdit: previousData?.featureConfigs?.isCameraEdit == true ? 'Enabled' : 'Disabled',
+    };
 
+    // Map and rename keys from current client info for UI display and logging
+    const newData = {
+      StoreOpenTime: postData?.featureConfigs?.open,
+      StoreCloseTime: postData?.featureConfigs?.close,
+      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,
+      MissedOpportunityToCondition: postData?.featureConfigs?.missedOpportunityTo?.condition,
+      MissedOpportunityFromValue: postData?.featureConfigs?.missedOpportunityFrom?.value,
+      MissedOpportunityToValue: postData?.featureConfigs?.missedOpportunityTo?.value,
+      BouncedLimitCondition: postData?.featureConfigs?.bouncedLimit?.condition,
+      BouncedLimitValue: postData?.featureConfigs?.bouncedLimit?.value,
+      InfraAlertValue: postData?.featureConfigs?.infraAlert?.value,
+      InfraAlertCondition: postData?.featureConfigs?.infraAlert?.condition,
+      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',
+      Revops: postData?.featureConfigs?.isRevops == true ? 'Enabled' : 'Disabled',
+      StreamType: postData?.featureConfigs?.streamBy == 'Edge' ? 'Edge App' : 'RTSP',
+      FootfallDirectoryOnlyAudit: postData?.featureConfigs?.isFootfallDirectoryAudit == true ? 'Enabled' : 'Disabled',
+      FootfallDirectoryOnlyFew: postData?.featureConfigs?.isFootfallDirectoryLimit == true ? 'Enabled' : 'Disabled',
+      FootfallView: previousData?.featureConfigs?.isFootfallView == true ? 'Enabled' : 'Disabled',
+      AIManager: previousData?.featureConfigs?.isAIManager == true ? 'Enabled' : 'Disabled',
+      AIManagerAccessControl: previousData?.featureConfigs?.isAIManagerAccessControl == true ? 'Enabled' : 'Disabled',
+      CameraEdit: previousData?.featureConfigs?.isCameraEdit == true ? 'Enabled' : 'Disabled',
+    };
 
+    // Prepare activity log object with all relevant details for OpenSearch logging
     const logObj = {
-      clientId: req.params?.id,
-      userName: user?.userName,
-      email: user?.email,
-      date: new Date(),
-      logType: 'configuration',
-      logSubType: 'featureConfig',
-      changes: updateKeys,
-      eventType: 'update',
-      showTo: [ 'client', 'tango' ],
+      clientId: req.params?.id, // ID of the client whose data was updated
+      userName: user?.userName, // Name of the user performing the update
+      email: user?.email, // Email of the user performing the update
+      date: new Date(), // Timestamp of the update event
+      logType: 'configuration', // Type of log (e.g., related to brand details)
+      logSubType: Object.keys( inputData ).some( ( key ) => keysArray.includes( key ) ) ? 'dashboardConfig' : 'featureConfig', // Subtype for more specific categorization
+      changes: updateKeys, // List of fields that were updated.these will shown in the UI as part of activity log
+      eventType: 'update', // Type of event (update operation)
+      showTo: [ 'client', 'tango' ], // Visibility of the log (who can see this log)
+      previous: previousData.featureConfigs, // Previous (old) client information before update based on DB keys (for internal reference and comparison).
+      current: postData.featureConfigs, // 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).
     };
+
+    // Insert activity log into OpenSearch if there are fields that were updated
     if ( updateKeys.length ) {
-      await insertOpenSearchData( openSearch.activityLog, logObj );
+      await insertOpenSearchData( openSearch.activityLog, logObj ); // Insert activity log
     }
 
     if ( updateAck ) {
@@ -1027,6 +1238,18 @@ export async function updateFeatureConfiguration( req, res ) {
 export async function domainDetailsConfiguration( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
+
+    // Get updated client domain configuration before the update operation (fetch selected fields only)
+    const getPreData = await findOneClient(
+        { clientId: req.params?.id }, // filter by clientId
+        {
+          'domainConfig.ssoLogin.domainName': 1,
+          'domainConfig.ssoLogin.isEnable': 1,
+          'domainConfig.ipWhitelisting.enableWhitelisting': 1,
+          'domainConfig.ipWhitelisting.allowedIps': 1,
+          'domainConfig.enableOtp': 1,
+        },
+    );
     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,
@@ -1034,30 +1257,66 @@ export async function domainDetailsConfiguration( req, res ) {
 
     let updateKeys = [];
 
-
+    // Check if request body has any fields to update
     if ( Object.keys( req.body ).length > 0 ) {
       Object.keys( req.body ).forEach( ( element ) => {
         updateKeys.push( camelCaseToWords( element ) );
       } );
     }
 
-    const user = await getUserNameEmailById( req.userId );
+    // Get updated client domain configuration after the update operation (fetch selected fields only)
+    const getPostData = await findOneClient(
+        { clientId: req.params?.id }, // Filter by clientId
+        {
+          '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?.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?.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,
-      userName: user?.userName,
-      email: user?.email,
-      date: new Date(),
-      logType: 'configuration',
-      logSubType: 'domainDetails',
-      changes: updateKeys,
-      eventType: 'update',
-      showTo: [ 'client', 'tango' ],
+      clientId: req.params?.id, // ID of the client whose data was updated
+      userName: req?.user?.userName, // Name of the user performing the update
+      email: req?.user?.email, // Email of the user performing the update
+      date: new Date(), // Timestamp of the update event
+      logType: 'configuration', // Type of log (e.g., related to brand details)
+      logSubType: 'domainDetails', // Subtype for more specific categorization
+      changes: updateKeys, // List of fields that were updated.these will shown in the UI as part of activity log
+      eventType: 'update', // Type of event (update operation)
+      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).
     };
 
+    // Insert activity log into OpenSearch if there are fields that were updated
     if ( updateKeys.length ) {
-      await insertOpenSearchData( openSearch.activityLog, logObj );
+      await insertOpenSearchData( openSearch.activityLog, logObj ); // Insert activity log
     }
 
     if ( updateAck ) {
@@ -1099,8 +1358,17 @@ export async function updateDocuments( req, res ) {
       };
 
       updateKeys.push( 'Address certificate' );
+      let xssCheckData=await getXsscheck( uploadDataParams.body );
+
+      if ( xssCheckData==true ) {
+        return res.sendError( 'Unsupported Media Type', 415 );
+      }
 
-      await fileUpload( uploadDataParams );
+      let uploadStatus= await fileRestrictedUpload( uploadDataParams );
+
+      if ( uploadStatus==false ) {
+        return res.sendError( 'Unsupported Media Type', 415 );
+      }
     }
     if ( req.files?.gstDoc ) {
       const uploadDataParams = {
@@ -1113,7 +1381,17 @@ export async function updateDocuments( req, res ) {
 
       updateKeys.push( 'GST certificate' );
 
-      await fileUpload( uploadDataParams );
+      let xssCheckData=await getXsscheck( uploadDataParams.body );
+
+      if ( xssCheckData==true ) {
+        return res.sendError( 'Unsupported Media Type', 415 );
+      }
+
+      let uploadStatus= await fileRestrictedUpload( uploadDataParams );
+
+      if ( uploadStatus==false ) {
+        return res.sendError( 'Unsupported Media Type', 415 );
+      }
     }
     if ( req.files?.panDoc ) {
       const uploadDataParams = {
@@ -1126,7 +1404,17 @@ export async function updateDocuments( req, res ) {
 
       updateKeys.push( 'PAN certificate' );
 
-      await fileUpload( uploadDataParams );
+      let xssCheckData=await getXsscheck( uploadDataParams.body );
+
+      if ( xssCheckData==true ) {
+        return res.sendError( 'Unsupported Media Type', 415 );
+      }
+
+      let uploadStatus= await fileRestrictedUpload( uploadDataParams );
+
+      if ( uploadStatus==false ) {
+        return res.sendError( 'Unsupported Media Type', 415 );
+      }
     }
     if ( req.files?.cinDoc ) {
       const uploadDataParams = {
@@ -1139,7 +1427,11 @@ export async function updateDocuments( req, res ) {
 
       updateKeys.push( 'CIN certificate' );
 
-      await fileUpload( uploadDataParams );
+      let uploadStatus= await fileRestrictedUpload( uploadDataParams );
+
+      if ( uploadStatus==false ) {
+        return res.sendError( 'Unsupported Media Type', 415 );
+      }
     }
 
     const updateAck = await documentsUpdate( {
@@ -1159,7 +1451,6 @@ export async function updateDocuments( req, res ) {
 
     const user = await getUserNameEmailById( req.userId );
 
-
     const logObj = {
       clientId: req.params?.id,
       userName: user?.userName,
@@ -1221,14 +1512,31 @@ 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,
       'auditConfigs.ratio': Number( normalizeNumber( inputData.ratio, 0, 100 ) ),
     };
-    logger.info( { record: record, query: query } );
-    const a = await updateOneClient( query, record );
-    logger.info( { a: a } );
+    await updateOneClient( query, record );
+
+    // Map and rename keys from previous client info for UI display and logging
+    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: currentClient?.auditConfigs?.audit == true ? 'Enable' : 'Disable',
+      MappingPercentage: currentClient?.auditConfigs?.ratio,
+      AuditCount: currentClient?.auditConfigs?.count,
+
+    };
     const logObj = {
       clientId: req.params?.id,
       userName: req.user?.userName,
@@ -1239,13 +1547,10 @@ export async function auditConfiguration( req, res ) {
       eventType: 'update',
       showTo: [ 'tango' ],
       changes: [ `Audit config for client id ${req.params?.id}` ],
-      previous: previousClient,
-      current: {
-        clientId: req.params?.id,
-        count: inputData.count,
-        audit: inputData.audit,
-        ratio: normalizeNumber( inputData.ratio, 0, 100 ),
-      },
+      previous: previousClient.auditConfigs,
+      current: currentClient.auditConfigs,
+      oldData: oldData,
+      newData: newData,
     };
 
     await insertOpenSearchData( openSearch.activityLog, logObj );
@@ -1288,17 +1593,6 @@ export async function clientList( req, res ) {
           $match: {
             userEmail: { $eq: req?.user?.email },
             userType: 'tango',
-            // $expr: {
-            //   $cond: {
-            //     if: {
-            //       $and: [
-            //         { $eq: [ '$tangoUserType', 'csm' ] },
-            //       ],
-            //     },
-            //     then: { $eq: [ '$isClientApproved', true ] },
-            //     else: true,
-            //   },
-            // },
 
           },
         }, {
@@ -1614,17 +1908,6 @@ export async function clientListV1( req, res ) {
           $match: {
             userEmail: { $eq: req?.user?.email },
             userType: 'tango',
-            // $expr: {
-            //   $cond: {
-            //     if: {
-            //       $and: [
-            //         { $eq: [ '$tangoUserType', 'csm' ] },
-            //       ],
-            //     },
-            //     then: { $eq: [ '$isClientApproved', true ] },
-            //     else: true,
-            //   },
-            // },
 
           },
         },
@@ -2020,13 +2303,41 @@ 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?.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',
+        'changes', 'eventType', 'previous', 'current', 'oldData', 'newData',
       ],
       'query': {
         'bool': {
@@ -2083,9 +2394,32 @@ 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 ) => {
+        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?.logType == 'cameras' ? hit?._source?.oldData : hit?._source?.previous;
+          const current = hit?._source?.logType == 'cameras' ? hit?._source?.newData : hit?._source?.current;
+          const logType = hit?._source?.logType;
+          const logSubType = hit?._source?.logSubType;
+          if ( previous && current && hit?._source?.logType == 'cameras' ) {
+            respo = findDifferences( previous, current );
+          } else {
+            respo = findDifferences1( previous, current, logType, logSubType );
+          }
+
+          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 );
     }
@@ -2096,42 +2430,334 @@ export async function getActivityLogs( req, res ) {
 }
 
 
-async function postApi( url, data ) {
-  const requestOptions = {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      'Authorization': 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66',
-    },
-    body: JSON.stringify( data ),
-  };
-
-  try {
-    const response = await fetch( url, requestOptions );
-    await response.json();
-  } catch ( error ) {
-    logger.error( { error: error, message: data, function: 'postApi' } );
+function findDifferences1( 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', '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 ) {
+    if ( !Object.prototype.hasOwnProperty.call( current, key ) || ignoredKeys.has( key ) ) continue;
+
+    const prevValue = previous[key];
+    const currValue = current[key];
+
+    if ( typeof prevValue === 'object' && typeof currValue === 'object' && prevValue !== null && currValue !== null ) {
+      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 = findDifferences1( prevValue, currValue, logType, logSubType, `${path}${key}.` );
+          Object.assign( differences, nestedDiffs );
+        }
+      } else {
+        const nestedDiffs = findDifferences1( prevValue, currValue, logType, logSubType, `${path}${key}.` );
+        Object.assign( differences, nestedDiffs );
+      }
+    } else if ( prevValue !== currValue ) {
+      if (
+        ( prevValue === '' && currValue === '' ) ||
+        ( Array.isArray( prevValue ) && Array.isArray( currValue ) && prevValue.length === 0 && currValue.length === 0 )
+      ) {
+        continue;
+      }
+      differences[`${path}${key}`] = { previous: prevValue, current: currValue };
+    }
   }
+
+  // **Transform & Filter Differences**
+  let updatedDifferences = {};
+  Object.keys( differences ).forEach( ( key ) => {
+    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',
+        current: diff.current ? 'Active' : 'Deactive',
+      };
+    }
+
+    const userFriendlyKey = getUserFriendlyKey( newKey, keyMapping );
+    if ( userFriendlyKey ) {
+      newKey = userFriendlyKey;
+    }
+    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';
+    }
+    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 === '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 ) {
+      const [ , roleIndex, moduleIndex, action ] = rolesPermissionMatch;
+      const role = previous.rolespermission?.[roleIndex];
+      const module = role?.modules?.[moduleIndex];
+
+      if ( module ) {
+        newKey = `User's ${module.name} Module ${action === 'isAdd' ? 'Add' : 'Edit'}`;
+        diff.previous = diff.previous ? 'Enabled' : 'Disabled';
+        diff.current = diff.current ? 'Enabled' : 'Disabled';
+      }
+    }
+
+    if ( !newKey || ( diff.previous === '' && !diff.current ) ) return;
+
+    if (
+      ( diff.previous === '' || diff.previous === null || ( Array.isArray( diff.previous ) && diff.previous.length === 0 ) ) &&
+      diff.current === undefined
+    ) {
+      return;
+    }
+    if (
+      ( diff.current === '' || diff.current === null || ( Array.isArray( diff.current ) && diff.current.length === 0 ) ) &&
+      diff.previous === undefined
+    ) {
+      return;
+    }
+
+    updatedDifferences[newKey] = diff;
+  } );
+
+  return updatedDifferences;
 }
 
-async function getApi( url ) {
-  const requestOptions = {
-    method: 'GET',
-    headers: {
-      'Content-Type': 'application/json',
-      'Authorization': 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66',
-    },
-  };
 
+function getUserFriendlyKey( keyPath, mapping ) {
+  const keys = keyPath.split( '.' ); // Split the key path (e.g., storeProfile.pincode → ['storeProfile', 'pincode'])
+  let value = mapping;
+
+  for ( const key of keys ) {
+    if ( value && typeof value === 'object' && key in value ) {
+      value = value[key]; // Traverse down the object
+    } else {
+      return null; // Return original if not found
+    }
+  }
+
+  return typeof value === 'string' ? value : keyPath; // Return mapped value or original key
+}
+
+export async function getActivityLogs( req, res ) {
   try {
-    const response = await fetch( url, requestOptions );
-    const responseData = await response.json();
-    return responseData;
+    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;
+          if ( previous && current ) {
+            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: 'Error in GET request', function: 'getApi' } );
+    logger.error( { error: error, message: req.body, function: 'getActivityLogs' } );
+    return res.sendError( 'Internal Server Error', 500 );
   }
 }
 
+function findDifferences( oldData, newData ) {
+  logger.info( { oldData: oldData, newData: newData } );
+  const allKeys = new Set( [ ...Object.keys( oldData ), ...Object.keys( newData ) ] );
+  const diff = {};
+
+  allKeys.forEach( ( key ) => {
+    const previous = key in oldData ? oldData[key] : null;
+    const current = key in newData ? newData[key] : null;
+
+    // Only include fields that are added or updated (where previous !== current)
+    if ( previous !== current ) {
+      diff[splitCamelCase( key )] = {
+        previous,
+        current,
+      };
+    }
+  } );
+
+  return diff;
+}
+
+function splitCamelCase( text ) {
+  return text.replace( /([a-z])([A-Z])/g, '$1 $2' ) // Add space between camelCase words
+      .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 ) {
+//   const requestOptions = {
+//     method: 'POST',
+//     headers: {
+//       'Content-Type': 'application/json',
+//       'Authorization': 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66',
+//     },
+//     body: JSON.stringify( data ),
+//   };
+
+//   try {
+//     const response = await fetch( url, requestOptions );
+//     await response.json();
+//   } catch ( error ) {
+//     logger.error( { error: error, message: data, function: 'postApi' } );
+//   }
+// }
+
+// async function getApi( url ) {
+//   const requestOptions = {
+//     method: 'GET',
+//     headers: {
+//       'Content-Type': 'application/json',
+//       'Authorization': 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66',
+//     },
+//   };
+
+//   try {
+//     const response = await fetch( url, requestOptions );
+//     const responseData = await response.json();
+//     return responseData;
+//   } catch ( error ) {
+//     logger.error( { error: error, message: 'Error in GET request', function: 'getApi' } );
+//   }
+// }
+
 
 export async function csmAssignConfirmation( req, res ) {
   try {
@@ -2163,3 +2789,151 @@ 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;
+}
+
+
+export async function createAuditConfig( req, res ) {
+  try {
+    await createauditConfig( req.body );
+    return res.sendSuccess( 'created Sucessfully' );
+  } catch ( error ) {
+    logger.error( { error: error, message: req.body, function: 'createAuditConfig' } );
+    return res.sendError( 'Internal Server Error', 500 );
+  }
+}
+export async function updateAuditConfig( req, res ) {
+  try {
+    await updateauditConfig( { _id: req.params.id }, req.body );
+    return res.sendSuccess( 'updated Sucessfully' );
+  } catch ( error ) {
+    logger.error( { error: error, message: req.body, function: 'createAuditConfig' } );
+    return res.sendError( 'Internal Server Error', 500 );
+  }
+}
+export async function AuditConfiglist( req, res ) {
+  try {
+    let Query = [ {
+      $match: {
+        '$and': [
+          { 'clientId': { $in: req.body.clientId } },
+        ],
+      },
+    } ];
+    if ( req.body.searchValue && req.body.searchValue !== '' ) {
+      const searchCondition = {
+        $match: {
+          $or: [
+            { AuditName: { $regex: req.body.searchValue, $options: 'i' } },
+            { keyWord: { $regex: req.body.searchValue, $options: 'i' } },
+          ],
+        },
+      };
+
+      Query.push( searchCondition );
+    }
+    if ( req.body.sortColumName && req.body.sortColumName !== '' && req.body.sortBy ) {
+      const sortOption = { $sort: { [req.body.sortColumName]: req.body.sortBy } };
+      Query.push( sortOption );
+    } else {
+      const sortOption = { $sort: { 'AuditName': -1 } };
+      Query.push( sortOption );
+    }
+
+    let count = await aggregateAuditconfig( Query );
+
+    if ( req.body.limit && req.body.offset && !req.body.export ) {
+      const skipValue = ( req.body.offset - 1 ) * req.body.limit;
+      const limitValue = Number( req.body.limit );
+
+      const pagination = [
+        { $skip: skipValue },
+        { $limit: limitValue },
+      ];
+
+      Query.push( ...pagination );
+    }
+
+    let result = await aggregateAuditconfig( Query );
+
+    if ( req.body.export && result.length > 0 ) {
+      const exportdata = result.map( ( element ) => {
+        return {
+          'Audit Name': element.AuditName,
+          'Keyword': element.keyWord,
+          'File Type': element.fileType,
+          'Response Type': element.responseType,
+          'Status': element.status,
+        };
+      } );
+      await download( exportdata, res );
+      return;
+    }
+    return res.sendSuccess( { result: result, totalCount: count.length } );
+  } catch ( error ) {
+    logger.error( { error: error, message: req.body, function: 'createAuditConfig' } );
+    return res.sendError( 'Internal Server Error', 500 );
+  }
+}
+
+
+export async function revopconfig( req, res ) {
+  try {
+    let result = await findOnerevopConfig( { clientId: req.body.clientId } );
+
+    if ( result===null ) {
+      await createrevopConfig( req.body );
+      return res.sendSuccess( 'revopconfig created Sucessfully' );
+    } else {
+      await updaterevopConfig( { clientId: req.body.clientId }, req.body );
+      return res.sendSuccess( 'revopconfig updated Sucessfully' );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, message: req.body, function: 'revopconfig' } );
+    return res.sendError( 'Internal Server Error', 500 );
+  }
+}
+
+export async function getrevopconfig( req, res ) {
+  try {
+    let result = await findOnerevopConfig( { clientId: req.query.clientId } );
+    if ( result===null ) {
+      return res.sendError( 'no data found', 204 );
+    }
+    return res.sendSuccess( result );
+  } catch ( error ) {
+    logger.error( { error: error, message: req.query, function: 'revopconfig' } );
+    return res.sendError( 'Internal Server Error', 500 );
+  }
+}
+
+