tango-app-api-audit 3.6.39 → 3.6.41

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.6.39",
+    "version": "3.6.41",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -28,7 +28,7 @@
         "nodemailer": "^7.0.10",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.3.28",
+        "tango-api-schema": "^2.5.27",
         "tango-app-api-middleware": "^3.6.8",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/traxAudit.controllers.js

@@ -483,6 +483,11 @@ export async function getAuditFile( req, res ) {
     const start = data.start;
     const end = data.end;
     let msg = {};
+    let clientConfig;
+    if ( inputData?.moduleType === 'unattended-customer' ) {
+      clientConfig = await findOneClient( { 'auditConfigs.traxQueueName.unattendedCustomer': inputData?.queueName }, { clientId: 1, auditConfigs: 1 } );
+    }
+    const isZoneAudit = clientConfig?.auditConfigs?.unattendedAuditZone || false;
     const userQuery = [
       {
         $match: {
@@ -533,6 +538,7 @@ export async function getAuditFile( req, res ) {
               storeId: userDetails[0].storeId,
               fileDate: userDetails[0].fileDate,
               tempId: userDetails[0].tempId,
+              ...( isZoneAudit && { zoneName: userDetails[0].zoneName } ),
               moduleType: userDetails[0].moduleType,
             };
             break;
@@ -759,12 +765,13 @@ export async function getAuditFile( req, res ) {
         fileDateISO: start,
         timeSpent: 0,
         startTime: new Date(),
-        tempId: msg.tempId,
-        fileDetails: msg.fileDetails,
-        inputBucketName: msg.inputBucketName,
-        question: msg.question,
-        questionType: msg.questionType,
-        streamName: msg.streamName,
+        tempId: msg?.tempId,
+        fileDetails: msg?.fileDetails,
+        inputBucketName: msg?.inputBucketName,
+        question: msg?.question,
+        questionType: msg?.questionType,
+        streamName: msg?.streamName,
+        zoneName: msg?.zoneName,
       };
       record.streamName =[ 'camera-angle-change', 'eye-test-camera', 'anomaly-audit', 'scrum' ].includes( inputData.moduleType )? msg.streamName : '';
       record.videoDetails = inputData.moduleType == 'left-in-middle'? {
@@ -780,10 +787,11 @@ export async function getAuditFile( req, res ) {
       switch ( inputData.moduleType ) {
         case 'unattended-customer':
           getQuery ={
-            storeId: msg.storeId,
-            fileDate: msg.fileDate,
-            tempId: msg.tempId,
-            moduleType: inputData.moduleType,
+            storeId: msg?.storeId,
+            fileDate: msg?.fileDate,
+            tempId: msg?.tempId,
+            ...( isZoneAudit && { zoneName: msg?.zoneName } ),
+            moduleType: inputData?.moduleType,
           };
           break;
         case 'left-in-middle':
@@ -849,6 +857,7 @@ export async function getAuditFile( req, res ) {
         question: msg.question,
         questionType: msg.questionType,
         streamName: msg.streamName,
+        zoneName: msg?.zoneName || '',
       },
       createdAt: new Date(),
     };
@@ -1098,9 +1107,15 @@ export async function getUpdatedFile( req, res ) {
 export async function saveBinary( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
+    let clientConfig;
+    const inputData = req.body;
+    if ( inputData?.moduleType === 'unattended-customer' ) {
+      clientConfig = await findOneClient( { 'auditConfigs.traxQueueName.unattendedCustomer': inputData?.queueName }, { clientId: 1, auditConfigs: 1 } );
+    }
+    const isZoneAudit = clientConfig?.auditConfigs?.unattendedAuditZone || false;
     const url = JSON.parse( process.env.URL );
     const sqs = JSON.parse( process.env.SQS );
-    const inputData = req.body;
+
     const isoDate = req.userAudit?.startTime;
     const currentTime = dayjs();
     const isoDateTime = dayjs( isoDate );
@@ -1127,17 +1142,21 @@ export async function saveBinary( req, res ) {
         if ( updatDataunattended.modifiedCount==0 ) {
           return res.sendError( 'Update failed, it may be invalid request', 400 );
         }
+
+        const getupdatedData = await findOneBinaryAudit( { _id: inputData.auditId } );
         const getQuery = {
+
           storeId: inputData.storeId,
+          ...( isZoneAudit && { zoneName: getupdatedData?.zoneName } ),
           fileDate: inputData.fileDate,
           tempId: inputData.tempId,
           moduleType: inputData.moduleType,
         };
-        const getupdatedData = await findOneBinaryAudit( getQuery );
         const getTraxInsertData = await findOneTraxAuditData( getQuery, { sqs: 1 } );
         const OpenSearchOutput = {
           clientId: getupdatedData?.clientId,
           storeId: getupdatedData?.storeId,
+          ...( isZoneAudit && { zoneName: getupdatedData?.zoneName } ),
           moduleType: getupdatedData?.moduleType,
           fileDate: getupdatedData?.fileDate,
           auditStatus: getupdatedData?.auditStatus,
@@ -1159,6 +1178,7 @@ export async function saveBinary( req, res ) {
             fileDate: req.userAudit?.fileDate,
             auditType: req.userAudit?.auditType,
             storeId: req.userAudit?.storeId,
+            zoneName: req?.userAudit?.zoneName,
             moduleType: req.userAudit?.moduleType,
             queueName: req.userAudit?.queueName,
             clientId: req.userAudit?.clientId,
@@ -1818,7 +1838,7 @@ export async function saveBinary( req, res ) {
         break;
     }
   } catch ( error ) {
-    const err = error.mesage || error.response?.data || error.response?.status ||'Internal Server Error';
+    const err = error.message || error.response?.data || error.response?.status ||'Internal Server Error';
     logger.error( { error: error, data: req.body, function: 'saveBinary' } );
     return res.sendError( err, 500 );
   }
@@ -1874,7 +1894,7 @@ export async function userAuditHistory( req, res ) {
     switch ( inputData.moduleType ) {
       case 'unattended-customer':
         traxAuditDataQuery= {
-          fileDate: '$fileDate', storeId: '$storeId', tempId: '$tempId', moduleType: '$moduleType',
+          fileDate: '$fileDate', storeId: '$storeId', tempId: '$tempId', moduleType: '$moduleType', zoneName: { $ifNull: [ '$zoneName', '' ] },
         };
         traxAuditDataFilter=[ {
           $eq: [ '$fileDate', '$$fileDate' ],
@@ -1888,6 +1908,12 @@ export async function userAuditHistory( req, res ) {
         {
           $eq: [ '$moduleType', '$$moduleType' ],
         },
+        {
+          $eq: [
+            { $ifNull: [ '$zoneName', '' ] },
+            { $ifNull: [ '$$zoneName', '' ] },
+          ],
+        },
         ];
         break;
       case 'left-in-middle':
@@ -2644,7 +2670,7 @@ export async function storeMetrics( req, res ) {
     switch ( inputData.moduleType ) {
       case 'unattended-customer':
         traxAuditDataQuery= {
-          fileDate: '$fileDate', storeId: '$storeId', tempId: '$tempId', moduleType: '$moduleType',
+          fileDate: '$fileDate', storeId: '$storeId', tempId: '$tempId', moduleType: '$moduleType', zoneName: { $ifNull: [ '$zoneName', '' ] },
         };
         traxAuditDataFilter=[ {
           $eq: [ '$fileDate', '$$fileDate' ],
@@ -2658,6 +2684,12 @@ export async function storeMetrics( req, res ) {
         {
           $eq: [ '$moduleType', '$$moduleType' ],
         },
+        {
+          $eq: [
+            { $ifNull: [ '$zoneName', '' ] },
+            { $ifNull: [ '$$zoneName', '' ] },
+          ],
+        },
         ];
         break;
       case 'left-in-middle':
@@ -3658,7 +3690,7 @@ export async function pendingSummaryTable( req, res ) {
     switch ( inputData.moduleType ) {
       case 'unattended-customer':
         traxAuditDataQuery= {
-          fileDate: '$fileDate', storeId: '$storeId', tempId: '$tempId', moduleType: '$moduleType',
+          fileDate: '$fileDate', storeId: '$storeId', tempId: '$tempId', moduleType: '$moduleType', zoneName: { $ifNull: [ '$zoneName', '' ] },
         };
         traxAuditDataFilter=[ {
           $eq: [ '$fileDate', '$$fileDate' ],
@@ -3672,6 +3704,12 @@ export async function pendingSummaryTable( req, res ) {
         {
           $eq: [ '$moduleType', '$$moduleType' ],
         },
+        {
+          $or: [
+            { $eq: [ '$zoneName', '$$zoneName' ] },
+            { $not: [ { $ifNull: [ '$zoneName', false ] } ] },
+          ],
+        },
         ];
         break;
       case 'left-in-middle':
@@ -4359,7 +4397,7 @@ export async function overviewTable( req, res ) {
     switch ( inputData.moduleType ) {
       case 'unattended-customer':
         traxAuditDataQuery= {
-          fileDate: '$fileDate', storeId: '$storeId', tempId: '$tempId', moduleType: '$moduleType',
+          fileDate: '$fileDate', storeId: '$storeId', tempId: '$tempId', moduleType: '$moduleType', zoneName: { $ifNull: [ '$zoneName', '' ] },
         };
         traxAuditDataFilter=[ {
           $eq: [ '$fileDate', '$$fileDate' ],
@@ -4373,6 +4411,12 @@ export async function overviewTable( req, res ) {
         {
           $eq: [ '$moduleType', '$$moduleType' ],
         },
+        {
+          $eq: [
+            { $ifNull: [ '$zoneName', '' ] },
+            { $ifNull: [ '$$zoneName', '' ] },
+          ],
+        },
         ];
         break;
       case 'left-in-middle':