tango-app-api-client 3.3.3-beta.10 → 3.3.3-beta.12

package/app.js

@@ -0,0 +1,40 @@
+import express from 'express';
+import { clientRouter } from './index.js';
+
+import dotenv from 'dotenv';
+import { logger } from 'tango-app-api-middleware';
+import { connectdb } from './config/database/database.js';
+import responseMiddleware from './config/response/response.js';
+import errorMiddleware from './config/response/error.js';
+import pkg from 'body-parser';
+import { swaggerConfig } from './config/swagger/swagger.js';
+import swagger from 'swagger-ui-express';
+
+const { json, urlencoded } = pkg;
+const env=dotenv.config();
+
+const app = express();
+const PORT = process.env.PORT || 3000;
+
+
+app.use( json( { limit: '500mb' } ) );
+app.use(
+    urlencoded( {
+      extended: true,
+    } ),
+);
+app.use( responseMiddleware );
+app.use( errorMiddleware );
+
+if ( env.error ) {
+  logger.error( '.env not found' );
+  process.exit( 1 );
+}
+app.use( '/api-docs', swagger.serve, swagger.setup( swaggerConfig ) );
+
+app.use( '/v3/client', clientRouter );
+
+app.listen( PORT, () => {
+  logger.info( `server is running on port= ${PORT} ` );
+  connectdb();
+} );

package/package.json

@@ -1,42 +1,42 @@
-{
-    "name": "tango-app-api-client",
-    "version": "3.3.3-beta.10",
-    "description": "client",
-    "main": "index.js",
-    "type": "module",
-    "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node index.js\""
-    },
-    "engines": {
-        "node": ">=18.10.0"
-    },
-    "author": "praveenraj",
-    "license": "ISC",
-    "dependencies": {
-        "aws-sdk": "^2.1560.0",
-        "cors": "^2.8.5",
-        "dotenv": "^16.4.4",
-        "express": "^4.18.2",
-        "express-fileupload": "^1.4.3",
-        "handlebars": "^4.7.8",
-        "joi": "^17.12.1",
-        "joi-to-swagger": "^6.2.0",
-        "lodash": "^4.17.21",
-        "mongodb": "^6.7.0",
-        "nodemon": "^3.0.3",
-        "npm": "^10.9.1",
-        "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.2.59",
-        "tango-app-api-middleware": "^3.1.60",
-        "winston": "^3.11.0",
-        "winston-daily-rotate-file": "^5.0.0"
-    },
-    "devDependencies": {
-        "eslint": "^8.56.0",
-        "eslint-config-google": "^0.14.0",
-        "eslint-config-semistandard": "^17.0.0",
-        "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-promise": "^6.1.1"
-    }
-}
+{
+    "name": "tango-app-api-client",
+    "version": "3.3.3-beta.12",
+    "description": "client",
+    "main": "app.js",
+    "type": "module",
+    "scripts": {
+        "start": "nodemon --exec \"eslint --fix . && node app.js\""
+    },
+    "engines": {
+        "node": ">=18.10.0"
+    },
+    "author": "praveenraj",
+    "license": "ISC",
+    "dependencies": {
+        "aws-sdk": "^2.1560.0",
+        "cors": "^2.8.5",
+        "dotenv": "^16.4.4",
+        "express": "^4.18.2",
+        "express-fileupload": "^1.4.3",
+        "handlebars": "^4.7.8",
+        "joi": "^17.12.1",
+        "joi-to-swagger": "^6.2.0",
+        "lodash": "^4.17.21",
+        "mongodb": "^6.7.0",
+        "nodemon": "^3.0.3",
+        "npm": "^10.9.1",
+        "swagger-ui-express": "^5.0.0",
+        "tango-api-schema": "^2.2.59",
+        "tango-app-api-middleware": "^3.1.60",
+        "winston": "^3.11.0",
+        "winston-daily-rotate-file": "^5.0.0"
+    },
+    "devDependencies": {
+        "eslint": "^8.56.0",
+        "eslint-config-google": "^0.14.0",
+        "eslint-config-semistandard": "^17.0.0",
+        "eslint-config-standard": "^17.1.0",
+        "eslint-plugin-import": "^2.29.1",
+        "eslint-plugin-promise": "^6.1.1"
+    }
+}

package/src/controllers/client.controllers.js

@@ -700,33 +700,40 @@ export async function updateBrandInfo( req, res ) {
         updateKeys.push( camelCaseToWords( element ) );
       } );
     }
+    const getPreCientInfo = await findOneClient( { clientId: req.params.id }, { _id: 0, registeredCompanyName: '$profileDetails.registeredCompanyName', industry: '$profileDetails.industry', clientType: '$profileDetails.clientType',
+      registeredAddress: '$profileDetails.registeredAddress', headQuarters: '$profileDetails.headQuarters', website: '$profileDetails.website', status: 1, averageTransactionValue: 1 } );
 
-    const user = await getUserNameEmailById( req.userId );
 
+    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,
+    } );
+    const getPosCientInfo = await findOneClient( { clientId: req.params.id }, { _id: 0, registeredCompanyName: '$profileDetails.registeredCompanyName', industry: '$profileDetails.industry', clientType: '$profileDetails.clientType',
+      registeredAddress: '$profileDetails.registeredAddress', headQuarters: '$profileDetails.headQuarters', website: '$profileDetails.website', status: 1, averageTransactionValue: 1 } );
 
     const logObj = {
       clientId: req.params?.id,
-      userName: user?.userName,
-      email: user?.email,
+      userName: req?.user?.userName,
+      email: req?.user?.email,
       date: new Date(),
       logType: 'brandDetails',
       logSubType: 'brandInfo',
       changes: updateKeys,
       eventType: 'update',
       showTo: [ 'client', 'tango' ],
+      previous: getPreCientInfo,
+      current: getPosCientInfo,
     };
-
+    logger.info( { previous: getPreCientInfo,
+      current: getPosCientInfo, logObj: logObj } );
     if ( updateKeys.length ) {
-      await insertOpenSearchData( openSearch.activityLog, logObj );
+      logger.info( { updateKeys: updateKeys } );
+      const a =await insertOpenSearchData( openSearch.activityLog, logObj );
+      logger.info( { a: a } );
     }
 
 
-    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 } );
@@ -878,7 +885,7 @@ export async function updateSignatoryDetails( req, res ) {
 export async function updateTicketConfiguration( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    let  findClient =  await findOneClient({clientId:req.params?.id})
+    let findClient = await findOneClient( { clientId: req.params?.id } );
     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,
@@ -894,7 +901,7 @@ export async function updateTicketConfiguration( req, res ) {
     }
 
     const user = await getUserNameEmailById( req.userId );
-    let  updatedClient =  await findOneClient({clientId:req.params?.id})
+    let updatedClient = await findOneClient( { clientId: req.params?.id } );
 
     const logObj = {
       clientId: req.params?.id,
@@ -906,8 +913,8 @@ export async function updateTicketConfiguration( req, res ) {
       changes: updateKeys,
       eventType: 'update',
       showTo: [ 'tango' ],
-      current:updatedClient.ticketConfigs,
-      previous:findClient.ticketConfigs
+      current: updatedClient.ticketConfigs,
+      previous: findClient.ticketConfigs,
     };
 
     if ( updateKeys.length ) {
@@ -927,6 +934,7 @@ export async function updateFeatureConfiguration( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const url = JSON.parse( process.env.URL );
+    const previousData = await findOneClient( { clientId: req.params?.id }, { featureConfigs: 1 } );
     const inputData = req.body;
     if ( inputData?.bouncedLimitValue ) {
       inputData.missedOpportunityFromValue = inputData?.bouncedLimitValue;
@@ -936,11 +944,12 @@ export async function updateFeatureConfiguration( req, res ) {
       inputData.missedOpportunityToValue = inputData?.conversionValue;
     }
     const updateAck = await featureConfigurationUpdate( { clientId: req.params?.id }, inputData );
-
+    const postData = await findOneClient( { clientId: req.params?.id }, { featureConfigs: 1 } );
     let updateKeys = [];
 
     if ( Object.keys( inputData ).length > 0 ) {
       Object.keys( inputData ).forEach( ( element ) => {
+        element === 'billableCalculation'? 'potentialCalculation': element;
         updateKeys.push( camelCaseToWords( element ) );
       } );
     }
@@ -998,10 +1007,12 @@ export async function updateFeatureConfiguration( req, res ) {
       email: user?.email,
       date: new Date(),
       logType: 'configuration',
-      logSubType: 'featureConfig',
+      logSubType: inputData.includes['isExcludedArea', 'isPasserByData', 'isNormalized', 'isbillingDisabled', 'isCameraDisabled', 'isFootfallDirectory', 'isNOB', 'isNewTraffic', 'isTrax', 'isNewZone', 'isNewReports', 'isNewDashboard', 'streamBy']? 'dashboardConfig': 'featureConfig',
       changes: updateKeys,
       eventType: 'update',
       showTo: [ 'client', 'tango' ],
+      pervious: previousData,
+      current: postData,
     };
     if ( updateKeys.length ) {
       await insertOpenSearchData( openSearch.activityLog, logObj );
@@ -1020,6 +1031,7 @@ export async function updateFeatureConfiguration( req, res ) {
 export async function domainDetailsConfiguration( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const getPreData = await findOneClient( { clientId: req.params?.id }, { domainName: '$domainConfig.ssoLogin.domainName', TwoFactorAuthentication: '$domainConfig.ssoLogin.isEnable', ipWhitelist: '$domainConfig.ipWhitelisting.enableWhitelisting', WhitelistesIps: '$domainConfig.ipWhitelisting.allowedIps', enableOtp: '$domainConfig.enableOtp' } );
     const 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,19 +1046,20 @@ export async function domainDetailsConfiguration( req, res ) {
       } );
     }
 
-    const user = await getUserNameEmailById( req.userId );
-
+    const getPostData = await findOneClient( { clientId: req.params?.id }, { domainName: '$domainConfig.ssoLogin.domainName', TwoFactorAuthentication: '$domainConfig.enableOtp', ipWhitelist: '$domainConfig.ipWhitelisting.enableWhitelisting', WhitelistesIps: '$domainConfig.ipWhitelisting.allowedIps', isEnable: '$domainConfig.ssoLogin.isEnable' } );
 
     const logObj = {
       clientId: req.params?.id,
-      userName: user?.userName,
-      email: user?.email,
+      userName: req?.user?.userName,
+      email: req?.user?.email,
       date: new Date(),
       logType: 'configuration',
       logSubType: 'domainDetails',
       changes: updateKeys,
       eventType: 'update',
       showTo: [ 'client', 'tango' ],
+      previous: getPreData,
+      current: getPostData,
     };
 
     if ( updateKeys.length ) {
@@ -2085,7 +2098,8 @@ export async function getActivityLogs( req, res ) {
           const previous = hit?._source?.previous;
           const current=hit?._source?.current;
           const logType =hit?._source?.logType;
-          respo = findDifferences( previous, current, logType );
+          const logSubType =hit?._source?.logSubType === 'documentUpload'? 'documentsUpload': hit?._source?.logSubType;
+          respo = findDifferences( previous, current, logType, logSubType );
           hit._source.updatedValue = respo;
           temp.push( hit?._source );
         } else {
@@ -2104,15 +2118,15 @@ export async function getActivityLogs( req, res ) {
 }
 
 
-function findDifferences( previous, current, logType, path = '' ) {
+function findDifferences( previous, current, logType, logSubType, path = '' ) {
   const dbKeys = JSON.parse( process.env.DB_KEYS );
   const ignoredKeys = new Set( [
     '_id', 'updatedAt', 'createdAt', 'password', 'clientId',
     'storeId', 'refreshToken', 'employeeId', 'fcmToken', 'permission',
   ] );
-
+  const documents = dbKeys.DOCUMENTS;
   // Get correct key mapping based on logType
-  const keyMapping = dbKeys.DOCUMENTS[logType] || {};
+  const keyMapping = logType == 'stores' ?documents.stores: logType == 'users' ?documents.users :logSubType=='reportConfig'?documents.reports: logType=='brandInfo'?documents.client:documents.client;
 
   let differences = {};
 
@@ -2123,7 +2137,7 @@ function findDifferences( previous, current, logType, path = '' ) {
     const currValue = current[key];
 
     if ( typeof prevValue === 'object' && typeof currValue === 'object' && prevValue !== null && currValue !== null ) {
-      const nestedDiffs = findDifferences( prevValue, currValue, logType, `${path}${key}.` );
+      const nestedDiffs = findDifferences( prevValue, currValue, logType, logSubType, `${path}${key}.` );
       Object.assign( differences, nestedDiffs );
     } else if ( prevValue !== currValue ) {
       if (
@@ -2139,7 +2153,7 @@ function findDifferences( previous, current, logType, path = '' ) {
   // **Transform & Filter Differences**
   let updatedDifferences = {};
   Object.keys( differences ).forEach( ( key ) => {
-    let newKey = key.replace( /spocDetails\.\d+\./, 'spocDetails.' );
+    let newKey = key.replace( /spocDetails\.\d+\./, 'spocDetails.' ).replace( /WhitelistesIps\.\d+/, 'Whitelisted Ips' );
     let diff = differences[key];
 
     if ( newKey.toLowerCase().includes( 'isactive' ) ) {
@@ -2154,11 +2168,21 @@ function findDifferences( previous, current, logType, path = '' ) {
       newKey = userFriendlyKey;
     }
 
-    if ( newKey === 'Infra Email Alert' ) {
-      diff.previous = diff.previous ? 'Enabled' : 'Disabled';
-      diff.current = diff.current ? 'Enabled' : 'Disabled';
+    if ( newKey === 'Infra Email Alert' || newKey === 'Ip Whitelist' || newKey === 'Excluded Area'|| newKey === 'Passer By Data'|| newKey === 'Normalized'|| newKey === 'Billing'|| newKey === 'Camera'|| newKey === 'Footfall Directory'|| newKey === 'NOB'|| newKey === 'New Traffic'|| newKey === 'Trax'|| newKey === 'New Zone'|| newKey === 'New Reports'|| newKey === 'New Dashboard'|| newKey === 'Stream Type' ) {
+      diff.previous = ( diff.previous == true || diff.previous == 'Enabled' ) ? 'Enabled' : 'Disabled';
+      diff.current = ( diff.current == true || diff.current == 'Enabled' ) ? 'Enabled' : 'Disabled';
+    }
+    if ( newKey === 'Mat Enabled' ) {
+      diff.previous = ( diff.previous == true || diff.previous == 'Enabled' )?'Enabled' : 'Disabled';
+      diff.current = ( diff.current == true || diff.current == 'Enabled' ) ? 'Enabled' : 'Disabled';
+    }
+
+    if ( newKey === 'Two Factor Authentication' ) {
+      diff.previous = ( diff.previous == true || diff.previous == 'Enabled' ) ? 'Enabled' : 'Disabled';
+      diff.current = ( diff.current == true || diff.current == 'Enabled' ) ? 'Enabled' : 'Disabled';
     }
 
+
     // **Transform Roles Permission Keys**
     const rolesPermissionMatch = newKey.match( /rolespermission\.(\d+)\.modules\.(\d+)\.(isAdd|isEdit)/ );
     if ( rolesPermissionMatch ) {