tango-app-api-audit 3.4.46 → 3.4.48

package/package.json

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

package/src/controllers/traxAudit.controllers.js

@@ -828,10 +828,10 @@ export async function getAuditFile( req, res ) {
 
 export async function getUpdatedFile( req, res ) {
   try {
+    const url = JSON.parse( process.env.URL );
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
     const msg = req?.TraxData?.sqs?.Body;
-    logger.info( { msg: msg } );
     let result =[];
     switch ( inputData.moduleType ) {
       case 'camera-angle-change':
@@ -900,11 +900,12 @@ export async function getUpdatedFile( req, res ) {
           logger.info( { folderPath: list, params: params, list: list } );
           if ( folderPath?.length ) {
             for ( let i = 0; i < folderPath.length; i++ ) {
-              const signedParams ={
-                Bucket: msg.inputBucketName,
-                file_path: folderPath[i].Key,
-              };
-              const data = await signedUrl( signedParams );
+              // const signedParams ={
+              //   Bucket: msg.inputBucketName,
+              //   file_path: folderPath[i].Key,
+              // };
+              const BucketCDN = url.traxAuditInput;
+              const data = `${BucketCDN}${ folderPath[i].Key}`;
 
               files.push(
                   data,
@@ -913,7 +914,7 @@ export async function getUpdatedFile( req, res ) {
           } else {
             logger.error( {
               error: { folderPath: folderPath },
-              function: `getAuditFile - ${inputData.moduleType}`,
+              function: `getUpdatedFile - ${inputData.moduleType}`,
               message: 'Bucket image data not availale',
             } );
             return res.sendError( 'Bucket is Empty', 204 );
@@ -994,7 +995,7 @@ export async function getUpdatedFile( req, res ) {
       address: storeInfo?.address,
       customerId: msg.tempId,
       moduleType: inputData.moduleType,
-      value: inputData.moduleType == 'left-in-middle'? 'Employee Left in Middle ' : ( inputData.moduleType ).split( '-' ).join( ' ' ),
+      value: inputData.moduleType == 'left-in-middle'? 'Employee Left in Middle ' : inputData.moduleType == 'cleaning'? 'Store Cleaning Audit ': inputData.moduleType == 'scrum'? 'Scrum Identification':( inputData.moduleType ).split( '-' ).join( ' ' ),
       fileDate: msg.fileDate,
       question: msg.question,
       questionType: msg.questionType,
@@ -3605,7 +3606,123 @@ export async function overviewTable( req, res ) {
     if ( inputData.filterByStatus.length > 0 ) {
       [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )? filters.push( { status: { $in: inputData.filterByStatus } } ):filters.push( { auditStatus: { $in: inputData.filterByStatus } } );
     }
-
+    let traxAuditDataQuery={};
+    let traxAuditDataFilter = [];
+    switch ( inputData.moduleType ) {
+      case 'unattended-customer':
+        traxAuditDataQuery= {
+          fileDate: '$fileDate', storeId: '$storeId', tempId: '$tempId', moduleType: '$moduleType',
+        };
+        traxAuditDataFilter=[ {
+          $eq: [ '$fileDate', '$$fileDate' ],
+        },
+        {
+          $eq: [ '$storeId', '$$storeId' ],
+        },
+        {
+          $eq: [ '$tempId', '$$tempId' ],
+        },
+        {
+          $eq: [ '$moduleType', '$$moduleType' ],
+        },
+        ];
+        break;
+      case 'left-in-middle':
+        traxAuditDataQuery= {
+          fileDate: '$fileDate', storeId: '$storeId', tempId: '$tempId', moduleType: '$moduleType',
+        };
+        traxAuditDataFilter=[ {
+          $eq: [ '$fileDate', '$$fileDate' ],
+        },
+        {
+          $eq: [ '$storeId', '$$storeId' ],
+        },
+        {
+          $eq: [ '$question', '$$question' ],
+        },
+        {
+          $eq: [ '$moduleType', '$$moduleType' ],
+        },
+        ];
+        break;
+      case 'uniform-detection':
+      case 'mobile-detection':
+      case 'scrum':
+      case 'cleaning':
+        traxAuditDataQuery= {
+          fileDate: '$fileDate', storeId: '$storeId', moduleType: '$moduleType',
+        };
+        traxAuditDataFilter=[ {
+          $eq: [ '$fileDate', '$$fileDate' ],
+        },
+        {
+          $eq: [ '$storeId', '$$storeId' ],
+        },
+        {
+          $eq: [ '$moduleType', '$$moduleType' ],
+        },
+        ];
+        break;
+      case 'camera-angle-change':
+        traxAuditDataQuery= {
+          fileDate: '$fileDate', storeId: '$storeId', moduleType: '$moduleType', streamName: '$streamName',
+        };
+        traxAuditDataFilter=[ {
+          $eq: [ '$fileDate', '$$fileDate' ],
+        },
+        {
+          $eq: [ '$storeId', '$$storeId' ],
+        },
+        {
+          $eq: [ '$streamName', '$$streamName' ],
+        },
+        {
+          $eq: [ '$moduleType', '$$moduleType' ],
+        },
+        ];
+        break;
+      case 'hygiene':
+        traxAuditDataQuery= {
+          fileDate: '$fileDate', storeId: '$storeId', moduleType: '$moduleType', zoneName: '$zoneName',
+        };
+        traxAuditDataFilter=[ {
+          $eq: [ '$fileDate', '$$fileDate' ],
+        },
+        {
+          $eq: [ '$storeId', '$$storeId' ],
+        },
+        {
+          $eq: [ '$zoneName', '$$zoneName' ],
+        },
+        {
+          $eq: [ '$moduleType', '$$moduleType' ],
+        },
+        ];
+        break;
+      case 'eye-test-camera':
+        traxAuditDataQuery= {
+          fileDate: '$fileDate', storeId: '$storeId', moduleType: '$moduleType', question: '$question', streamName: '$streamName',
+        };
+        traxAuditDataFilter=[ {
+          $eq: [ '$fileDate', '$$fileDate' ],
+        },
+        {
+          $eq: [ '$storeId', '$$storeId' ],
+        },
+        {
+          $eq: [ '$question', '$$question' ],
+        },
+        {
+          $eq: [ '$streamName', '$$streamName' ],
+        },
+        {
+          $eq: [ '$moduleType', '$$moduleType' ],
+        },
+        ];
+        break;
+      default:
+        return res.sendError( 'Please give valid modueType', 400 );
+    }
     const query =[
       {
         $match: {
@@ -3616,24 +3733,12 @@ export async function overviewTable( req, res ) {
       {
         $lookup: {
           from: 'traxAuditData',
-          let: {
-            fileDate: '$fileDate', storeId: '$storeId', zoneName: '$zoneName',
-          },
+          let: traxAuditDataQuery,
           pipeline: [
             {
               $match: {
                 $expr: {
-                  $and: [
-                    {
-                      $eq: [ '$fileDate', '$$fileDate' ],
-                    },
-                    {
-                      $eq: [ '$storeId', '$$storeId' ],
-                    },
-                    {
-                      $eq: [ '$zoneName', '$$zoneName' ],
-                    },
-                  ],
+                  $and: traxAuditDataFilter,
                 },
               },
             },
@@ -3887,7 +3992,7 @@ export async function getDetectionAuditFile( req, res ) {
         if ( !consumer ) {
           logger.error( {
             error: consumer,
-            function: `getAuditFile - ${inputData.moduleType}`,
+            function: `getDetectionAuditFile - ${inputData.moduleType}`,
             message: 'SQS Receive queue is empty',
           } );
           return res.sendError( `${inputData.queueName} is Empty`, 204 );

package/src/validation/traxAuditValidation.js

@@ -80,14 +80,9 @@ export async function isTraxAuditDocumentExist( req, res, next ) {
         };
         break;
       case 'uniform-detection':
-        query ={
-          storeId: inputData.storeId,
-          fileDate: inputData.fileDate,
-          // tempId: inputData.tempId,
-          moduleType: inputData.moduleType,
-        };
-        break;
       case 'mobile-detection':
+      case 'scrum':
+      case 'cleaning':
         query ={
           storeId: inputData.storeId,
           fileDate: inputData.fileDate,
@@ -95,18 +90,10 @@ export async function isTraxAuditDocumentExist( req, res, next ) {
         };
         break;
       case 'camera-angle-change':
-        query ={
-          storeId: inputData.storeId,
-          fileDate: inputData.fileDate,
-          streamName: inputData.streamName,
-          moduleType: inputData.moduleType,
-        };
-        break;
       case 'eye-test-camera':
         query ={
           storeId: inputData.storeId,
           fileDate: inputData.fileDate,
-          // question: inputData.question,
           streamName: inputData.streamName,
           moduleType: inputData.moduleType,
         };