tango-app-api-audit 3.6.8 → 3.6.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.6.8",
+    "version": "3.6.9",
     "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

@@ -1207,7 +1207,7 @@ export async function summaryList( req, res ) {
     const limit = inputData.limit || 10;
     const offset = inputData.offset ? ( inputData.offset - 1 ) * limit : 0;
 
-    const sortBy = inputData?.sortBy ? [ 'coveredStepsAI', 'trustScore', 'date', 'ComplianceScore', 'auditedSteps' ].includes( inputData.sortBy ) ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'storeName.keyword';
+    const sortBy = inputData?.sortBy ? [ 'coveredStepsAI', 'trustScore', 'date', 'ComplianceScore' ].includes( inputData.sortBy ) ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'storeName.keyword';
     const order = inputData?.sortOrder || -1;
 
     let filter= [
@@ -1221,15 +1221,7 @@ export async function summaryList( req, res ) {
       },
 
     ];
-
-    if ( inputData?.auditStatus && inputData?.auditStatus?.length > 0 ) {
-      filter.push( {
-        'terms': {
-          'auditStatus.keyword': inputData.auditStatus,
-        },
-      } );
-    }
-    if ( inputData?.demographics && inputData?.demographics?.length > 0 ) {
+    if ( inputData.demographics && inputData.demographics.length > 0 ) {
       filter.push( {
         'terms': {
           'visitorsType.keyword': inputData.demographics,
@@ -1856,7 +1848,6 @@ export async function summaryList( req, res ) {
             if ( element?._source?.type == 'physical' ) {
               exportData.push( {
                 'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
-                'Audited Date': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?dayjs( element?._source?.updatedAt ).format( 'D MMM, YYYY' ): 'NA',
                 ...( req?.user?.role === 'superadmin' && { 'RM Name': RMName } ),
                 ...( req?.user?.role !== 'user' && { 'Cluster Name': clusterName } ),
                 'Store Name': element?._source?.storeName,
@@ -1866,7 +1857,6 @@ export async function summaryList( req, res ) {
                 'Queue ID': element?._source?.queueId,
                 'Tango Score': `${element?._source?.totalSteps>0 ? Math.round( ( element?._source?.coveredStepsAI/ element?._source?.totalSteps )*100 ): 0} %`,
                 'Steps Covered By AI': element?._source?.coveredStepsAI || 0,
-                'Steps Covered By User': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?element?._source?.auditedSteps :'NA',
                 'Trust Score': element?._source?.trustScore == null || element?._source?.trustScore ==undefined ? 'NA' : `${element?._source?.trustScore} %`,
                 'Visitor Type': element?._source?.visitorsType,
                 'Test Duration': duration || '',
@@ -1879,7 +1869,6 @@ export async function summaryList( req, res ) {
             } else {
               exportData.push( {
                 'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
-                'Audited Date': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?dayjs( element?._source?.updatedAt ).format( 'D MMM, YYYY' ): 'NA',
                 ...( req?.user?.role === 'superadmin' && { 'RM Name': RMName } ),
                 ...( req?.user?.role !== 'user' && { 'Cluster Name': clusterName } ),
                 'Store Name': element?._source?.storeName,
@@ -1889,7 +1878,6 @@ export async function summaryList( req, res ) {
                 'Engagement ID': element?._source?.engagementId,
                 'Tango Score': `${element?._source?.totalSteps>0 ? Math.round( ( element?._source?.coveredStepsAI/ element?._source?.totalSteps )*100 ): 0} %`,
                 'Steps Covered By AI': element?._source?.coveredStepsAI || 0,
-                'Steps Covered By User': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?element?._source?.auditedSteps :'NA',
                 'Trust Score': element?._source?.trustScore == null || element?._source?.trustScore ==undefined ? 'NA' : `${element?._source?.trustScore} %`,
                 'Test Duration': duration || '',
                 'Audit Status': element?._source?.auditStatus || '',
@@ -2031,7 +2019,6 @@ export async function summaryList( req, res ) {
           temp[i].sec = seconds;
           temp[i].auditedBy = userName?.userName || '';
           temp[i].date = dayjs( item?._source?.date ).format( 'D MMM, YYYY' );
-          temp[i].auditedDate = [ 'Re-Audited', 'Audited' ].includes( item?._source?.auditStatus )?dayjs( item?._source?.updatedAt ).format( 'D MMM, YYYY' ): 'NA';
           temp[i].RMName = RMName;
           temp[i].clusterName =clusterName;
           temp[i].RMEmail =RMEmail;

package/src/dtos/eyeTestAudit.dtos.js

@@ -150,7 +150,7 @@ export const summaryListSchema = joi.object( {
   demographics: joi.array().optional(),
   RMList: joi.array().items(
       joi.string().required(),
-  ).required(),
+  ).optional(),
   cluster: joi.array().items(
       joi.string().optional(),
   ).optional(),
@@ -164,7 +164,6 @@ export const summaryListSchema = joi.object( {
   category: joi.string().optional() .valid( 'fake', 'genuine' ),
   offset: joi.number().optional(),
   limit: joi.number().optional(),
-  auditStatus: joi.array().items( joi.string().required().valid( 'Re-Audited', 'Audited', 'In-Progress', 'Yet-to-Audit' ) ).optional(),
 } );
 
 export const summaryListValid = {

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

package/src/validation/eyeTest.validation.js

@@ -2,20 +2,20 @@ import { logger } from 'tango-app-api-middleware';
 
 export async function roleValidation( req, res, next ) {
   try {
-    // const userRole = req?.user?.role;
+    const userRole = req?.user?.role;
     req.body.clientId = req?.user?.userType == 'tango'? req?.body?.clientId : req?.user?.clientId;
-    // switch ( userRole ) {
-    //   case 'user':
-    //     req.body.RMList = [ req?.user?.email ];
-    //     break;
-    //   case 'admin':
-    //     req.body.RMList = [ req?.user?.email ];
-    //     // delete req?.body?.RMList;
-    //     break;
-    //   case 'superadmin':
-    //     break;
-    //   default: return res.sendError( 'forbidden to access: you must be User or Admin or Super Admin', 403 );
-    // }
+    switch ( userRole ) {
+      case 'user':
+        req.body.RMList = [ req?.user?.email ];
+        break;
+      case 'admin':
+        req.body.RMList = [ req?.user?.email ];
+        // delete req?.body?.RMList;
+        break;
+      case 'superadmin':
+        break;
+      default: return res.sendError( 'forbidden to access: you must be User or Admin or Super Admin', 403 );
+    }
     next();
     return;
   } catch ( error ) {