tango-app-api-audit 3.5.0 → 3.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.5.0",
+    "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 );
     }
@@ -3567,36 +3570,8 @@ export async function overviewTable( req, res ) {
           afterCount: 1,
           auditType: 1,
           status: 1,
-          // userId: 1,
-        },
-      },
-      // {
-      //   $lookup: {
-      //     from: 'users',
-      //     let: { userId: '$userId' },
-      //     pipeline: [
-      //       {
-      //         $match: {
-      //           $expr: {
-      //             $eq: [ '$_id', '$$userId' ],
-      //           },
-      //         },
-      //       },
-      //       {
-      //         $project: {
-      //           userName: 1,
-      //           userEmail: '$email',
-      //         },
-      //       },
-      //     ], as: 'user',
-      //   },
-      // },
-      // {
-      //   $unwind: {
-      //     path: '$user',
-      //     preserveNullAndEmptyArrays: true,
-      //   },
-      // },
+        },
+      },
       {
         $project: {
           storeId: 1,
@@ -3608,8 +3583,6 @@ export async function overviewTable( req, res ) {
           afterCount: 1,
           auditType: 1,
           status: 1,
-          // userName: '$user.userName',
-          // userEmail: '$user.userEmail',
 
         },
       },
@@ -3625,8 +3598,6 @@ export async function overviewTable( req, res ) {
             { status: { $regex: inputData.searchValue, $options: 'i' } },
             { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
             { zoneName: { $regex: inputData.searchValue, $options: 'i' } },
-            // { userName: { $regex: inputData.searchValue, $options: 'i' } },
-            // { userEmail: { $regex: inputData.searchValue, $options: 'i' } },
           ],
 
         },
@@ -4748,38 +4719,42 @@ export async function auditViewLogs( req, res ) {
     let logsQuery;
     const parsedOpenSearch = JSON.parse( process.env.OPENSEARCH );
     const logData =[];
-    if ( inputData.moduleType == 'traffic' ||inputData.moduleType == 'zone' ) {
+    if ( inputData.moduleType == 'traffic' ||inputData.moduleType == 'zone'||inputData.moduleType == 'track' ) {
+      const filter = [
+        {
+          'term': {
+            'logData.fileDate.keyword': inputData.fileDate,
+          },
+        },
+        {
+          'term': {
+            'logData.storeId.keyword': inputData.storeId,
+          },
+        },
+        {
+          'term': {
+            'logData.moduleType.keyword': inputData.moduleType,
+          },
+        },
+        {
+          'terms': {
+            'logSubType.keyword': [ 'auditDone', 'reTrigger' ],
+          },
+        },
+      ];
+      if ( inputData.moduleType !== 'track' ) {
+        filter.push( {
+          'term': {
+            'logData.zoneName.keyword': inputData.zoneName,
+          },
+        } );
+      }
+
       logsQuery = {
         'size': 100,
         'query': {
           'bool': {
-            'must': [
-              {
-                'term': {
-                  'logData.fileDate.keyword': inputData.fileDate,
-                },
-              },
-              {
-                'term': {
-                  'logData.storeId.keyword': inputData.storeId,
-                },
-              },
-              {
-                'term': {
-                  'logData.moduleType.keyword': inputData.moduleType,
-                },
-              },
-              {
-                'term': {
-                  'logData.zoneName.keyword': inputData.zoneName,
-                },
-              },
-              {
-                'terms': {
-                  'logSubType.keyword': [ 'auditDone', 'reTrigger' ],
-                },
-              },
-            ],
+            'must': filter,
           },
         },
       };

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 {