tango-app-api-analysis-traffic 3.8.13 → 3.8.15-alpha.0

package/.eslintrc.cjs

@@ -36,7 +36,7 @@ module.exports = {
     'no-unused-vars': 'error',
     'new-cap': [ 'error', { 'newIsCap': true, 'capIsNew': false } ],
     'prefer-const': 'off',
-    // 'no-console': 'error',
+    'no-console': 'error',
   },
 };
 

package/package.json

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

package/src/controllers/nob.controllers.js

@@ -63,7 +63,6 @@ export async function addBills( req, res ) {
     let resData = [];
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.tempInserData;
-    console.log( '🚀 ~ addBills ~ inputData:', inputData.length );
     // return;
     for ( let i = 0; i < inputData?.length; i++ ) {
       await updateOneNobBilling( inputData[i]?.query, inputData[i]?.data );
@@ -166,7 +165,6 @@ export async function getNobData( req, res ) {
     };
 
     const getNobData = await getOpenSearchData( openSearch.nob, nobQuery );
-    console.log( '🚀 ~ getNobData ~ openSearch.nob:', openSearch.nob );
     const nobData = getNobData?.body?.hits?.hits;
     if ( !nobData || nobData?.length == 0 ) {
       if ( inputData.searchValue && inputData.searchValue !== '' || inputData.offset > 1 ) {

package/src/controllers/revop.controller.js

@@ -593,7 +593,6 @@ export async function expireReviewStatus( req, res ) {
 
     cutoffDate.setUTCHours( 23, 59, 59, 0 );
 
-    console.log( cutoffDate );
     if ( Number.isNaN( cutoffDate.getTime() ) ) {
       return res.sendError( 'Invalid thresholdDate', 400 );
     }
@@ -703,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 );
     }
@@ -762,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;
 
@@ -772,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(
@@ -815,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 );
   }
 }
@@ -1010,14 +1130,7 @@ export async function storeProcessedData( req, res ) {
           const footfallDirRes = await getOpenSearchData( openSearch.footfallDirectory, footfallDirQuery );
           const hit = footfallDirRes?.body?.hits?.hits?.[0];
           receivedfootfall = hit._source.footfallCount;
-          if ( hit?._source?.mappingInfo && Array.isArray( hit._source.mappingInfo ) ) {
-            for ( let i = 0; i < hit._source.mappingInfo.length; i++ ) {
-              if ( hit._source.mappingInfo[i].type === 'tagging' ) {
-                ticketStatus = hit._source.mappingInfo[i].status;
-                break;
-              }
-            }
-          }
+          ticketStatus = hit?._source?.status;
         } catch ( err ) {
           logger.warn( { message: 'Could not get ticket status from footfallDirectory', error: err } );
         }
@@ -1044,7 +1157,6 @@ export async function storeProcessedData( req, res ) {
           raisedStatusEnabled,
           footfallticketCount: statusArray.includes( ticketStatus )?receivedfootfall:processedData?.footfall_count,
         } );
-        console.log( '🚀 ~ storeProcessedData ~ ticketStatus:', ticketStatus );
 
         if ( raisedStatusEnabled === 'block' ) {
           // Calculate the number of days from currentDate + 1 to the end of the month
@@ -1274,6 +1386,9 @@ export async function footFallImages( req, res ) {
       //  temp.length? temp[0].status = 'open': null;
 
       if ( resultData.status_code == '200' ) {
+        if ( !req?.store?.footfallDirectoryConfigs?.contactEmail ||( req?.store?.footfallDirectoryConfigs && req?.store?.footfallDirectoryConfigs?.contactEmail && req?.store?.footfallDirectoryConfigs?.contactEmail === '' ) ) {
+          req.store.footfallDirectoryConfigs.contactEmail = getFinal?.contactEmail || '';
+        }
         return res.sendSuccess( { ...resultData, ticketStatus: temp?.length > 0 && ticketDetails? temp : null, config: req?.store?.footfallDirectoryConfigs } );
       } else {
         return res.sendError( 'No Content', 204 );
@@ -1300,6 +1415,7 @@ export async function tagTempId( req, res ) {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
 
     const upsertRecord = {
+      mode: inputData.mode || '',
       clientId: inputData.storeId.split( '-' )[0],
       storeId: inputData.storeId,
       tempId: inputData.tempId,

package/src/routes/revop.routes.js

@@ -1,9 +1,10 @@
 
 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';
+import { deleteTaggedDuplicate, getTaggingConfig, mappingConfig, validateDateAndFilePath } from '../validations/revop.validation.js';
+
 
 export const revopRouter = express.Router();
 
@@ -13,12 +14,13 @@ 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 )
+    .post( '/tag-tempId', isAllowedSessionHandler, validate( tagTempIdValid ), mappingConfig, deleteTaggedDuplicate, validateDateAndFilePath, tagTempId )
     .post( '/get-categorized-images', isAllowedSessionHandler, validate( getCategorizedImagesValid ), getCategorizedImages )
     .post( '/vms-data-migration', validate( vmsDataMigrationValid ), vmsDataMigration );
 

package/src/services/nob.service.js

@@ -1,7 +1,6 @@
 import nobBillingModel from 'tango-api-schema/schema/nobBilling.model.js';
 
 export async function updateOneNobBilling( query, record ) {
-  console.log( '🚀 ~ updateOneNobBilling ~ record:', record );
   return await nobBillingModel.updateOne( query, { $set: record }, { upsert: true } );
 }
 

package/src/validations/revop.validation.js

@@ -284,6 +284,14 @@ export async function mappingConfig( req, res, next ) {
                 },
               },
             ],
+            must_not: [
+              {
+                term: {
+                  'parent': inputData?.tempId || '', // Exclude current tempId if it's a duplicate tagging (to avoid counting the same image twice)
+                },
+              },
+            ],
+
           },
         },
       };
@@ -358,3 +366,38 @@ export async function deleteTaggedDuplicate( req, res, next ) {
   }
 }
 
+
+export async function validateDateAndFilePath( req, res, next ) {
+  try {
+    const inputData = req.body;
+    const getDateString = inputData?.dateString;
+    const dateString = getDateString ?
+  getDateString.split( '-' ).reverse().join( '-' ) :
+  '';
+    const filePath = inputData?.filePath;
+
+    if ( !dateString ) {
+      return res.sendError( 'Missing payload field: dateString', 400 );
+    }
+    if ( !filePath ) {
+      return res.sendError( 'Missing payload field: filePath', 400 );
+    }
+
+    // Based on requirement: match payload dateString with filePath.split[1]
+    // Example: 11-1001/06-05-2026/5_customer_entry_frame.jpeg
+    // split('/') => [ '11-1001', '06-05-2026', '5_customer_entry_frame.jpeg' ] => index 1 is '06-05-2026'
+    const parts = String( filePath ).split( '/' );
+    const pathDateString = parts?.[1];
+
+    if ( dateString !== pathDateString ) {
+      return res.sendError( `Invalid payload: Image Date Mismatch `, 400 );
+    }
+
+    next();
+  } catch ( error ) {
+    logger.error( { error: error, message: req.body, function: 'traffic-revop-validateDateAndFilePath' } );
+    return res.sendError( error.message || 'Error validating date and filePath', 400 );
+  }
+}
+
+