tango-app-api-audit 3.5.13 → 3.5.14

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -256,8 +256,7 @@ export async function getAuditFile( req, res ) {
       ];
     }
     const auditInsertData = inserQuery? await aggregateAuditStoreData( inserQuery ): null;
-    const auditStatus =
-      userDetails && userDetails.length > 0 ? userDetails[0].auditStatus : null;
+    const auditStatus = userDetails && userDetails.length > 0 ? userDetails[0].auditStatus : null;
     switch ( auditStatus ) {
       case null:
         const query = [
@@ -397,7 +396,7 @@ export async function getAuditFile( req, res ) {
           address: '$storeProfile.address',
         };
         const storeDetails = await findOneStore( storeQuery, storeFields );
-        res.sendSuccess( {
+        return res.sendSuccess( {
           result: result,
           storeId: storeDetails?.storeId,
           storeName: storeDetails?.storeName,
@@ -537,7 +536,6 @@ export async function getAuditFile( req, res ) {
         fetchData.ContinuationToken = decodeURIComponent( inputData.nextId );
       }
     }
-    logger.info( { msg: msg, leve: '............1' } );
     const getQuery = msg.audit_type =='ReAudit'?
     {
       size: inputData?.limit || 500,
@@ -600,7 +598,6 @@ export async function getAuditFile( req, res ) {
     };
     logger.info( { fetchData: fetchData, msg: msg, inputData: inputData, type: 'debug-bucketNameIssue' } );
     const list = msg.zone_id === 'track' ? inputData.nextId? await scrollResponse( inputData.nextId ):await searchOpenSearchData( msg.index_name, getQuery ): await listFileByPath( fetchData );
-    logger.info( { list: list, msg: msg, level: '.........2' } );
     const folderPath = msg.zone_id === 'track' ? list?.body?.hits?.hits : list.data;
     const nextQuery =msg.zone_id !== 'track' ? list.pageToken: '';
     if ( msg.zone_id === 'track' ) {
@@ -608,10 +605,12 @@ export async function getAuditFile( req, res ) {
         await clearScroll( list?.body?._scroll_id );
       }
     }
+
     if ( folderPath?.length > 0 ) {
       for ( let i = 0; i < folderPath.length; i++ ) {
         const img =msg.zone_id === 'track' ?folderPath[i]?._source?.personPath?.split( '/' ): folderPath[i].Key.split( '/' );
         const image = img[3]?.split( '.' );
+        logger.info( { msg: msg, auditType: msg.audit_type, outputCluster: folderPath[i]?._source?.outputCluster, reidCLu: folderPath[i]?._source?.REIDCluster, level: '................2' } );
         const indexes = msg.zone_id === 'track' ? msg.audit_type === 'ReAudit'? folderPath[i]?._source?.outputCluster ===50000? folderPath[i]?._source?.REIDCluster:folderPath[i]?._source?.outputCluster:folderPath[i]?._source?.REIDCluster: image[0]?.split( '_' );
         fetchData.file_path = msg.zone_id === 'track' ?folderPath[i]?._source?.personPath:folderPath[i].Key;
         const data =msg.zone_id === 'track' ? `${url.trackInput}${folderPath[i]?._source?.personPath}` :await signedUrl( fetchData );
@@ -670,7 +669,7 @@ export async function getAuditFile( req, res ) {
           fileDate: msg.curr_date,
           moduleType: inputData.moduleType,
         };
-        const storeRecord = {
+        const storeRecord = msg.audit_type !== 'ReAudit' ?{
           userId: req.user._id,
           storeId: msg.store_id,
           clientId: msg.store_id.split( '-' )[0],
@@ -683,6 +682,11 @@ export async function getAuditFile( req, res ) {
           timeSpent: 0,
           zoneName: msg.zone_id,
           moduleType: inputData.moduleType,
+        }: {
+          userId: req.user._id,
+          auditType: msg.audit_type || 'ReAudit',
+          status: 'inprogress',
+          timeSpent: 0,
         };
 
         insertData = await createUserAudit( record );
@@ -763,6 +767,7 @@ export async function getAuditFile( req, res ) {
 }
 function addUniqueFile( files, newFile ) {
   const exists = files.some( ( file ) => file.img_name === newFile.img_name );
+  logger.info( { files: files, exists: exists, newFile: newFile, message: '.........1' } );
   if ( !exists ) {
     files.push( newFile );
   }
@@ -1446,146 +1451,145 @@ export async function save( req, res ) {
         return res.sendError( mappingUpload, 500 );
       }
     } else {
-      // Junk Mapping
       let junkCount = [];
       let empCount = [];
       let customerCount = [];
-      if ( inputData.junkCount >0 ) {
-        const chunkedJunkMappingData = await filteredMap( inputData.junk );
-        junkCount = chunkedJunkMappingData;
-        let filter = [
-          {
-            term: { 'store_id.keyword': inputData.storeId },
-          },
-          {
-            term: { 'date.keyword': inputData.fileDate },
-          },
-          {
-            term: { 'module.keyword': 'CUSTOMER' },
-          },
-          {
-            terms: { REIDCluster: chunkedJunkMappingData },
-          },
-        ];
 
-        logger.info( { chunkedJunkMappingData: chunkedJunkMappingData } );
-        const getQuery = {
-          size: 10000,
-          _source: false, // do not fetch full source
-          stored_fields: [], // exclude all stored fields
-          query: {
-            bool: {
-              must: filter,
-            },
-          },
+      // Junk Mapping
+      const junkPromise = ( async () => {
+        if ( inputData.junkCount > 0 ) {
+          const chunkedJunkMappingData = await filteredMap( inputData.junk );
+          junkCount = chunkedJunkMappingData;
+
+          const filter = [
+            { term: { 'store_id.keyword': inputData.storeId } },
+            { term: { 'date.keyword': inputData.fileDate } },
+            { term: { 'module.keyword': 'CUSTOMER' } },
+            // { terms: { REIDCluster: chunkedJunkMappingData } },
+          ];
+
+          const getQuery = {
+            size: 10000,
+            _source: false,
+            stored_fields: [],
+            query: { bool: { should: [
+              { terms: { outputCluster: chunkedJunkMappingData } },
+              { terms: { REIDCluster: chunkedJunkMappingData } },
+            ],
+            minimum_should_match: 1, must: filter } },
+          };
 
-        };
-        const getId = await getOpenSearchData( openSearch.trackerInput, getQuery );
-        const ids = getId?.body?.hits?.total?.value || null;
-        if ( ids ) {
-          const temp = getId?.body?.hits?.hits?.map( ( item ) => item._id );
-          const updatedField = { isJunk: true }; // your field updates
-          const body = temp.flatMap( ( id ) => [
-            { update: { _index: openSearch.trackerInput, _id: id } },
-            { doc: updatedField },
-          ] );
-          const re= await bulkUpdate( body );
-          logger.info( { getId: getId, re: re, storeId: inputData.storeId, fileDate: inputData.fileDate, function: 'tracking save - junk' } );
-        }
-      }
+          const getId = await getOpenSearchData( openSearch.trackerInput, getQuery );
+          const temp = getId?.body?.hits?.hits?.map( ( item ) => item._id ) || [];
 
+          if ( temp.length ) {
+            const body = temp.flatMap( ( id ) => [
+              { update: { _index: openSearch.trackerInput, _id: id } },
+              { doc: { isJunk: true } },
+            ] );
+            await bulkUpdate( body );
+          }
+        }
+      } )();
 
       // Employee Mapping
 
-      if ( inputData.employeeCount >0 ) {
-        const chunkedEmpMappingData = await filteredMap( inputData.employee );
-        empCount = chunkedEmpMappingData;
-        const getQuery = {
-          size: 10000,
-          _source: false, // do not fetch full source
-          stored_fields: [], // exclude all stored fields
-          query: {
-            bool: {
-              must: [
-                {
-                  term: { 'store_id.keyword': inputData.storeId },
-                },
-                {
-                  terms: { REIDCluster: chunkedEmpMappingData },
-                },
-                {
-                  term: { 'date.keyword': inputData.fileDate },
-                },
-                {
-                  term: { 'module.keyword': 'CUSTOMER' },
-                },
-              ],
+      const empPromise = ( async () => {
+        if ( inputData.employeeCount > 0 ) {
+          const chunkedEmpMappingData = await filteredMap( inputData.employee );
+          empCount = chunkedEmpMappingData;
+
+          const getQuery = {
+            size: 10000,
+            _source: false,
+            stored_fields: [],
+            query: {
+              bool: {
+                should: [
+                  { terms: { outputCluster: chunkedEmpMappingData } },
+                  { terms: { REIDCluster: chunkedEmpMappingData } },
+                ],
+                minimum_should_match: 1,
+                must: [
+                  { term: { 'store_id.keyword': inputData.storeId } },
+                  { term: { 'date.keyword': inputData.fileDate } },
+                  { term: { 'module.keyword': 'CUSTOMER' } },
+                  // { terms: { REIDCluster: chunkedEmpMappingData } },
+                ],
+              },
             },
-          },
+          };
 
-        };
-        const getId = await getOpenSearchData( openSearch.trackerInput, getQuery );
-        const ids = getId?.body?.hits?.total?.value || null;
-        if ( ids ) {
-          const temp = getId?.body?.hits?.hits?.map( ( item ) => item._id );
+          const getId = await getOpenSearchData( openSearch.trackerInput, getQuery );
+          const temp = getId?.body?.hits?.hits?.map( ( item ) => item._id ) || [];
 
-          const updatedField = { EmployeeStatusFinal: 0 }; // your field updates
-          const body = temp.flatMap( ( id ) => [
-            { update: { _index: openSearch.trackerInput, _id: id } },
-            { doc: updatedField },
-          ] );
-          const re= await bulkUpdate( body );
-          logger.info( { getId: getId, re: re, storeId: inputData.storeId, fileDate: inputData.fileDate, function: 'tracking save - Employee' } );
+          if ( temp.length ) {
+            const body = temp.flatMap( ( id ) => [
+              { update: { _index: openSearch.trackerInput, _id: id } },
+              { doc: { EmployeeStatusFinal: 0 } },
+            ] );
+            await bulkUpdate( body );
+          }
         }
-      }
+      } )();
 
       // Customer Mapping
-      if ( inputData?.customer?.length > 0 ) {
-        const filterCustomerData = await filteredCustomerMap( inputData.customer );
-        const chunkedMappingData = await chunkArray( filterCustomerData, 10 );
-
-        chunkedMappingData.map( async ( chunk ) => {
-          chunk.map( async ( item ) => {
-            const imgName= item.img_name;
-            const mappedId= item.mappedid.map( ( m ) => m.img_name );
-            customerCount.push( ...mappedId );
-            const searchQuery = {
-              size: 10000,
-              _source: false, // do not fetch full source
-              stored_fields: [], // exclude all stored fields
-              query: {
-                bool: {
-                  must: [
-                    {
-                      term: { 'store_id.keyword': inputData.storeId },
-                    },
-                    {
-                      terms: { REIDCluster: mappedId },
-                    },
-                    {
-                      term: { 'date.keyword': inputData.fileDate },
-                    },
-                    {
-                      term: { 'module.keyword': 'CUSTOMER' },
-                    },
-                  ],
+
+      const customerPromise = ( async () => {
+        if ( inputData?.customer?.length > 0 ) {
+          const filterCustomerData = await filteredCustomerMap( inputData.customer );
+          const chunkedMappingData = await chunkArray( filterCustomerData, 10 );
+
+          for ( const chunk of chunkedMappingData ) {
+            for ( const item of chunk ) {
+              const imgName = item.img_name;
+              const mappedId = item.mappedid.map( ( m ) => m.img_name );
+              customerCount.push( ...mappedId );
+
+              const searchQuery = {
+                size: 10000,
+                _source: false,
+                stored_fields: [],
+                query: {
+                  bool: {
+                    should: [
+                      { terms: { outputCluster: mappedId } },
+                      { terms: { REIDCluster: mappedId } },
+                    ],
+                    minimum_should_match: 1,
+                    must: [
+                      { term: { 'store_id.keyword': inputData.storeId } },
+                      { term: { 'date.keyword': inputData.fileDate } },
+                      { term: { 'module.keyword': 'CUSTOMER' } },
+                    ],
+                  },
                 },
-              },
+              };
 
-            };
-            const getData =await getOpenSearchData( openSearch.trackerInput, searchQuery );
-            if ( getData?.body?.hits?.hits?.length > 0 ) {
-              const temp = getData?.body?.hits?.hits?.map( ( item ) => item._id );
-              const body = temp.flatMap( ( id ) => [
-                { update: { _index: openSearch.trackerInput, _id: id } },
-                { doc: { outputCluster: imgName, auditOutputCluster: imgName, EmployeeStatusFinal: 1, isJunk: false } },
-              ] );
-              const re= await bulkUpdate( body );
-              logger.info( { re: re, storeId: inputData.storeId, fileDate: inputData.fileDate, function: 'tracking save - customer' } );
+              const getData = await getOpenSearchData( openSearch.trackerInput, searchQuery );
+              const temp = getData?.body?.hits?.hits?.map( ( item ) => item._id ) || [];
+
+              if ( temp.length ) {
+                const body = temp.flatMap( ( id ) => [
+                  { update: { _index: openSearch.trackerInput, _id: id } },
+                  {
+                    doc: {
+                      outputCluster: imgName,
+                      auditOutputCluster: imgName,
+                      EmployeeStatusFinal: 1,
+                      isJunk: false,
+                    },
+                  },
+                ] );
+                await bulkUpdate( body );
+              }
             }
-          } );
-        } );
-      }
+          }
+        }
+      } )();
+
+      // Wait for all above tasks to complete
+      await Promise.all( [ junkPromise, empPromise, customerPromise ] );
 
       if ( inputData.auditType !== 'ReAudit' ) {
         // junk Mapping
@@ -3329,6 +3333,7 @@ export async function reTrigger( req, res ) {
       fileDate: inputData.fileDate,
       zoneName: inputData.zoneName,
     };
+    const getIndex =inputData.moduleType == 'track'? await findOneStoreData( query, { sqs: 1 } ):null;
     const getQueueName = await findOneClient( { clientId: req.audit.clientId }, { 'auditConfigs': 1 } );
     const queueName = inputData.moduleType == 'zone' ? getQueueName?.auditConfigs?.zoneQueueName :inputData.moduleType == 'track'?getQueueName?.auditConfigs?.trackQueueName: getQueueName?.auditConfigs?.trafficQueueName;
     if ( !getQueueName || queueName == '' ) {
@@ -3342,6 +3347,7 @@ export async function reTrigger( req, res ) {
           curr_date: inputData.fileDate,
           audit_type: inputData.auditType,
           total_count: inputData.totalCount,
+          ...( getIndex? { index_name: getIndex?.sqs?.Body?.index_name }:null ),
         };
 
         const sqsProduceQueue = {