tango-app-api-client 3.4.0-beta.4 → 3.4.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.4.0-beta.4",
+    "version": "3.4.0-beta.6",
     "description": "client",
     "main": "index.js",
     "type": "module",
@@ -14,6 +14,7 @@
     "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",
@@ -26,7 +27,7 @@
         "npm": "^10.9.1",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.2.59",
-        "tango-app-api-middleware": "^3.1.60",
+        "tango-app-api-middleware": "^3.1.67",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/client.controllers.js

@@ -1187,22 +1187,22 @@ export async function updateFeatureConfiguration( req, res ) {
       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',
+      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',
       StreamType: postData?.featureConfigs?.streamBy =='Edge' ? 'Edge App': 'RTSP',
-      FootfallDirectoryOnlyAudit: postData?.featureConfigs?.isFootfallDirectoryAudit ==true ? 'Enable': 'Disable',
-      FootfallDirectoryOnlyFew: postData?.featureConfigs?.isFootfallDirectoryLimit ==true ? 'Enable': 'Disable',
+      FootfallDirectoryOnlyAudit: postData?.featureConfigs?.isFootfallDirectoryAudit ==true ? 'Enabled': 'Disabled',
+      FootfallDirectoryOnlyFew: postData?.featureConfigs?.isFootfallDirectoryLimit ==true ? 'Enabled': 'Disabled',
 
     };
 
@@ -1246,11 +1246,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 +1271,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,
+      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( ', ' ),
+      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,
+      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( ', ' ),
+      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
@@ -2285,8 +2285,7 @@ export async function getActivityLogs1( req, res ) {
         $match: {
           $and: [
             {
-              clientId: { $in: inputData },
-            },
+              clientId: { $in: [ inputData?.clientId ] } },
           ],
         },
       },
@@ -2310,31 +2309,17 @@ export async function getActivityLogs1( req, res ) {
     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,
@@ -2388,12 +2373,16 @@ export async function getActivityLogs1( req, res ) {
         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 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;
-          respo = findDifferences1( previous, current, logType, 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;
@@ -2699,7 +2688,8 @@ function findDifferences( oldData, newData ) {
 
 function splitCamelCase( text ) {
   return text.replace( /([a-z])([A-Z])/g, '$1 $2' ) // Add space between camelCase words
-      .replace( /(\d+)/g, ' $1 ' ) // Add space between numbers
+      .replace( /([a-zA-Z])(\d+)/g, '$1 $2' ) // Add space between letters and numbers
+      .replace( /(\d+)([a-zA-Z])/g, '$1 $2' )
       .trim();
 }
 

package/src/dtos/client.dtos.js

@@ -52,8 +52,8 @@ export const signatoryDetailsSchemaBody = joi.object( {
   name: joi.string().optional(),
   email: joi.string().email().message( 'Enter a valid email' ).optional(),
   number: joi.string()
-      .pattern( /^\d{4,12}$/ )
-      .message( 'Enter a valid mobile number' )
+      .pattern( /^\d{7,15}$/ )
+      .message( 'Mobile Number Must be Valid' )
       .optional(),
   designation: joi.string().optional(),
 } );