tango-app-api-audit 3.5.6 → 3.5.7-stage.1

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -537,11 +537,10 @@ export async function getAuditFile( req, res ) {
         fetchData.ContinuationToken = decodeURIComponent( inputData.nextId );
       }
     }
-
-    const getQuery = msg.audit_type =='Audit'?
+    const getQuery = msg.audit_type =='ReAudit'?
     {
       size: inputData?.limit || 2,
-      _source: [ 'module', 'status', 'date', 'store_id', 'personPath', 'REIDCluster', 'EmployeeStatusProposed', 'isJunk', 'EmployeeStatusFinal' ], // Only fetch necessary fields
+      _source: [ 'module', 'status', 'date', 'store_id', 'outputCluster', 'personPath', 'REIDCluster', 'isEmployee', 'isJunk', 'EmployeeStatusFinal' ], // Only fetch necessary fields
 
       query: {
         bool: {
@@ -559,21 +558,21 @@ export async function getAuditFile( req, res ) {
               term: { 'status.keyword': 'PP_CLUSTER_FORMED' },
             },
             {
-              terms: { EmployeeStatusProposed: [ 1, 2 ] },
+              terms: { EmployeeStatusFinal: [ 1, 2 ] },
             },
           ],
-          // 'should': [
-          //   { 'term': { 'isJunk': false } },
-          //   { 'bool': { 'must_not': { 'exists': { 'field': 'isJunk' } } } },
-          // ],
-          // 'minimum_should_match': 1,
+          'should': [
+            { 'term': { 'isJunk': false } },
+            { 'bool': { 'must_not': { 'exists': { 'field': 'isJunk' } } } },
+          ],
+          'minimum_should_match': 1,
         },
       },
 
     }:
     {
       size: inputData?.limit || 2,
-      _source: [ 'module', 'status', 'date', 'store_id', 'outputCluster', 'personPath', 'isEmployee', 'isJunk', 'EmployeeStatusFinal' ], // Only fetch necessary fields
+      _source: [ 'module', 'status', 'date', 'store_id', 'personPath', 'REIDCluster', 'EmployeeStatusProposed', 'isJunk', 'EmployeeStatusFinal' ], // Only fetch necessary fields
 
       query: {
         bool: {
@@ -591,14 +590,9 @@ export async function getAuditFile( req, res ) {
               term: { 'status.keyword': 'PP_CLUSTER_FORMED' },
             },
             {
-              terms: { EmployeeStatusFinal: [ 1, 2 ] },
+              terms: { EmployeeStatusProposed: [ 1, 2 ] },
             },
           ],
-          'should': [
-            { 'term': { 'isJunk': false } },
-            { 'bool': { 'must_not': { 'exists': { 'field': 'isJunk' } } } },
-          ],
-          'minimum_should_match': 1,
         },
       },
 
@@ -615,7 +609,7 @@ export async function getAuditFile( req, res ) {
       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( '.' );
-        const indexes = msg.zone_id === 'track' ? folderPath[i]?._source?.outputCluster || folderPath[i]?._source?.REIDCluster : image[0]?.split( '_' );
+        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 );
         const mapimg = {
@@ -1403,12 +1397,13 @@ export async function save( req, res ) {
         params.Bucket = bucket.auditUploadBucket;
       } else {
         params.Bucket = bucket.masterJson;
+        params.Key = `${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/${bucket.srcMasterJsonFile}`
       }
       const fileData = await getJsonFileData( params );
 
       if ( fileData?.statusCode ) {
         logger.error( {
-          error: `ERROR IN UPLOAD PATH: ${inputData.storeId}/${inputData.fileDate}/${bucket.masterJsonFile}`,
+          error: `ERROR IN UPLOAD PATH: ${params.Key}`,
           type: 'UPLOAD_ERROR',
         } );
         return res.sendError( fileData, 500 );
@@ -1452,7 +1447,7 @@ export async function save( req, res ) {
       // Junk Mapping
       let junkCount = [];
       let empCount = [];
-      // let customerCount = [];
+      let customerCount = [];
       if ( inputData.junkCount >0 ) {
         const chunkedJunkMappingData = await filteredMap( inputData.junk );
         junkCount = chunkedJunkMappingData;
@@ -1466,86 +1461,79 @@ export async function save( req, res ) {
           {
             term: { 'module.keyword': 'CUSTOMER' },
           },
+          {
+            terms: { REIDCluster: chunkedJunkMappingData },
+          },
         ];
-inputData.auditType == 'Audit'? filter.push(
-    {
-      terms: { REIDCluster: chunkedJunkMappingData },
-    },
-):
-filter.push(
-    {
-      terms: { outputCluster: 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,
-    },
-  },
 
-};
-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' } );
-}
+        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,
+            },
+          },
+
+        };
+        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' } );
+        }
       }
 
 
       // 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: { outputCluster: chunkedEmpMappingData },
-                  },
-                  {
-                    term: { 'date.keyword': inputData.fileDate },
-                  },
-                  {
-                    term: { 'module.keyword': 'CUSTOMER' },
-                  },
-                ],
-              },
+
+      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 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 = { 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' } );
-          }
+        };
+        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 = { 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' } );
         }
       }
 
@@ -1558,7 +1546,7 @@ if ( ids ) {
           chunk.map( async ( item ) => {
             const imgName= item.img_name;
             const mappedId= item.mappedid.map( ( m ) => m.img_name );
-            // customerCount=mappedId;
+            customerCount.push( ...mappedId );
             const searchQuery = {
               size: 10000,
               _source: false, // do not fetch full source
@@ -1570,7 +1558,7 @@ if ( ids ) {
                       term: { 'store_id.keyword': inputData.storeId },
                     },
                     {
-                      terms: { outputCluster: mappedId },
+                      terms: { REIDCluster: mappedId },
                     },
                     {
                       term: { 'date.keyword': inputData.fileDate },
@@ -1597,7 +1585,7 @@ if ( ids ) {
         } );
       }
 
-      if ( inputData.auditType == 'Audit' ) {
+      if ( inputData.auditType !== 'ReAudit' ) {
         // junk Mapping
         const getJunkQuery = {
           size: 10000,
@@ -1663,7 +1651,7 @@ if ( ids ) {
                   term: { 'module.keyword': 'CUSTOMER' },
                 },
                 {
-                  term: { EmployeeStatusProposed: 1 },
+                  terms: { EmployeeStatusProposed: [ 1, 2 ] },
                 },
               ],
             },
@@ -1685,46 +1673,45 @@ if ( ids ) {
         }
 
         // customer Mapping
-        // const getCusQuery = {
-        //   size: 10000,
-        //   _source: true, // do not fetch full source
-        //   stored_fields: [], // exclude all stored fields
-        //   query: {
-        //     bool: {
-        //       must_not: {
-        //         terms: {
-        //           outputCluster: customerCount, // how can i c=handle if incase empCount === []
-        //         },
-        //       },
-        //       must: [
-        //         {
-        //           term: { 'store_id.keyword': inputData.storeId },
-        //         },
-        //         {
-        //           term: { 'date.keyword': inputData.fileDate },
-        //         },
-        //         {
-        //           term: { 'module.keyword': 'CUSTOMER' },
-        //         },
-        //       ],
-        //     },
-        //   },
-
-        // };
-
-        // const getCusId = await getOpenSearchData( openSearch.trackerInput, getCusQuery );
-        // const cusIds = getCusId?.body?.hits?.total?.value || null;
-        // if ( cusIds ) {
-        //   const temp = getCusId?.body?.hits?.hits; // .map( ( item ) => {id:item._id,reidCluster:item._source.REIDCluster } );
-        //   logger.info( { custoemrTemp: temp } );
-        //   // const updatedField = ; // your field updates
-        //   const body = temp.flatMap( ( id ) => [
-        //     { update: { _index: openSearch.trackerInput, _id: id._id } },
-        //     { doc: { outputCluster: id._source.REIDCluster } },
-        //   ] );
-        //   const re= await bulkUpdate( body );
-        //   logger.info( { getCusId: getCusId, re: re, storeId: inputData.storeId, auditType: inputData.auditType, fileDate: inputData.fileDate, function: 'tracking save - junk false mapping' } );
-        // }
+        const getCusQuery = {
+          size: 10000,
+          _source: false, // do not fetch full source
+          stored_fields: [], // exclude all stored fields
+          query: {
+            bool: {
+              must_not: {
+                terms: {
+                  outputCluster: customerCount, // how can i c=handle if incase empCount === []
+                },
+              },
+              must: [
+                {
+                  term: { 'store_id.keyword': inputData.storeId },
+                },
+                {
+                  term: { 'date.keyword': inputData.fileDate },
+                },
+                {
+                  term: { 'module.keyword': 'CUSTOMER' },
+                },
+              ],
+            },
+          },
+
+        };
+
+        const getCusId = await getOpenSearchData( openSearch.trackerInput, getCusQuery );
+        const cusIds = getCusId?.body?.hits?.total?.value || null;
+        if ( cusIds ) {
+          const temp = getCusId?.body?.hits?.hits.map( ( item ) => item._id );
+          logger.info( { custoemrTemp: temp } );
+          const body = temp.flatMap( ( id ) => [
+            { update: { _index: openSearch.trackerInput, _id: id } },
+            { doc: { outputCluster: 50000 } },
+          ] );
+          const re= await bulkUpdate( body );
+          logger.info( { getCusId: getCusId, re: re, storeId: inputData.storeId, auditType: inputData.auditType, fileDate: inputData.fileDate, function: 'tracking save - junk false mapping' } );
+        }
       }
     }
 
@@ -1768,7 +1755,7 @@ if ( ids ) {
     const ratio = ( ( storeAuditData.beforeCount - inputData.customerCount ) / storeAuditData.beforeCount );
     if ( ratio < clientData[0].auditConfigs.ratio &&
       inputData.auditType == 'Audit' &&
-      inputData.moduleType == 'traffic'
+      inputData.moduleType == 'traffic1'
     ) {
       logger.info(
           `Hit in Reaudit pushing queue  Store Id=${inputData.storeId},File Date=${inputData.fileDate}, /n \nQueue Name = ${clientData[0].auditConfigs.queueName}`,