tango-app-api-audit 3.6.55 → 3.6.57

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.6.55",
+    "version": "3.6.57",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",

package/src/controllers/audit.controllers.js

@@ -1993,77 +1993,112 @@ export async function save( req, res ) {
       inputData.auditType == 'Audit' &&
       inputData.moduleType == 'traffic'
     ) {
-      logger.info(
-          `Hit in ReAudit pushing queue  Store Id=${inputData.storeId},File Date=${inputData.fileDate}, /n \nQueue Name = ${clientData[0].auditConfigs.queueName}`,
-          'ReAudit',
-      );
-      const queueName = inputData.moduleType == 'zone' ? clientData[0].auditConfigs.zoneQueueName : clientData[0].auditConfigs.trafficQueueName;
-      if ( !queueName ) {
-        logger.error( { error: 'queueName is undefined', queueName: queueName, moduleType: inputData.moduleType, function: 'save' } );
-      }
-      const sqsProduceQueue = {
-        QueueUrl: `${sqs.url}${queueName}`,
-        MessageBody: JSON.stringify( {
-          store_id: inputData.storeId,
-          zone_id: inputData.zoneName,
-          audit_type: 'ReAudit',
-          curr_date: inputData.fileDate,
-          total_count: inputData.customerCount,
-          before_count: storeAuditData.beforeCount,
-        } ),
-      };
-      const sqsQueue = await sendMessageToQueue(
-          sqsProduceQueue.QueueUrl,
-          sqsProduceQueue.MessageBody,
-      );
-
-      if ( sqsQueue.statusCode ) {
-        logger.error( {
-          error: `${sqsQueue}`,
-          type: 'UPLOAD_ERROR',
-        } );
-        return res.sendError( mappingUpload, 500 );
-      }
-
-      await updateOneStoreAudit(
-          {
-            storeId: inputData.storeId,
-            fileDate: inputData.fileDate,
-            moduleType: inputData.moduleType,
-            zoneName: inputData.zoneName,
-          },
-          {
-            status: 'not_assign',
-            afterCount: inputData.customerCount,
-            auditType: 'ReAudit',
-            timeSpent: inputData.timeSpent,
+      // Skip re-pushing the reAudit queue if a reAuditPush log with the
+      // same audit identifiers already exists (prevents duplicate triggers).
+      const reAuditPushQuery = {
+        size: 1,
+        query: {
+          bool: {
+            must: [
+              { term: { 'logSubType.keyword': 'reAuditPush' } },
+              { term: { 'logData.fileDate.keyword': req.userAudit?.fileDate } },
+              { term: { 'logData.auditType.keyword': req.userAudit?.auditType } },
+              { term: { 'logData.storeId.keyword': req.userAudit?.storeId } },
+              { term: { 'logData.moduleType.keyword': req.userAudit?.moduleType } },
+              { term: { 'logData.zoneName.keyword': req.userAudit?.zoneName } },
+              { term: { 'logData.startTime': req.userAudit?.startTime } },
+              { term: { 'logData.auditId.keyword': inputData.auditId } },
+            ],
           },
-      );
+        },
+      };
+      const existingReAuditPush = await getOpenSearchData( openSearch.auditLog, reAuditPushQuery );
+      const reAuditPushExists = existingReAuditPush?.body?.hits?.total?.value || 0;
 
-      const logData = {
-        userId: req.user._id,
-        userName: req.user.userName,
-        logType: 'audit',
-        logSubType: 'reAuditPush',
-        logData: {
+      if ( reAuditPushExists ) {
+        logger.info( {
+          message: 'reAuditPush already exists, skipping queue push',
+          storeId: req.userAudit?.storeId,
           fileDate: req.userAudit?.fileDate,
           auditType: req.userAudit?.auditType,
-          storeId: req.userAudit?.storeId,
           moduleType: req.userAudit?.moduleType,
           zoneName: req.userAudit?.zoneName,
-          queueName: req.userAudit?.queueName,
-          clientId: req.userAudit?.clientId,
-          beforeCount: req.userAudit?.beforeCount,
-          afterCount: inputData.customerCount,
           startTime: req.userAudit?.startTime,
-          endTime: Date.now(),
-          timeSpent: inputData.timeSpent,
-          auditId: new mongoose.Types.ObjectId( inputData.auditId ),
-        },
-        createdAt: Date.now(),
-      };
+          function: 'save',
+        } );
+      } else {
+        logger.info(
+            `Hit in ReAudit pushing queue  Store Id=${inputData.storeId},File Date=${inputData.fileDate}, /n \nQueue Name = ${clientData[0].auditConfigs.queueName}`,
+            'ReAudit',
+        );
+        const queueName = inputData.moduleType == 'zone' ? clientData[0].auditConfigs.zoneQueueName : clientData[0].auditConfigs.trafficQueueName;
+        if ( !queueName ) {
+          logger.error( { error: 'queueName is undefined', queueName: queueName, moduleType: inputData.moduleType, function: 'save' } );
+        }
+        const sqsProduceQueue = {
+          QueueUrl: `${sqs.url}${queueName}`,
+          MessageBody: JSON.stringify( {
+            store_id: inputData.storeId,
+            zone_id: inputData.zoneName,
+            audit_type: 'ReAudit',
+            curr_date: inputData.fileDate,
+            total_count: inputData.customerCount,
+            before_count: storeAuditData.beforeCount,
+          } ),
+        };
+        const sqsQueue = await sendMessageToQueue(
+            sqsProduceQueue.QueueUrl,
+            sqsProduceQueue.MessageBody,
+        );
 
-      await insertOpenSearchData( openSearch.auditLog, logData );
+        if ( sqsQueue.statusCode ) {
+          logger.error( {
+            error: `${sqsQueue}`,
+            type: 'UPLOAD_ERROR',
+          } );
+          return res.sendError( mappingUpload, 500 );
+        }
+
+        await updateOneStoreAudit(
+            {
+              storeId: inputData.storeId,
+              fileDate: inputData.fileDate,
+              moduleType: inputData.moduleType,
+              zoneName: inputData.zoneName,
+            },
+            {
+              status: 'not_assign',
+              afterCount: inputData.customerCount,
+              auditType: 'ReAudit',
+              timeSpent: inputData.timeSpent,
+            },
+        );
+
+        const logData = {
+          userId: req.user._id,
+          userName: req.user.userName,
+          logType: 'audit',
+          logSubType: 'reAuditPush',
+          logData: {
+            fileDate: req.userAudit?.fileDate,
+            auditType: req.userAudit?.auditType,
+            storeId: req.userAudit?.storeId,
+            moduleType: req.userAudit?.moduleType,
+            zoneName: req.userAudit?.zoneName,
+            queueName: req.userAudit?.queueName,
+            clientId: req.userAudit?.clientId,
+            beforeCount: req.userAudit?.beforeCount,
+            afterCount: inputData.customerCount,
+            startTime: req.userAudit?.startTime,
+            endTime: Date.now(),
+            timeSpent: inputData.timeSpent,
+            auditId: new mongoose.Types.ObjectId( inputData.auditId ),
+          },
+          createdAt: Date.now(),
+        };
+
+        await insertOpenSearchData( openSearch.auditLog, logData );
+      }
     } else {
       /*   openSearch logs start*/
       let id = `${inputData.moduleType}_${inputData.auditId}_${inputData.storeId}_${inputData.moduleType}_${inputData.auditType}_save_Info_${req?.user?.email}_${Date.now()}`;
@@ -3751,7 +3786,7 @@ export async function reTrigger( req, res ) {
         }
         break;
       case 'user':
-          if ( req.audit.status === 'not_assign' ) {
+        if ( req.audit.status === 'not_assign' ) {
           await releaseReTriggerLock( lockKey );
           return res.sendError( 'This store has already assigned to the user', 400 );
         }

package/src/validation/audit.validation.js

@@ -47,9 +47,10 @@ export async function validateUserAudit( req, res, next ) {
       return res.sendError( 'No Data Available' );
     } else if ( userAuditDetails && userAuditDetails.auditStatus == 'skipped' ) {
       return res.sendError( 'The Audit file Assigned to some one else', 203 );
+    } else {
+      req.userAudit = userAuditDetails;
+      next();
     }
-    req.userAudit = userAuditDetails;
-    next();
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { error: error, message: req.query, function: 'validateUserAudit' } );