tango-app-api-audit 3.6.53 → 3.6.54

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -933,7 +933,8 @@ export async function getFilterData( msg, user ) {
           ( item ) =>
             item.temp_ids < 20000 &&
           item.temp_ids > 0 &&
-          item.person_status === '',
+          item.person_status === '' &&
+          item.query_status !== '',
       );
       const finalResult = await filterData.map( ( i ) => {
         return { ...i, img: i.index.concat( '_', i.temp_ids ) };

package/src/validation/audit.validation.js

@@ -150,13 +150,11 @@ export async function mapCustomer( sourceMappingData, customerData ) {
   try {
     const filterCustomerData = await filteredCustomerMap( customerData );
     logger.info( { filterCustomerData: filterCustomerData } );
-    const chunkedMappingData = await chunkArray( sourceMappingData, 10 );
-
-    const promises = chunkedMappingData.map( async ( chunk ) => {
-      return mapFunction( chunk, filterCustomerData );
-    } );
-    const mappedArrays = await Promise.all( promises );
-    return mappedArrays.flat();
+    // Build the lookup once, then retag every row in a single pass. This is
+    // O(rows + mappedIds) and scales for concurrent submissions, versus the old
+    // O(customers x mappedIds x rows) scan that also re-read its own mutations.
+    const customerMap = buildCustomerMap( filterCustomerData );
+    return mapFunction( sourceMappingData, customerMap );
   } catch ( error ) {
     logger.error( { error: error, type: 'mapCustomer' } );
     return error;
@@ -167,22 +165,39 @@ const filteredCustomerMap = async ( data ) => {
   return data.filter( ( map ) => map.count >= 1 );
 };
 
-const mapFunction = async ( chunkData, filterData ) => {
+// Lookup of original cluster id (child img_name) -> the customer it was tagged
+// into. Last write wins if the same id is referenced by more than one group, so
+// the result is deterministic regardless of customer order.
+const buildCustomerMap = ( filterData ) => {
+  const customerMap = new Map();
   for ( const data of filterData ) {
-    const mappedIds = data.mappedid;
-    if ( data?.mappedid ) {
-      for ( const mappedId of mappedIds ) {
-        chunkData.find( ( item ) => {
-          if ( mappedId.img_name === item.temp_ids ) {
-            item.temp_ids = data.img_name;
-            ( mappedId.img_name !== data.img_name ) ? item.query_status = '' : null;
-            item.demographic = data.demographic || '';
-          }
-        } );
-      }
+    if ( !data?.mappedid ) continue;
+    for ( const mappedId of data.mappedid ) {
+      customerMap.set( mappedId.img_name, {
+        parentId: data.img_name,
+        demographic: data.demographic || '',
+        // The chosen representative (img_name === parent) keeps its query flag so
+        // it resurfaces in reaudit; every other merged image is cleared so it does
+        // not (query_status is the reaudit gate in getFilterData / getAuditFilterData).
+        isChild: mappedId.img_name !== data.img_name,
+      } );
     }
   }
-  return chunkData;
+  return customerMap;
+};
+
+// Single pass over the master-json rows. Each row's ORIGINAL temp_ids is read
+// exactly once and reassigned to its customer's parent id, so every row sharing
+// a temp_ids is retagged and the retag never feeds back into later lookups.
+const mapFunction = ( personData, customerMap ) => {
+  for ( const item of personData ) {
+    const mapped = customerMap.get( item.temp_ids );
+    if ( !mapped ) continue;
+    item.temp_ids = mapped.parentId;
+    item.query_status = mapped.isChild ? '' : item.query_status;
+    item.demographic = mapped.demographic;
+  }
+  return personData;
 };
 
 export async function isAuditInputFolderExist( req, res, next ) {
@@ -344,7 +359,8 @@ export async function getAuditFilterData( data ) {
           ( item ) =>
             item.temp_ids < 20000 &&
           item.temp_ids > 0 &&
-          item.person_status === '',
+          item.person_status === '' &&
+          item.query_status !== '',
       );
       const finalResult = await filterData.map( ( i ) => {
         return { ...i, img: i.index.concat( '_', i.temp_ids ) };