tango-app-api-client 3.4.0-beta.1 → 3.4.0-beta.11

package/src/controllers/client.controllers.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 = [
@@ -96,7 +98,7 @@ export async function create( req, res ) {
           record.featureConfigs.isNewZone = true;
         }
         if ( data.productName === 'tangoTrax' ) {
-          record.featureConfigs. isTrax= true;
+          record.featureConfigs.isTrax = true;
         }
       }
     }
@@ -178,125 +180,118 @@ 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,
@@ -678,7 +673,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 ) {
@@ -697,7 +692,7 @@ 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 ) {
@@ -769,7 +764,7 @@ export async function updateBrandInfo( req, res ) {
     };
 
     // Map and rename keys from current client info for UI display and logging
-    const newData ={
+    const newData = {
       RegisteredCompanyName: getPosCientInfo?.profileDetails?.registeredCompanyName,
       IndustryType: getPosCientInfo?.profileDetails?.industry,
       FirmType: getPosCientInfo?.profileDetails?.clientType,
@@ -824,26 +819,24 @@ export async function updateBrandInfo( req, res ) {
       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 ) {
       return res.sendSuccess( { result: 'Updated Successfully' } );
@@ -955,7 +948,7 @@ export async function updateSignatoryDetails( req, res ) {
 export async function updateTicketConfiguration( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    const fields ={
+    const fields = {
       'ticketConfigs.downTimeType': 1,
       'ticketConfigs.installationReAssign': 1,
       'ticketConfigs.infraDownTime': 1,
@@ -996,7 +989,7 @@ export async function updateTicketConfiguration( req, res ) {
 
     // Map and rename keys from previous client info for UI display and logging
     const oldData = {
-      InfraDowntimeType: findClient?.ticketConfigs?.downTimeType,
+      InfraDowntimeType: findClient?.ticketConfigs?.downTimeType == 0 ? 'Single Camera' : 'All Cameras',
       AutoReAssignInstallation: findClient?.ticketConfigs?.installationReAssign,
       InfraDowntime: findClient?.ticketConfigs?.infraDownTime,
       InfraFiles: findClient?.ticketConfigs?.MinFilesCount,
@@ -1008,8 +1001,8 @@ export async function updateTicketConfiguration( req, res ) {
     };
 
     // Map and rename keys from current client info for UI display and logging
-    const newData ={
-      InfraDowntimeType: updatedClient?.ticketConfigs?.downTimeType,
+    const newData = {
+      InfraDowntimeType: updatedClient?.ticketConfigs?.downTimeType == 0 ? 'Single Camera' : 'All Cameras',
       AutoReAssignInstallation: updatedClient?.ticketConfigs?.installationReAssign,
       InfraDowntime: updatedClient?.ticketConfigs?.infraDownTime,
       InfraFiles: updatedClient?.ticketConfigs?.MinFilesCount,
@@ -1056,7 +1049,7 @@ export async function updateTicketConfiguration( req, res ) {
 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 } );
@@ -1068,6 +1061,7 @@ export async function updateFeatureConfiguration( req, res ) {
     if ( inputData?.conversionValue ) {
       inputData.missedOpportunityToValue = inputData?.conversionValue;
     }
+    
     const updateAck = await featureConfigurationUpdate( { clientId: req.params?.id }, inputData );
 
     // Get updated client Feature configuration after the update operation (fetch selected fields only)
@@ -1077,56 +1071,47 @@ export async function updateFeatureConfiguration( req, res ) {
     // Check if request body has any fields to update
     if ( Object.keys( inputData ).length > 0 ) {
       Object.keys( inputData ).forEach( ( element ) => {
-        element === 'billableCalculation'? 'potentialCalculation': element; // Replace 'billableCalculation' with 'potentialCalculation' if present
+        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 );
-    }
+    // 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 } );
 
-    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',
@@ -1136,9 +1121,9 @@ export async function updateFeatureConfiguration( req, res ) {
     const oldData = {
       StoreOpenTime: previousData?.featureConfigs?.open,
       StoreCloseTime: previousData?.featureConfigs?.close,
-      ConversionCalculations: previousData?.featureConfigs?.conversionCalculation,
-      MissedOpportunityCalculation: previousData?.featureConfigs?.missedOpportunityCalculation,
-      PotentialCalculations: previousData?.featureConfigs?.billableCalculation,
+      ConversionCalculations: previousData?.featureConfigs?.conversionCalculation == 'footfall-count' ? 'Footfall Count' : postData?.featureConfigs?.conversionCalculation == 'engagers-count' ? 'Engagers Count' : 'Potential Entities',
+      MissedOpportunityCalculation: previousData?.featureConfigs?.missedOpportunityCalculation == 'engagers-conversion' ? 'Engagers - Conversion' : 'Potential Entities - Conversion',
+      PotentialCalculations: previousData?.featureConfigs?.billableCalculation == 'footfall-count' ? 'Footfall Count' : 'Engagers Count',
       ConversionCondition: previousData?.featureConfigs?.conversion.condition,
       ConversionValue: previousData?.featureConfigs?.conversion.value,
       MissedOpportunityFromCondition: previousData?.featureConfigs?.missedOpportunityFrom?.condition,
@@ -1149,33 +1134,33 @@ export async function updateFeatureConfiguration( req, res ) {
       BouncedLimitValue: previousData?.featureConfigs?.bouncedLimit?.value,
       InfraAlertValue: previousData?.featureConfigs?.infraAlert?.value,
       InfraAlertCondition: previousData?.featureConfigs?.infraAlert?.condition,
-      ConversionCalculations: previousData?.featureConfigs?.conversionCalculation,
-      ExcludedArea: previousData?.featureConfigs?.isExcludedArea ==true ? 'Enable': 'Disable',
-      PasserBydata: previousData?.featureConfigs?.isPasserByData ==true ? 'Enable': 'Disable',
-      NormalizedDataDuringDowntime: previousData?.featureConfigs?.isNormalized ==true ? 'Enable': 'Disable',
-      Billing: previousData?.featureConfigs?.isbillingDisabled ==true ? 'Enable': 'Disable',
-      CameraBlurring: previousData?.featureConfigs?.isCameraDisabled ==true ? 'Enable': 'Disable',
-      FootfallDirectory: previousData?.featureConfigs?.isFootfallDirectory ==true ? 'Enable': 'Disable',
-      NOBStatus: previousData?.featureConfigs?.isNOB ==true ? 'Enable': 'Disable',
-      EnableAnalyze: previousData?.featureConfigs?.isNewDashboard ==true ? 'Enable': 'Disable',
-      Traffic: previousData?.featureConfigs?.isNewTraffic==true ? 'Enable': 'Disable',
-      Zone: previousData?.featureConfigs?.isNewZone ==true ? 'Enable': 'Disable',
-      Zonev2: previousData?.featureConfigs?.isNewZoneV2 ==true ? 'Enable': 'Disable',
-      Reports: previousData?.featureConfigs?.isNewReports ==true ? 'Enable': 'Disable',
-      Trax: previousData?.featureConfigs?.isTrax ==true ? 'Enable': 'Disable',
-      StreamType: previousData?.featureConfigs?.streamBy =='Edge' ? 'Edge App': 'RTSP',
-      FootfallDirectoryOnlyAudit: previousData?.featureConfigs?.isFootfallDirectoryAudit ==true ? 'Enable': 'Disable',
-      FootfallDirectoryOnlyFew: previousData?.featureConfigs?.isFootfallDirectoryLimit ==true ? 'Enable': 'Disable',
+      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',
 
     };
 
     // Map and rename keys from current client info for UI display and logging
-    const newData ={
+    const newData = {
       StoreOpenTime: postData?.featureConfigs?.open,
       StoreCloseTime: postData?.featureConfigs?.close,
-      ConversionCalculations: postData?.featureConfigs?.conversionCalculation,
-      MissedOpportunityCalculation: postData?.featureConfigs?.missedOpportunityCalculation,
-      PotentialCalculations: postData?.featureConfigs?.billableCalculation,
+      ConversionCalculations: postData?.featureConfigs?.conversionCalculation == 'footfall-count' ? 'Footfall Count' : postData?.featureConfigs?.conversionCalculation == 'engagers-count' ? 'Engagers Count' : 'Potential Entities',
+      MissedOpportunityCalculation: postData?.featureConfigs?.missedOpportunityCalculation == 'engagers-conversion' ? 'Engagers - Conversion' : 'Potential Entities - Conversion',
+      PotentialCalculations: postData?.featureConfigs?.billableCalculation == 'footfall-count' ? 'Footfall Count' : 'Engagers Count',
       ConversionCondition: postData?.featureConfigs?.conversion.condition,
       ConversionValue: postData?.featureConfigs?.conversion.value,
       MissedOpportunityFromCondition: postData?.featureConfigs?.missedOpportunityFrom?.condition,
@@ -1186,23 +1171,23 @@ export async function updateFeatureConfiguration( req, res ) {
       BouncedLimitValue: postData?.featureConfigs?.bouncedLimit?.value,
       InfraAlertValue: postData?.featureConfigs?.infraAlert?.value,
       InfraAlertCondition: postData?.featureConfigs?.infraAlert?.condition,
-      ConversionCalculations: postData?.featureConfigs?.conversionCalculation,
-      ExcludedArea: postData?.featureConfigs?.isExcludedArea ==true ? 'Enable': 'Disable',
-      PasserBydata: postData?.featureConfigs?.isPasserByData ==true ? 'Enable': 'Disable',
-      NormalizedDataDuringDowntime: postData?.featureConfigs?.isNormalized ==true ? 'Enable': 'Disable',
-      Billing: postData?.featureConfigs?.isbillingDisabled ==true ? 'Enable': 'Disable',
-      CameraBlurring: postData?.featureConfigs?.isCameraDisabled ==true ? 'Enable': 'Disable',
-      FootfallDirectory: postData?.featureConfigs?.isFootfallDirectory ==true ? 'Enable': 'Disable',
-      NOBStatus: postData?.featureConfigs?.isNOB ==true ? 'Enable': 'Disable',
-      EnableAnalyze: postData?.featureConfigs?.isNewDashboard ==true ? 'Enable': 'Disable',
-      Traffic: postData?.featureConfigs?.isNewTraffic==true ? 'Enable': 'Disable',
-      Zone: postData?.featureConfigs?.isNewZone ==true ? 'Enable': 'Disable',
-      Zonev2: postData?.featureConfigs?.isNewZoneV2 ==true ? 'Enable': 'Disable',
-      Reports: postData?.featureConfigs?.isNewReports ==true ? 'Enable': 'Disable',
-      Trax: postData?.featureConfigs?.isTrax ==true ? 'Enable': 'Disable',
-      StreamType: postData?.featureConfigs?.streamBy =='Edge' ? 'Edge App': 'RTSP',
-      FootfallDirectoryOnlyAudit: postData?.featureConfigs?.isFootfallDirectoryAudit ==true ? 'Enable': 'Disable',
-      FootfallDirectoryOnlyFew: postData?.featureConfigs?.isFootfallDirectoryLimit ==true ? 'Enable': 'Disable',
+      ExcludedArea: postData?.featureConfigs?.isExcludedArea == true ? 'Enabled' : 'Disabled',
+      PasserBydata: postData?.featureConfigs?.isPasserByData == true ? 'Enabled' : 'Disabled',
+      NormalizedDataDuringDowntime: postData?.featureConfigs?.isNormalized == true ? 'Enabled' : 'Disabled',
+      Billing: postData?.featureConfigs?.isbillingDisabled == true ? 'Enabled' : 'Disabled',
+      CameraBlurring: postData?.featureConfigs?.isCameraDisabled == true ? 'Enabled' : 'Disabled',
+      FootfallDirectory: postData?.featureConfigs?.isFootfallDirectory == true ? 'Enabled' : 'Disabled',
+      NOBStatus: postData?.featureConfigs?.isNOB == true ? 'Enabled' : 'Disabled',
+      EnableAnalyze: postData?.featureConfigs?.isNewDashboard == true ? 'Enabled' : 'Disabled',
+      Traffic: postData?.featureConfigs?.isNewTraffic == true ? 'Enabled' : 'Disabled',
+      Zone: postData?.featureConfigs?.isNewZone == true ? 'Enabled' : 'Disabled',
+      Zonev2: postData?.featureConfigs?.isNewZoneV2 == true ? 'Enabled' : 'Disabled',
+      Reports: postData?.featureConfigs?.isNewReports == true ? 'Enabled' : 'Disabled',
+      Trax: postData?.featureConfigs?.isTrax == true ? 'Enabled' : 'Disabled',
+      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',
 
     };
 
@@ -1246,11 +1231,11 @@ export async function domainDetailsConfiguration( req, res ) {
     const getPreData = await findOneClient(
         { clientId: req.params?.id }, // filter by clientId
         {
-          domainName: '$domainConfig.ssoLogin.domainName',
-          isEnable: '$domainConfig.ssoLogin.isEnable',
-          ipWhitelist: '$domainConfig.ipWhitelisting.enableWhitelisting',
-          WhitelistedIps: '$domainConfig.ipWhitelisting.allowedIps',
-          TwoFactorAuthentication: '$domainConfig.enableOtp',
+          'domainConfig.ssoLogin.domainName': 1,
+          'domainConfig.ssoLogin.isEnable': 1,
+          'domainConfig.ipWhitelisting.enableWhitelisting': 1,
+          'domainConfig.ipWhitelisting.allowedIps': 1,
+          'domainConfig.enableOtp': 1,
         },
     );
     const updateAck = await domainDetailsConfigurationUpdate( {
@@ -1271,35 +1256,35 @@ export async function domainDetailsConfiguration( req, res ) {
     const getPostData = await findOneClient(
         { clientId: req.params?.id }, // Filter by clientId
         {
-          domainName: '$domainConfig.ssoLogin.domainName',
-          isEnable: '$domainConfig.ssoLogin.isEnable',
-          ipWhitelist: '$domainConfig.ipWhitelisting.enableWhitelisting',
-          WhitelistedIps: '$domainConfig.ipWhitelisting.allowedIps',
-          TwoFactorAuthentication: '$domainConfig.enableOtp',
+          'domainConfig.ssoLogin.domainName': 1,
+          'domainConfig.ssoLogin.isEnable': 1,
+          'domainConfig.ipWhitelisting.enableWhitelisting': 1,
+          'domainConfig.ipWhitelisting.allowedIps': 1,
+          'domainConfig.enableOtp': 1,
         },
     );
 
 
     // Map and rename keys from previous client info for UI display and logging
     const oldData = {
-      DomainName: getPreData?.domainConfig?.ssoLogin?.domainName,
-      IsEnable: getPreData?.domainConfig?.ssoLogin?.isEnable ==true ? 'Enable': 'Disable',
-      IPWhitelist: getPreData?.domainConfig?.ipWhitelisting?.enableWhitelisting ==true ? 'Enable': 'Disable',
-      WhitelistedIps: ( getPreData?.domainConfig?.ipWhitelisting?.allowedIps ).join( ', ' ),
-      TwoFactorAuthentication: getPreData?.domainConfig?.enableOtp ==true ? 'Enable': 'Disable',
+      DomainName: getPreData?.domainConfig?.ssoLogin?.domainName?.join( ', ' ),
+      IsEnable: getPreData?.domainConfig?.ssoLogin?.isEnable == true ? 'Enable' : 'Disable',
+      IPWhitelist: getPreData?.domainConfig?.ipWhitelisting?.enableWhitelisting == true ? 'Enable' : 'Disable',
+      WhitelistedIps: getPreData?.domainConfig?.ipWhitelisting?.allowedIps?.join( ', ' ),
+      TwoFactorAuthentication: getPreData?.domainConfig?.enableOtp == true ? 'Enable' : 'Disable',
 
     };
 
     // Map and rename keys from current client info for UI display and logging
-    const newData ={
-      DomainName: getPostData?.domainConfig?.ssoLogin?.domainName,
-      IsEnable: getPostData?.domainConfig?.ssoLogin?.isEnable ==true ? 'Enable': 'Disable',
-      IPWhitelist: getPostData?.domainConfig?.ipWhitelisting?.enableWhitelisting ==true ? 'Enable': 'Disable',
-      WhitelistedIps: ( getPostData?.domainConfig?.ipWhitelisting?.allowedIps ).join( ', ' ),
-      TwoFactorAuthentication: getPostData?.domainConfig?.enableOtp ==true ? 'Enable': 'Disable',
+    const newData = {
+      DomainName: getPostData?.domainConfig?.ssoLogin?.domainName?.join( ', ' ),
+      IsEnable: getPostData?.domainConfig?.ssoLogin?.isEnable == true ? 'Enable' : 'Disable',
+      IPWhitelist: getPostData?.domainConfig?.ipWhitelisting?.enableWhitelisting == true ? 'Enable' : 'Disable',
+      WhitelistedIps: getPostData?.domainConfig?.ipWhitelisting?.allowedIps?.join( ', ' ),
+      TwoFactorAuthentication: getPostData?.domainConfig?.enableOtp == true ? 'Enable' : 'Disable',
     };
 
-
+    logger.info( { getPreData: getPreData, getPostData: getPostData, newData: newData, oldData: oldData } );
     // Prepare activity log object with all relevant details for OpenSearch logging
     const logObj = {
       clientId: req.params?.id, // ID of the client whose data was updated
@@ -1482,7 +1467,7 @@ export async function auditConfiguration( req, res ) {
       auditConfigs: 1, _id: 0,
     };
     const previousClient = await findOneClient( query, fields );
-    previousClient.auditConfigs.ratio = previousClient?.auditConfigs?.ratio? ( previousClient.auditConfigs.ratio )*100 : null;
+    previousClient.auditConfigs.ratio = previousClient?.auditConfigs?.ratio ? ( previousClient.auditConfigs.ratio ) * 100 : null;
     const record = {
       'auditConfigs.count': inputData.count,
       'auditConfigs.audit': inputData.audit,
@@ -1490,20 +1475,22 @@ export async function auditConfiguration( req, res ) {
     };
     await updateOneClient( query, record );
 
-
     // Map and rename keys from previous client info for UI display and logging
     const oldData = {
-      AuditStatus: inputData?.audit ==true ? 'Enable': 'Disable',
-      MappingPercentage: inputData?.ratio,
-      AuditCount: inputData?.count,
-
+      AuditStatus: previousClient?.auditConfigs?.audit == true ? 'Enable' : 'Disable',
+      MappingPercentage: previousClient?.auditConfigs?.ratio,
+      AuditCount: previousClient?.auditConfigs?.count,
     };
 
+    const currentClient = await findOneClient( query, fields );
+    currentClient.auditConfigs.ratio = currentClient?.auditConfigs?.ratio ? ( currentClient.auditConfigs.ratio ) * 100 : null;
+
     // Map and rename keys from current client info for UI display and logging
-    const newData ={
-      AuditStatus: previousClient.auditConfigs?.audit ==true ? 'Enable': 'Disable',
-      MappingPercentage: previousClient.auditConfigs?.ratio,
-      AuditCount: previousClient.auditConfigs?.count,
+    const newData = {
+      AuditStatus: currentClient?.auditConfigs?.audit == true ? 'Enable' : 'Disable',
+      MappingPercentage: currentClient?.auditConfigs?.ratio,
+      AuditCount: currentClient?.auditConfigs?.count,
+
     };
     const logObj = {
       clientId: req.params?.id,
@@ -1516,12 +1503,7 @@ export async function auditConfiguration( req, res ) {
       showTo: [ 'tango' ],
       changes: [ `Audit config for client id ${req.params?.id}` ],
       previous: previousClient.auditConfigs,
-      current: {
-        clientId: req.params?.id,
-        count: inputData.count,
-        audit: inputData.audit,
-        ratio: inputData.ratio,
-      },
+      current: currentClient.auditConfigs,
       oldData: oldData,
       newData: newData,
     };
@@ -2280,12 +2262,12 @@ export async function getActivityLogs1( req, res ) {
   try {
     const inputData = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    const clientQuery =[
+    const clientQuery = [
       {
         $match: {
           $and: [
             {
-              clientId: { $in: inputData },
+              clientId: { $in: [ inputData?.clientId ] },
             },
           ],
         },
@@ -2304,37 +2286,23 @@ export async function getActivityLogs1( req, res ) {
       },
     ];
     const getClientName = await aggregateClient( clientQuery );
-    if ( getClientName?.length == 0 || getClientName[0]?.clientName?.length ===0 ) {
+    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',
+        'changes', 'eventType', 'previous', 'current', 'oldData', 'newData',
       ],
       'query': {
         'bool': {
-          // 'must': [
-          //   {
-          //     'terms': {
-          //       'clientId.keyword': [ req.body.clientId ],
-          //     },
-          //   },
-          // ],
-
-          'should': [
-            {
-              'terms': {
-                'clientId.keyword': [ inputData.clientId ],
-              },
-            },
+          'must': [
             {
               'terms': {
-                'clientName.keyword': [ getClientName[0].clientName ], // Add clientName condition
+                'clientId.keyword': [ req.body.clientId ],
               },
             },
           ],
-          'minimum_should_match': 1, // Ensures at least one condition must match
         },
       },
       'from': ( req.body.offset - 1 ) * req.body.limit,
@@ -2385,18 +2353,22 @@ export async function getActivityLogs1( req, res ) {
     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?.previous;
-          const current=hit?._source?.current;
-          const logType =hit?._source?.logType;
-
-          const logSubType =hit?._source?.logSubType;
-          respo = findDifferences1( previous, current, logType, logSubType );
+        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;
+          hit._source.changes = logSubType === 'ticketConfig' ? Object.keys( respo ).map( ( item ) => item ) : hit._source.changes;
         } else {
           temp.push( hit?._source );
         }
@@ -2421,7 +2393,7 @@ function findDifferences1( previous, current, logType, logSubType, path = '' ) {
   ] );
   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;
+  const keyMapping = logType == 'stores' ? documents.stores : logType == 'users' ? documents.users : logSubType == 'reportConfig' ? documents.reports : logType == 'brandInfo' ? documents.client : documents.client;
 
 
   let differences = {};
@@ -2433,7 +2405,7 @@ function findDifferences1( previous, current, logType, logSubType, path = '' ) {
     const currValue = current[key];
 
     if ( typeof prevValue === 'object' && typeof currValue === 'object' && prevValue !== null && currValue !== null ) {
-      if ( logSubType!== 'userUpdated' ) {
+      if ( logSubType !== 'userUpdated' ) {
         if ( key == 'spocDetails' ) {
           if ( _.isEqual( prevValue, currValue ) ) {
             continue;
@@ -2441,9 +2413,9 @@ function findDifferences1( previous, current, logType, logSubType, path = '' ) {
             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;
+        } 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 {
@@ -2514,13 +2486,13 @@ function findDifferences1( previous, current, logType, logSubType, path = '' ) {
 
     if (
       ( diff.previous === '' || diff.previous === null || ( Array.isArray( diff.previous ) && diff.previous.length === 0 ) ) &&
-            diff.current === undefined
+      diff.current === undefined
     ) {
       return;
     }
     if (
       ( diff.current === '' || diff.current === null || ( Array.isArray( diff.current ) && diff.current.length === 0 ) ) &&
-            diff.previous === undefined
+      diff.previous === undefined
     ) {
       return;
     }
@@ -2551,7 +2523,7 @@ export async function getActivityLogs( req, res ) {
   try {
     const inputData = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    const clientQuery =[
+    const clientQuery = [
       {
         $match: {
           $and: [
@@ -2575,7 +2547,7 @@ export async function getActivityLogs( req, res ) {
       },
     ];
     const getClientName = await aggregateClient( clientQuery );
-    if ( getClientName?.length == 0 || getClientName[0]?.clientName?.length ===0 ) {
+    if ( getClientName?.length == 0 || getClientName[0]?.clientName?.length === 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
     const query = {
@@ -2650,12 +2622,14 @@ export async function getActivityLogs( req, res ) {
     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 ) {
+        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 );
+          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;
@@ -2675,6 +2649,7 @@ export async function getActivityLogs( req, res ) {
 }
 
 function findDifferences( oldData, newData ) {
+  logger.info( { oldData: oldData, newData: newData } );
   const allKeys = new Set( [ ...Object.keys( oldData ), ...Object.keys( newData ) ] );
   const diff = {};
 
@@ -2695,44 +2670,48 @@ function findDifferences( oldData, newData ) {
 }
 
 function splitCamelCase( text ) {
-  return text.replace( /([a-z])([A-Z])/g, '$1 $2' );
+  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' } );
-  }
-}
+// 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 ) {
@@ -2779,8 +2758,8 @@ function compareArrayObjects( prevArray, currArray ) {
 
     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}`;
+        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',
@@ -2796,3 +2775,120 @@ function compareArrayObjects( prevArray, currArray ) {
 
   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 );
+  }
+}
+
+