tango-app-api-audit 3.6.8 → 3.6.10

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -2131,7 +2131,7 @@ export async function save( req, res ) {
           retry: 1,
         } ),
         MessageGroupId: 'my-group-1', // Required for FIFO queues
-        MessageDeduplicationId: Date.now().toString(), // Or a UUID, if content-based deduplication is off
+        MessageDeduplicationId: `${inputData.storeId}_${inputData.fileDate}_${inputData.auditType}_${Date.now().toString()}`, // Or a UUID, if content-based deduplication is off
       }:
      {
        QueueUrl: ( auditConfig?.isCheckMinAfterCount ==1 && inputData.customerCount > auditConfig?.minAfterCount ) ? `${sqs.url}${sqs.feature_new}`: `${sqs.url}${sqs.feature}`,
@@ -2143,46 +2143,54 @@ export async function save( req, res ) {
          process_type: 'audit',
        } ),
      };
-      const sqsProduceQueueCopy = {
-        QueueUrl: `${sqs.url}track-output-copy.fifo`,
-        MessageBody: JSON.stringify( {
-          store_id: inputData.storeId,
-          zone_id: [ 'traffic_zone' ],
-          streams: streams || [],
-          store_date: inputData.fileDate,
-          bucket_name: 'tango-yolo-v2-output',
-          time: '23:00',
-          retry: 1,
-        } ),
-        MessageGroupId: 'my-group-1', // Required for FIFO queues
-        MessageDeduplicationId: Date.now().toString(), // Or a UUID, if content-based deduplication is off
-      };
 
-      let sqsQueue;
-      let sqsQueueCopy;
+
       if ( inputData.moduleType === 'track' ) {
-        const [ firstResponse, secondResponse ] = await Promise.all( [
-          sendMessageToFIFOQueue( sqsProduceQueue ),
-          sendMessageToFIFOQueue( sqsProduceQueueCopy ),
-        ] );
+        const firstResponse = await sendMessageToFIFOQueue( sqsProduceQueue );
 
-        sqsQueue = firstResponse;
-        sqsQueueCopy = secondResponse;
+        /*   openSearch logs start */
+        id = `${inputData.moduleType}_${inputData.auditId}_${inputData.storeId}_${inputData.moduleType}_${inputData.auditType}_save_Info_${req?.user?.email}_${Date.now()}`;
+        const message = {
+          getBody: getBody,
+          streams: streams,
+          sqsProduceQueue: sqsProduceQueue,
+          sqsQueue: firstResponse,
+        };
+        temp.message =JSON.stringify( message );
+        await openSearchLog( temp, req.user, id );
+        /*   openSearch logs  end */
+
+        if ( firstResponse.statusCode ) {
+          const results = await Promise.allSettled( [
+            withRetry( () => sendMessageToFIFOQueue( sqsProduceQueue ), 3, 2000 ),
+          ] );
+          const [ firstRetryResponse ] = results;
+          /*   openSearch logs start */
+          id = `${inputData.moduleType}_${inputData.auditId}_${inputData.storeId}_${inputData.moduleType}_${inputData.auditType}_save_Info_${req?.user?.email}_${Date.now()}`;
+          const message = {
+            getBody: getBody,
+            streams: streams,
+            sqsProduceQueue: sqsProduceQueue,
+            sqsQueue: firstRetryResponse,
+          };
+          temp.message =JSON.stringify( message );
+          await openSearchLog( temp, req.user, id );
+          /*   openSearch logs  end */
+        }
       } else {
-        sqsQueue = await sendMessageToQueue( sqsProduceQueue.QueueUrl, sqsProduceQueue.MessageBody );
-      }
-      /*   openSearch logs start */
-      id = `${inputData.moduleType}_${inputData.auditId}_${inputData.storeId}_${inputData.moduleType}_${inputData.auditType}_save_Info_${req?.user?.email}_${Date.now()}`;
-      const message = {
-        getBody: getBody,
-        streams: streams,
-        sqsProduceQueue: sqsProduceQueue,
-        sqsQueue: sqsQueue,
-        sqsQueueCopy: sqsQueueCopy,
-      };
-      temp.message =JSON.stringify( message );
-      await openSearchLog( temp, req.user, id );
+        const sqsQueue = await sendMessageToQueue( sqsProduceQueue.QueueUrl, sqsProduceQueue.MessageBody );
+        /*   openSearch logs start */
+        id = `${inputData.moduleType}_${inputData.auditId}_${inputData.storeId}_${inputData.moduleType}_${inputData.auditType}_save_Info_${req?.user?.email}_${Date.now()}`;
+        const message = {
+          getBody: getBody,
+          streams: streams,
+          sqsProduceQueue: sqsProduceQueue,
+          sqsQueue: sqsQueue,
+        };
+        temp.message =JSON.stringify( message );
+        await openSearchLog( temp, req.user, id );
       /*   openSearch logs  end */
+      }
       if ( inputData.moduleType === 'track' ) {
         // declare id
         id = `${inputData.moduleType}_${inputData.auditId}_${inputData.storeId}_${inputData.moduleType}_${inputData.auditType}_save_Info_${req?.user?.email}_${Date.now()}`;
@@ -2210,6 +2218,25 @@ export async function save( req, res ) {
   }
 }
 
+//  Retry send SQS message
+async function withRetry( fn, retries = 3, delay = 1000 ) {
+  let lastError;
+  for ( let attempt = 1; attempt <= retries; attempt++ ) {
+    try {
+      const result = await fn();
+      return result; //  success — return immediately
+    } catch ( err ) {
+      lastError = err;
+      logger.error( `Attempt ${attempt} failed: ${err.message}` );
+      if ( attempt < retries ) {
+        await new Promise( ( res ) => setTimeout( res, delay ) ); // wait before retry
+      }
+    }
+  }
+  throw lastError; //  all attempts failed
+}
+
+
 const filteredMap = async ( data ) => {
   const temp = data.map( ( item ) => item.img_name );
   return temp;

package/src/controllers/eyeTestAudit.controllers.js

@@ -1244,13 +1244,13 @@ export async function summaryList( req, res ) {
 
       } );
     }
-    if ( inputData.complianceScore && inputData.complianceScore!= null ) {
-      logger.info( { complsc: inputData.complianceScore } );
+    if ( inputData.complianceScore && inputData.complianceScore?.length > null ) {
+      const values = Array.isArray( inputData.complianceScore ) ?
+    inputData.complianceScore.map( Number ) :
+    [ Number( inputData.complianceScore ) ];
       filter.push( {
-        range: {
-          'ComplianceScore': {
-            lt: inputData.complianceScore,
-          },
+        'terms': {
+          'ComplianceScore': values,
         },
 
       } );
@@ -2083,13 +2083,11 @@ export async function summaryCard( req, res ) {
       } );
     }
 
-    if ( inputData?.complianceScore && inputData?.complianceScore !== null ) {
+    if ( inputData?.complianceScore && inputData?.complianceScore?.length > 0 ) {
       filter.push(
           {
-            range: {
-              ComplianceScore: {
-                lt: inputData?.complianceScore, // 🔹 adjust threshold here (e.g. gte: 50 for >= 50%)
-              },
+            'terms': {
+              'ComplianceScore': inputData.complianceScore,
             },
           },
       );

package/src/dtos/eyeTestAudit.dtos.js

@@ -155,7 +155,7 @@ export const summaryListSchema = joi.object( {
       joi.string().optional(),
   ).optional(),
   storeId: joi.array().items( joi.string().required() ).required(),
-  complianceScore: joi.number().optional().allow( null ),
+  complianceScore: joi.array().items( joi.number().required() ).optional(),
   nearAddition: joi.string().optional().allow( '' ),
   isExport: joi.boolean().optional(),
   searchValue: joi.string().optional().allow( '' ),
@@ -226,7 +226,7 @@ export const summaryCardSchema = joi.object( {
       joi.string().optional(),
   ).optional(),
   storeId: joi.array().items( joi.string().required() ).required(),
-  complianceScore: joi.number().optional().allow( null ),
+  complianceScore: joi.array().items( joi.number().required() ).optional(),
   nearAddition: joi.string().optional().allow( '' ),
   category: joi.string().optional() .valid( 'fake', 'genuine' ),
 } );

package/src/routes/eyeTestAudit.routes.js

@@ -22,7 +22,7 @@ eyeTestAuditRouter.post( '/summary-card', isAllowedSessionHandler, accessVerific
 eyeTestAuditRouter.post( '/email-alert-log', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), isSuperAdmin, validate( emailAlertLogValid ), emailAlertLog );
 
 eyeTestAuditRouter.post( '/cluster-list', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( clusterListValid ), clusterList );
-eyeTestAuditRouter.get( '/rm-list', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( rmListValid ), rmList );
+eyeTestAuditRouter.get( '/rm-list', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), isSuperAdmin, validate( rmListValid ), rmList );
 
 
 // setting