tango-app-api-analysis-traffic 3.8.14 → 3.8.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.8.14",
+    "version": "3.8.15",
     "description": "Traffic Analysis",
     "main": "index.js",
     "type": "module",

package/src/controllers/revop.controller.js

@@ -702,12 +702,16 @@ export async function expireReviewStatus( req, res ) {
 export async function expireApproveStatus( req, res ) {
   try {
     const {
-      thresholdDate = '2026-01-21',
+      thresholdDate,
       batchSize = 500,
       storeId,
       dateString,
     } = req.body;
     const cutoffDate = new Date( thresholdDate );
+    // Convert cutoffDate to "2026-01-12T23:59:59.000Z"
+
+    cutoffDate.setUTCHours( 23, 59, 59, 0 );
+
     if ( Number.isNaN( cutoffDate.getTime() ) ) {
       return res.sendError( 'Invalid thresholdDate', 400 );
     }
@@ -761,7 +765,6 @@ export async function expireApproveStatus( req, res ) {
         let updatedMapping = mappingInfo.map( ( item ) => {
           if ( item?.type === 'approve' && item?.status !== 'Closed' && item?.dueDate ) {
             const due = new Date( item.dueDate );
-            logger.info( { item, due, msg: '..........1', cutoffDate } );
             if ( !Number.isNaN( due.getTime() ) && due < cutoffDate ) {
               changed = true;
 
@@ -771,24 +774,19 @@ export async function expireApproveStatus( req, res ) {
 
           return item;
         } );
-        logger.info( { updatedMapping, msh: '.......12' } );
         if ( changed ) {
-          logger.info( { changed, msg: '.......2' } );
           updatedMapping = updatedMapping.map( ( item ) => {
-            logger.info( { item, msg: '.......3' } );
             if ( item?.type === 'tagging' ) {
-              logger.info( { item: item?.type, msg: '.......4' } );
               return { ...item, status: 'Expired' };
             }
             return item;
           } );
         }
 
-        logger.info( { updatedMapping, msh: '.......13' } );
         if ( changed ) {
           const doc = {
             mappingInfo: updatedMapping,
-            status: 'Expired',
+            status: 'Approver-Expired',
           };
           logger.info( { updatedMapping } );
           bulkBody.push(
@@ -814,7 +812,130 @@ export async function expireApproveStatus( req, res ) {
 
     return res.sendSuccess( { message: 'Expired approve status updated', updated: totalUpdated } );
   } catch ( error ) {
-    logger.error( { error: error, message: req.body, function: 'expireApproveStatus' } );
+    logger.error( { error: error, message: req.body, function: 'expireReviewStatus' } );
+    return res.sendError( { error: error }, 500 );
+  }
+}
+
+
+export async function expireTangoReviewStatus( req, res ) {
+  try {
+    const {
+      thresholdDate,
+      batchSize = 500,
+      storeId,
+      dateString,
+    } = req.body;
+    const cutoffDate = new Date( thresholdDate );
+    // Convert cutoffDate to "2026-01-12T23:59:59.000Z"
+
+    cutoffDate.setUTCHours( 23, 59, 59, 0 );
+
+    if ( Number.isNaN( cutoffDate.getTime() ) ) {
+      return res.sendError( 'Invalid thresholdDate', 400 );
+    }
+
+
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const query = {
+      size: batchSize,
+      query: {
+        bool: {
+          must: [
+            { term: { 'ticketName.keyword': 'footfall-directory' } },
+            { term: { 'type.keyword': 'store' } },
+          ],
+          must_not: [
+            { terms: { 'status.keyword': [ 'Closed' ] } },
+          ],
+        },
+      },
+    };
+
+
+    if ( storeId ) {
+      query.query.bool.must.push( { term: { 'storeId.keyword': storeId } } );
+    }
+
+
+    if ( dateString ) {
+      query.query.bool.must.push( {
+        terms: {
+          dateString: Array.isArray( dateString ) ? dateString : `${dateString}`.split( ',' ),
+        },
+      } );
+    }
+
+
+    let totalUpdated = 0;
+    let scrollId = null;
+
+    let firstResponse = await searchOpenSearchData( openSearch.footfallDirectory, query );
+    let hitsBatch = firstResponse?.body?.hits?.hits || [];
+    scrollId = firstResponse?.body?._scroll_id;
+
+    while ( hitsBatch.length > 0 ) {
+      const bulkBody = [];
+
+      for ( const hit of hitsBatch ) {
+        const src = hit._source || {};
+        const mappingInfo = Array.isArray( src.mappingInfo ) ? src.mappingInfo : [];
+        let changed = false;
+        let updatedMapping = mappingInfo.map( ( item ) => {
+          if ( item?.type === 'tangoreview' && item?.status !== 'Closed' && item?.dueDate ) {
+            const due = new Date( item.dueDate );
+            if ( !Number.isNaN( due.getTime() ) && due < cutoffDate ) {
+              changed = true;
+
+              return { ...item, status: 'Expired' };
+            }
+          }
+
+          return item;
+        } );
+        if ( changed ) {
+          const getConfig = await clientService.findOne( src.clientId, { 'footfallDirectoryConfigs.tangoApproved': 1 } );
+          if ( getConfig?.footfallDirectoryConfigs?.tangoApproved && getConfig?.footfallDirectoryConfigs?.tangoApproved === true ) {
+            ;
+            updatedMapping = updatedMapping.map( ( item ) => {
+              if ( item?.type === 'tagging' ) {
+                return { ...item, status: 'Expired' };
+              }
+              return item;
+            } );
+          }
+        }
+
+        if ( changed ) {
+          const doc = {
+            mappingInfo: updatedMapping,
+            status: 'Tango-Expired',
+          };
+          logger.info( { updatedMapping } );
+          bulkBody.push(
+              { update: { _index: openSearch.footfallDirectory, _id: hit._id } },
+              { doc: doc, doc_as_upsert: true },
+          );
+        }
+      }
+
+      if ( bulkBody.length > 0 ) {
+        const bulkRes = await bulkUpdate( bulkBody );
+        if ( bulkRes?.errors ) {
+          logger.error( { message: 'Bulk expire errors', items: bulkRes.items } );
+        }
+        totalUpdated += bulkBody.length / 2;
+      }
+      logger.info( { totalUpdated, msg: '........9' } );
+      if ( !scrollId ) break;
+      const nextRes = await scrollResponse( scrollId );
+      hitsBatch = nextRes?.body?.hits?.hits || [];
+      scrollId = nextRes?.body?._scroll_id;
+    }
+
+    return res.sendSuccess( { message: 'Expired approve status updated', updated: totalUpdated } );
+  } catch ( error ) {
+    logger.error( { error: error, message: req.body, function: 'expireReviewStatus' } );
     return res.sendError( { error: error }, 500 );
   }
 }

package/src/dtos/validation.dtos.js

@@ -89,6 +89,16 @@ export const validateOverallCharParams = {
   body: validateOverallCharSchema,
 };
 
+// Same as validateOverallCharSchema, plus an optional hourFormat key used only by overallHourlyChart_v3
+export const validateOverallHourlyCharSchema = validateOverallCharSchema.keys( {
+  hourBucket: joi.number().optional(),
+} );
+
+export const validateOverallHourlyCharParams = {
+  body: validateOverallHourlyCharSchema,
+  ...validateOverallCharSchema,
+};
+
 export const validateSingleStoreChartSchema = joi.object( {
   ...baseSchema,
   limit: joi.number().required(),

package/src/routes/revop.routes.js

@@ -1,6 +1,6 @@
 
 import express from 'express';
-import { storeProcessedData, getconfig, revoptagging, getrevoptagging, revoptaggingcount, footFallImages, tagTempId, getCategorizedImages, vmsDataMigration, migrateRevopIndex, expireReviewStatus } from '../controllers/revop.controller.js';
+import { storeProcessedData, getconfig, revoptagging, getrevoptagging, revoptaggingcount, footFallImages, tagTempId, getCategorizedImages, vmsDataMigration, migrateRevopIndex, expireReviewStatus, expireApproveStatus } from '../controllers/revop.controller.js';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { footfallImagesValid, getCategorizedImagesValid, storeProcessedDataValid, tagTempIdValid, vmsDataMigrationValid } from '../dtos/revop.dtos.js';
 import { deleteTaggedDuplicate, getTaggingConfig, mappingConfig } from '../validations/revop.validation.js';
@@ -13,9 +13,10 @@ revopRouter
     .post( '/getrevoptagging', isAllowedSessionHandler, getrevoptagging )
     .post( '/migrate-revop', migrateRevopIndex )
     .post( '/expire-review-status', expireReviewStatus )
+    .post( '/expire-approve-status', expireApproveStatus )
     .post( '/revoptaggingcount', isAllowedSessionHandler, revoptaggingcount )
 
-// new enhnacemnet (for footfall directory)
+// new enhancement (for footfall directory)
     .get( '/store-processed-data', isAllowedSessionHandler, validate( storeProcessedDataValid ), storeProcessedData )
     .get( '/footfall-images', isAllowedSessionHandler, validate( footfallImagesValid ), getTaggingConfig, footFallImages )
     .post( '/tag-tempId', isAllowedSessionHandler, validate( tagTempIdValid ), mappingConfig, deleteTaggedDuplicate, tagTempId )

package/src/routes/traffic.routes.js

@@ -159,7 +159,7 @@ analysisTrafficRouter
     .post( '/densityDwell_v3', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateDensityDwellParams ), densityDwellV3 )
     .post( '/trafficDensityDwell_v3', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateDensityDwellParams ), trafficDensityDwellV3 )
     .post( '/overallCards_v3', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateOverallCharParams ), overallCardsV3 )
-    .post( '/overallHourlyChart_v3', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateOverallCharParams ), overallHourlyChartV3 )
+    .post( '/overallHourlyChart_v3', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateOverallHourlyCharParams ), overallHourlyChartV3 )
     .post( '/overallChart_v3', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateOverallCharParams ), overallChartV3 )
     .post( '/singleStoreChart_v3', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateSingleStoreChartParams ), singleStoreChartV3 )
     .post( '/demographicChart_v3', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateDemographicChartParams ), demographicChartV3 )