tango-app-api-audit 3.5.1 → 3.5.3

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -65,7 +65,7 @@ import { aggregateBinaryAudit } from '../service/binaryAudit.service.js';
 import { aggregateTraxAuditData, findOneTraxAuditData } from '../service/traxAuditData.service.js';
 import { bulkWriteAuditUserWallet, createAuditUserWallet, findOneAuditUserWallet } from '../service/auditUserWallet.service.js';
 import { updateOneAuditUsers } from '../service/auditUsers.service.js';
-import { bulkUpdate, clearScroll, upsertOpenSearchData, scrollResponse, searchOpenSearchData } from 'tango-app-api-middleware/src/utils/openSearch.js';
+import { bulkUpdate, clearScroll, upsertOpenSearchData, scrollResponse, searchOpenSearchData, updateOpenSearchData } from 'tango-app-api-middleware/src/utils/openSearch.js';
 // import { aggregateAuditUsers } from '../service/auditUsers.service.js';
 
 /*           < -- *** Configuration ***   -->      */
@@ -539,32 +539,36 @@ export async function getAuditFile( req, res ) {
 
     const getQuery = {
       size: inputData?.limit || 2,
-      _source: [ 'module', 'date', 'store_id', 'outputCluster', 'personPath', 'isEmployee', 'isJunk' ], // Only fetch necessary fields
+      _source: [ 'module', 'status', 'date', 'store_id', 'outputCluster', 'personPath', 'isEmployee', 'isJunk', 'EmployeeStatusFinal' ], // Only fetch necessary fields
 
       query: {
         bool: {
-          must: [
+          'must': [
             {
               term: { 'store_id.keyword': msg.store_id },
             },
-            // {
-            //   term: { isJunk: false },
-            // },
-            {
-              term: { isEmployee: false },
-            },
             {
               term: { 'date.keyword': msg.curr_date },
             },
             {
               term: { 'module.keyword': 'CUSTOMER' },
             },
+            {
+              term: { 'status.keyword': 'PP_CLUSTER_FORMED' },
+            },
+            {
+              terms: { EmployeeStatusFinal: [ 1, 2 ] },
+            },
           ],
+          'should': [
+            { 'term': { 'isJunk': false } },
+            { 'bool': { 'must_not': { 'exists': { 'field': 'isJunk' } } } },
+          ],
+          'minimum_should_match': 1,
         },
       },
 
     };
-
     const list = msg.zone_id === 'track' ? inputData.nextId? await scrollResponse( inputData.nextId ):await searchOpenSearchData( msg.index_name, getQuery ): await listFileByPath( fetchData );
     const folderPath = msg.zone_id === 'track' ? list?.body?.hits?.hits : list.data;
     const nextQuery =msg.zone_id !== 'track' ? list.pageToken: '';
@@ -618,7 +622,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 +643,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,
@@ -656,6 +660,9 @@ export async function getAuditFile( req, res ) {
         insertData = userDetails[0];
       }
     } else if ( inputData.nextId !== '' && inputData.nextId !== null && inputData.nextId !== undefined && inputData.moduleType === 'track' ) {
+      if ( !list ) {
+        return res.sendError( 'token expired', 404 );
+      }
       list.body._scroll_id = '';
       insertData = userDetails[0];
     } else {
@@ -705,7 +712,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,
@@ -720,7 +727,7 @@ export async function getAuditFile( req, res ) {
       message: req.query,
       function: 'getAuditFile',
     } );
-    return res.sendError( error, 500 );
+    return res.sendError( error.message, 500 );
   }
 }
 function addUniqueFile( files, newFile ) {
@@ -1694,7 +1701,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 +3116,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 );
     }
@@ -3237,7 +3244,16 @@ export async function reTrigger( req, res ) {
         };
         await insertOpenSearchData( openSearch.auditLog, logData );
     }
+    const updateQuery ={
+      module: 'REID-TRACKER-V1',
+      store_date_time: `${inputData.storeId}_${inputData.fileDate}_23:00`,
+      status: 'POSTPROCESS_AUDIT_INITIATED',
+      statusvb_time: Math.floor( Date.now() / 1000 ),
+      timestamp: new Date(),
+    };
+
 
+    await updateOpenSearchData( 'tracker_process', `${inputData.storeId}_${inputData.fileDate}_23:00`, { doc: updateQuery } );
     return res.sendSuccess( { result: 'The File has been Re-Triggered Succesfully' } );
   } catch ( error ) {
     const err = error.message;

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 {