tango-app-api-audit 3.4.69-beta.0 → 3.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.69-beta.0",
+    "version": "3.5.1",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -27,7 +27,7 @@
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
         "tango-api-schema": "^2.2.113",
-        "tango-app-api-middleware": "^3.1.75",
+        "tango-app-api-middleware": "^3.1.76",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

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, scrollResponse, searchOpenSearchData } from 'tango-app-api-middleware/src/utils/openSearch.js';
+import { bulkUpdate, clearScroll, upsertOpenSearchData, scrollResponse, searchOpenSearchData } from 'tango-app-api-middleware/src/utils/openSearch.js';
 // import { aggregateAuditUsers } from '../service/auditUsers.service.js';
 
 /*           < -- *** Configuration ***   -->      */
@@ -539,7 +539,7 @@ export async function getAuditFile( req, res ) {
 
     const getQuery = {
       size: inputData?.limit || 2,
-      _source: [ 'module', 'date', 'store_id', 'outputCluster', 'personPath', 'isEmployee' ], // Only fetch necessary fields
+      _source: [ 'module', 'date', 'store_id', 'outputCluster', 'personPath', 'isEmployee', 'isJunk' ], // Only fetch necessary fields
 
       query: {
         bool: {
@@ -547,6 +547,9 @@ export async function getAuditFile( req, res ) {
             {
               term: { 'store_id.keyword': msg.store_id },
             },
+            // {
+            //   term: { isJunk: false },
+            // },
             {
               term: { isEmployee: false },
             },
@@ -1530,7 +1533,7 @@ export async function save( req, res ) {
               const temp = getData?.body?.hits?.hits?.map( ( item ) => item._id );
               const body = temp.flatMap( ( id ) => [
                 { update: { _index: 'tracker_process', _id: id } },
-                { doc: { outputCluster: imgName } },
+                { doc: { outputCluster: imgName, isEmployee: false, isJunk: false } },
               ] );
               const re= await bulkUpdate( body );
               logger.info( { re: re } );
@@ -1669,22 +1672,34 @@ export async function save( req, res ) {
             timeSpent: inputData.timeSpent,
           },
       );
-      const sqsProduceQueue = {
-        QueueUrl: ( auditConfig?.isCheckMinAfterCount ==1 && inputData.customerCount > auditConfig?.minAfterCount ) ? `${sqs.url}${sqs.feature_new}`: `${sqs.url}${sqs.feature}`,
-        MessageBody: JSON.stringify( {
-          store_id: inputData.storeId,
-          store_date: inputData.fileDate,
-          bucket_name: `${bucket.auditUploadBucket}`,
-          zone_id: inputData.zoneName,
-          process_type: 'audit',
-        } ),
-      };
-      logger.info( { sqsProduceQueue: sqsProduceQueue } );
-      const sqsQueue = await sendMessageToQueue(
-          sqsProduceQueue.QueueUrl,
-          sqsProduceQueue.MessageBody,
-      );
-      logger.info( { sqsQueue: sqsQueue } );
+      if ( inputData.moduleType !== 'track' ) {
+        const sqsProduceQueue = {
+          QueueUrl: ( auditConfig?.isCheckMinAfterCount ==1 && inputData.customerCount > auditConfig?.minAfterCount ) ? `${sqs.url}${sqs.feature_new}`: `${sqs.url}${sqs.feature}`,
+          MessageBody: JSON.stringify( {
+            store_id: inputData.storeId,
+            store_date: inputData.fileDate,
+            bucket_name: `${bucket.auditUploadBucket}`,
+            zone_id: inputData.zoneName,
+            process_type: 'audit',
+          } ),
+        };
+        logger.info( { sqsProduceQueue: sqsProduceQueue } );
+        const sqsQueue = await sendMessageToQueue(
+            sqsProduceQueue.QueueUrl,
+            sqsProduceQueue.MessageBody,
+        );
+        logger.info( { sqsQueue: sqsQueue } );
+      } else {
+        const query =
+          { 'module': 'REID-TRACKER-V1',
+            'store_date_time': `${inputData.storeId}_${inputData.fileDate}_23:00`,
+            'status': 'POSTPROCESS_AUDIT_SUCCESS',
+            'status_time': Date.now(),
+            'timestamp': new Date() };
+
+
+        await upsertOpenSearchData( 'tracker_process', `${inputData.storeId}_${inputData.fileDate}_23:00`, { doc: query } );
+      }
     }
 
     return res.sendSuccess( { result: 'Updated Successfully' } );
@@ -3552,36 +3567,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,
@@ -3593,8 +3580,6 @@ export async function overviewTable( req, res ) {
           afterCount: 1,
           auditType: 1,
           status: 1,
-          // userName: '$user.userName',
-          // userEmail: '$user.userEmail',
 
         },
       },
@@ -3610,8 +3595,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' } },
           ],
 
         },
@@ -4733,38 +4716,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,
           },
         },
       };