tango-app-api-audit 3.5.7-stage.0 → 3.5.7-stage.2

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -611,7 +611,7 @@ export async function getAuditFile( req, res ) {
         const image = img[3]?.split( '.' );
         const indexes = msg.zone_id === 'track' ? msg.audit_type === 'ReAudit'? folderPath[i]?._source?.outputCluster ===50000? folderPath[i]?._source?.REIDCluster:folderPath[i]?._source?.outputCluster:folderPath[i]?._source?.REIDCluster: image[0]?.split( '_' );
         fetchData.file_path = msg.zone_id === 'track' ?folderPath[i]?._source?.personPath:folderPath[i].Key;
-        const data =msg.zone_id === 'track' ? `${url.trackInput}${folderPath[i]?._source?.personPath}` :await signedUrl( fetchData );
+        const data =msg.zone_id === 'track' ? `${url.trackInput}${folderPath[i]?._source?.personPath}` : `${url.auditInput}${folderPath[i].Key}`; // await signedUrl( fetchData );
         const mapimg = {
           img_path: data,
           img_name: msg.zone_id === 'track' ?indexes: indexes[1],
@@ -1397,12 +1397,13 @@ export async function save( req, res ) {
         params.Bucket = bucket.auditUploadBucket;
       } else {
         params.Bucket = bucket.masterJson;
+        params.Key = `${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/${bucket.srcMasterJsonFile}`;
       }
       const fileData = await getJsonFileData( params );
 
       if ( fileData?.statusCode ) {
         logger.error( {
-          error: `ERROR IN UPLOAD PATH: ${inputData.storeId}/${inputData.fileDate}/${bucket.masterJsonFile}`,
+          error: `ERROR IN GET MAPPING FILE: ${params.Key}`,
           type: 'UPLOAD_ERROR',
         } );
         return res.sendError( fileData, 500 );
@@ -1878,36 +1879,37 @@ export async function save( req, res ) {
       const getBody = await aggregateAuditStoreData( getQuery );
       const streams = getBody? getBody?.sqs?.streams : null;
       const sqsProduceQueue = inputData.moduleType === 'track'?
-      {
-        QueueUrl: `${sqs.url}${sqs.trackOutput}`,
-        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
-      }:
-     {
-       QueueUrl: ( auditConfig?.isCheckMinAfterCount ==1 && inputData.customerCount > auditConfig?.minAfterCount ) ? `${sqs.url}${sqs.feature_new}`: `${sqs.url}${sqs.feature}`,
-       MessageBody: JSON.stringify( {
-         store_id: inputData.storeId,
-         store_date: inputData.fileDate,
-         bucket_name: `${bucket.auditUploadBucket}`,
-         zone_id: inputData.zoneName,
-         process_type: 'audit',
-       } ),
-     };
+        {
+          QueueUrl: `${sqs.url}${sqs.trackOutput}`,
+          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
+        }:
+       {
+         QueueUrl: ( auditConfig?.isCheckMinAfterCount ==1 && inputData.customerCount > auditConfig?.minAfterCount ) ? `${sqs.url}${sqs.feature_new}`: `${sqs.url}${sqs.feature}`,
+         MessageBody: JSON.stringify( {
+           store_id: inputData.storeId,
+           store_date: inputData.fileDate,
+           bucket_name: `${bucket.auditUploadBucket}`,
+           zone_id: inputData.zoneName,
+           process_type: 'audit',
+         } ),
+       };
       logger.info( { sqsProduceQueue: sqsProduceQueue } );
-      const sqsQueue = inputData.moduleType === 'track'? await sendMessageToFIFOQueue( sqsProduceQueue ) : await sendMessageToQueue(
-          sqsProduceQueue.QueueUrl,
-          sqsProduceQueue.MessageBody,
+      const sqsQueue = inputData.moduleType === 'track'? await sendMessageToFIFOQueue( sqsProduceQueue ) : null;
+      // await sendMessageToQueue(
+      //     sqsProduceQueue.QueueUrl,
+      //     sqsProduceQueue.MessageBody,
 
-      );
+      // );
 
       logger.info( { sqsQueue: sqsQueue } );
       if ( inputData.moduleType === 'track' ) {