tango-app-api-infra 3.8.1-beta.13 → 3.8.1-beta.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.8.1-beta.13",
+    "version": "3.8.1-beta.15",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/footfallDirectory.controllers.js

@@ -1,5 +1,5 @@
 import { download, logger, sendMessageToQueue } from 'tango-app-api-middleware';
-import { bulkUpdate, getOpenSearchCount, getOpenSearchData, insertWithId, updateOpenSearchData } from 'tango-app-api-middleware/src/utils/openSearch.js';
+import { bulkUpdate, getOpenSearchById, getOpenSearchCount, getOpenSearchData, insertWithId, updateOpenSearchData } from 'tango-app-api-middleware/src/utils/openSearch.js';
 import { findOneStore } from '../services/store.service.js';
 import dayjs from 'dayjs';
 
@@ -593,47 +593,94 @@ export async function updateTicketStatus( data, openSearch, temp ) {
   const splitId = id.split( '_' );
   const storeId = splitId[0];
   const dateString = splitId[1];
-  if ( data?.duplicateStatus !== 'pending' && data?.employeeStatus !== 'pending' && data?.houseKeepingStatus !== 'pending' ) {
+  const {
+    duplicateStatus,
+    employeeStatus,
+    houseKeepingStatus,
+  } = data;
+  const statusList = [ duplicateStatus, employeeStatus, houseKeepingStatus ];
+  // Filter out undefined/null statuses
+  const existingStatuses = statusList.filter( ( status ) => status != null );
+
+  // Check if **none** of the existing statuses are 'pending'
+  const allNotPending = existingStatuses.every( ( status ) => status !== 'pending' );
+
+  if ( allNotPending && existingStatuses.length > 0 ) {
     data.status = 'closed';
   }
   let tempId = [];
   const { _id, ...updateData } = data;
-  await updateOpenSearchData( openSearch.footfallDirectory, _id, { doc: updateData } );
+  const getExistingOne = await getOpenSearchById( openSearch.footfallDirectory, _id );
+  const source = getExistingOne?.body?._source;
   let bulkBody = [];
   if ( data?.duplicateImages?.length > 0 ) {
-    for ( let duplicate of data.duplicateImages ) {
+    updateData.duplicateImages = await mergeDuplicateImagesWithUncheck( getExistingOne?.body?._source?.duplicateImages, data?.duplicateImages, data?.duplicateStatus );
+    logger.info( { updateData: updateData, existeg: getExistingOne?.body?._source?.duplicateImages, sttaus: data?.duplicateStatus } );
+    await updateOpenSearchData( openSearch.footfallDirectory, _id, { doc: updateData } );
+    for ( let duplicate of updateData?.duplicateImages ) {
       bulkBody.push(
           { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${duplicate.timeRange}_${duplicate.tempId}` } },
-          { doc: { duplicateImage: duplicate.duplicateImage } },
+          { doc: { duplicateImage: duplicate.duplicateImages } },
       );
       duplicate?.data?.map( ( item ) => {
         item.isChecked == true ? tempId.push( item.tempId ) : null;
         bulkBody.push(
             { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${item.timeRange}_${item.tempId}` } },
-            { doc: { isChecked: item.isChecked } },
+            { doc: { isChecked: item.isChecked, status: item?.isChecked == true? 'approved':'rejected' } },
         );
       } );
     }
+    logger.info( { tempId: tempId } );
+    await updateOpenSearchData( openSearch.footfallDirectory, _id, { doc: { duplicateACCount: tempId?.length || 0 } } );
   }
   if ( data?.employee?.length > 0 ) {
-    for ( let employee of data.employee ) {
-      employee.isChecked == true ? tempId.push( employee.tempId ) : null;
-      bulkBody.push(
-          { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${employee.timeRange}_${employee.tempId}` } },
-          { doc: { isChecked: employee.isChecked } },
-      );
+    const updatedEmployee = updateEmployeeCheckFlags(
+        source.employee,
+        updateData.employee,
+        data.employeeStatus,
+    );
+    updateData.employee = updatedEmployee;
+    await updateOpenSearchData( openSearch.footfallDirectory, _id, { doc: updateData } );
+    for ( let employee of updateData?.employee ) {
+     ( employee.isChecked == true ) ? tempId.push( employee.tempId ) : null;
+     bulkBody.push(
+         { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${employee.timeRange}_${employee.tempId}` } },
+         { doc: { isChecked: employee.isChecked, status: employee?.isChecked == true? 'approved':'rejected' } },
+     );
     }
+    await updateOpenSearchData( openSearch.footfallDirectory, _id, { doc: { employeeACCount: tempId?.length || 0 } } );
   }
   if ( data?.houseKeeping?.length > 0 ) {
-    for ( let houseKeeping of data.houseKeeping ) {
+    const updatedHouseKeeping = updateEmployeeCheckFlags(
+        source?.houseKeeping,
+        updateData?.houseKeeping,
+        data.houseKeepingStatus,
+    );
+    updateData.houseKeeping = updatedHouseKeeping;
+
+    await updateOpenSearchData( openSearch.footfallDirectory, _id, { doc: updateData } );
+
+
+    for ( let houseKeeping of updateData?.houseKeeping ) {
       houseKeeping.isChecked == true ? tempId.push( houseKeeping.tempId ) : null;
       bulkBody.push(
           { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${houseKeeping.timeRange}_${houseKeeping.tempId}` } },
-          { doc: { isChecked: houseKeeping.isChecked } },
+          { doc: { isChecked: houseKeeping.isChecked, status: houseKeeping?.isChecked == true? 'approved':'rejected' } },
       );
     }
+    await updateOpenSearchData( openSearch.footfallDirectory, _id, { doc: { houseKeepingACCount: tempId?.length || 0 } } );
   }
   temp.push( storeId );
+  if ( bulkBody.length > 0 ) {
+    const res = await bulkUpdate( bulkBody );
+    if ( res?.errors ) {
+      logger.error( 'Bulk update errors:', res.items );
+      return { success: false, errors: res.items };
+    } else {
+      logger.error( 'Bulk status update successful.' );
+      return { success: true };
+    }
+  }
   // if ( inputData.status == 'closed' ) {
   // const isSendMessge = await sendSqsMessage( inputData, tempId );
   //   if ( isSendMessge ==true ) {
@@ -647,6 +694,84 @@ export async function updateTicketStatus( data, openSearch, temp ) {
   // }
 }
 
+function updateEmployeeCheckFlags( existingEmployees, inputEmployees, status ) {
+  // Step 1: Create a Set of tempIds from input (which are all isChecked: true)
+  const checkedTempIds = new Set( inputEmployees.map( ( emp ) => emp.tempId ) );
+
+  // Step 2: Loop through all existing and update isChecked accordingly
+  const updatedEmployees = existingEmployees.map( ( emp ) => ( {
+    ...emp,
+    isChecked: status === 'rejected'? !checkedTempIds.has( emp.tempId ):checkedTempIds.has( emp.tempId ),
+  } ) );
+
+  return updatedEmployees;
+}
+
+
+// function mergeDuplicateImagesWithUncheck( existingData, inputData, status ) {
+//   const inputImageMap = new Map();
+
+//   // Step 1: Build a Map of parentTempId -> Set of childTempId from input
+//   for ( const parent of inputData ) {
+//     inputImageMap.set( parent.tempId, new Set( ( parent.data || [] ).map( ( child ) => child.tempId ) ) );
+//   }
+
+//   // Step 2: Loop through existing data and update isChecked flags
+//   return existingData.map( ( existingParent ) => {
+//     const parentTempId = existingParent.tempId;
+//     const allowedCheckedChildIds = inputImageMap.get( parentTempId ) || new Set();
+
+//     const updatedData = ( existingParent.data || [] ).map( ( child ) => ( {
+//       ...child,
+//       isChecked: status === 'rejected'? !allowedCheckedChildIds.has( child.tempId ):allowedCheckedChildIds.has( child.tempId ),
+//     } ) );
+//     return {
+//       ...existingParent,
+//       data: updatedData,
+//     };
+//   } );
+// }
+
+function mergeDuplicateImagesWithUncheck( existingData, inputData, status ) {
+  const inputImageMap = new Map();
+
+  // Step 1: Build map of parentTempId -> Set of selected childTempIds
+  for ( const parent of inputData ) {
+    const selectedChildIds = new Set(
+        ( parent.data || [] )
+            .filter( ( child ) => child.selected )
+            .map( ( child ) => child.tempId ),
+    );
+    inputImageMap.set( parent.tempId, selectedChildIds );
+  }
+
+  // Step 2: Merge isChecked correctly per parent-child match
+  return existingData.map( ( existingParent ) => {
+    const parentTempId = existingParent.tempId;
+
+    // Get selected children for this specific parent
+    const selectedChildIds = inputImageMap.get( parentTempId ) || new Set();
+
+    const updatedData = ( existingParent.data || [] ).map( ( child ) => {
+      return {
+        ...child,
+        isChecked:
+          status === 'approved' ? selectedChildIds.has( child.tempId ) : false,
+      };
+    } );
+
+    // Also update the parent isChecked if all children are false
+    const anyChildChecked = updatedData.some( ( child ) => child.isChecked );
+
+    return {
+      ...existingParent,
+      isChecked: anyChildChecked,
+      data: updatedData,
+    };
+  } );
+}
+
+
 export async function sendSqsMessage( inputData, tempId ) {
   const sqs = JSON.parse( process.env.sqs );
   const sqsProduceQueue = {

package/src/dtos/footfallDirectory.dtos.js

@@ -284,6 +284,7 @@ export const updateStatusSchemea =Joi.object().keys( {
               exitTime: Joi.string().required(),
               timeRange: Joi.string().required(),
               isChecked: Joi.boolean().required(),
+              selected: Joi.boolean().optional(),
               data: Joi.array().items(
                   Joi.object( {
                     tempId: Joi.number().required(),
@@ -292,6 +293,7 @@ export const updateStatusSchemea =Joi.object().keys( {
                     exitTime: Joi.string().required(),
                     timeRange: Joi.string().required(),
                     isChecked: Joi.boolean().required(),
+                    selected: Joi.boolean().optional(),
                   } ),
               ).optional(),
             } ) ).optional(),
@@ -302,6 +304,7 @@ export const updateStatusSchemea =Joi.object().keys( {
           exitTime: Joi.string().required(),
           timeRange: Joi.string().required(),
           isChecked: Joi.boolean().required(),
+          selected: Joi.boolean().optional(),
 
         } ) ).optional(),
         employee: Joi.array().items( Joi.object( {
@@ -311,11 +314,12 @@ export const updateStatusSchemea =Joi.object().keys( {
           exitTime: Joi.string().required(),
           timeRange: Joi.string().required(),
           isChecked: Joi.boolean().required(),
+          selected: Joi.boolean().optional(),
 
         } ) ).optional(),
-        duplicateStatus: Joi.string().required(),
-        employeeStatus: Joi.string().required(),
-        houseKeepingStatus: Joi.string().required(),
+        duplicateStatus: Joi.string().optional(),
+        employeeStatus: Joi.string().optional(),
+        houseKeepingStatus: Joi.string().optional(),
       } ) ).required(),
 
 } );

package/src/routes/footfallDirectory.routes.js

@@ -12,6 +12,5 @@ footfallDirectoryRouter.get( '/ticket-summary', isAllowedSessionHandler, bulkVal
 footfallDirectoryRouter.get( '/ticket-list', isAllowedSessionHandler, bulkValidate( ticketListValid ), ticketList );
 footfallDirectoryRouter.get( '/get-tickets', isAllowedSessionHandler, bulkValidate( getTicketsValid ), getTickets );
 footfallDirectoryRouter.get( '/get-tagged-stores', isAllowedSessionHandler, bulkValidate( getTaggedStoresValid ), getAssinedStore, getClusters, getTaggedStores );
-
 footfallDirectoryRouter.put( '/update-status', isAllowedSessionHandler, bulkValidate( updateStatusValid ), updateStatus );
 

package/src/validations/footfallDirectory.validation.js

@@ -47,7 +47,6 @@ export async function getClusters( req, res, next ) {
     // logger.info( { assignedStores, clusters } );
     let filter =[
       {
-
         clientId: inputData.clientId,
       },
     ];