tango-app-api-audit 3.5.1 → 3.5.2

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -543,13 +543,11 @@ export async function getAuditFile( req, res ) {
 
       query: {
         bool: {
-          must: [
+          'must': [
             {
               term: { 'store_id.keyword': msg.store_id },
             },
-            // {
-            //   term: { isJunk: false },
-            // },
+
             {
               term: { isEmployee: false },
             },
@@ -560,6 +558,11 @@ export async function getAuditFile( req, res ) {
               term: { 'module.keyword': 'CUSTOMER' },
             },
           ],
+          'should': [
+            { 'term': { 'isJunk': false } },
+            { 'bool': { 'must_not': { 'exists': { 'field': 'isJunk' } } } },
+          ],
+          'minimum_should_match': 1,
         },
       },
 
@@ -618,7 +621,7 @@ export async function getAuditFile( req, res ) {
           userId: req.user._id,
           storeId: msg.store_id,
           clientId: msg.store_id.split( '-' )[0],
-          auditType: 'Audit',
+          auditType: msg.audit_type || 'Audit',
           fileDate: msg.curr_date,
           queueName: inputData.queueName,
           beforeCount: msg.total_count || files.length,
@@ -639,7 +642,7 @@ export async function getAuditFile( req, res ) {
           userId: req.user._id,
           storeId: msg.store_id,
           clientId: msg.store_id.split( '-' )[0],
-          auditType: 'Audit',
+          auditType: msg.audit_type ||'Audit',
           fileDate: msg.curr_date,
           queueName: inputData.queueName,
           beforeCount: msg.total_count || files.length,
@@ -705,7 +708,7 @@ export async function getAuditFile( req, res ) {
         queueName: inputData.queueName,
         store_id: storeId,
         file_date: fileDate,
-        type: 'Audit',
+        type: msg.audit_type || 'Audit',
         auditId: insertData._id,
         userId: insertData.userId,
         zoneName: msg.zone_id,
@@ -1694,7 +1697,7 @@ export async function save( req, res ) {
           { 'module': 'REID-TRACKER-V1',
             'store_date_time': `${inputData.storeId}_${inputData.fileDate}_23:00`,
             'status': 'POSTPROCESS_AUDIT_SUCCESS',
-            'status_time': Date.now(),
+            'status_time': Math.floor( Date.now() / 1000 ),
             'timestamp': new Date() };
 
 
@@ -3109,7 +3112,7 @@ export async function reTrigger( req, res ) {
       zoneName: inputData.zoneName,
     };
     const getQueueName = await findOneClient( { clientId: req.audit.clientId }, { 'auditConfigs': 1 } );
-    const queueName = inputData.moduleType == 'zone' ? getQueueName?.auditConfigs?.zoneQueueName : getQueueName?.auditConfigs?.trafficQueueName;
+    const queueName = inputData.moduleType == 'zone' ? getQueueName?.auditConfigs?.zoneQueueName :inputData.moduleType == 'track'?getQueueName?.auditConfigs?.trackQueueName: getQueueName?.auditConfigs?.trafficQueueName;
     if ( !getQueueName || queueName == '' ) {
       return res.sendError( 'queueName does not create', 400 );
     }

package/src/validation/audit.validation.js

@@ -173,7 +173,11 @@ export async function isAuditInputFolderExist( req, res, next ) {
       Bucket: bucket.auditInput,
       Key: `${inputData.fileDate}/${inputData.storeId}/${inputData.zoneName}`,
     };
-    const isExist = await checkFileExist( params );
+    const trackParams={
+      Bucket: 'v4rnd-audit-input-images',
+      Key: `${inputData.storeId}/${inputData.fileDate}`,
+    };
+    const isExist = await checkFileExist( inputData.moduleType == 'track'? trackParams:params );
     if ( isExist ) {
       next();
     } else {