tango-app-api-analysis-traffic 3.8.7-vms.0 → 3.8.7-vms.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.8.7-vms.0",
+    "version": "3.8.7-vms.10",
     "description": "Traffic Analysis",
     "main": "index.js",
     "type": "module",
@@ -23,7 +23,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.4.9",
+        "tango-api-schema": "^2.4.29",
         "tango-app-api-middleware": "^3.6.5",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/revop.controller.js

@@ -2,7 +2,8 @@ import { logger, insertOpenSearchData, getOpenSearchData, updateOpenSearchData }
 import { findOnerevopConfig } from '../services/revopConfig.service.js';
 import * as clientService from '../services/clients.services.js';
 import { bulkUpdate, upsertWithScript } from 'tango-app-api-middleware/src/utils/openSearch.js';
-import dayjs from 'dayjs';
+import { findOneVmsStoreRequest } from '../services/vmsStoreRequest.service.js';
+// import dayjs from 'dayjs';
 // Lamda Service Call //
 async function LamdaServiceCall( url, data ) {
   try {
@@ -211,44 +212,171 @@ export async function storeProcessedData( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
-    const previousDate = dayjs( inputData.dateString ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' );
-    const dateString = `${inputData.storeId}_${inputData.dateString}`;
-    const dateStringPrevious = `${inputData.storeId}_${previousDate}`;
-    const getQuery = {
-      query: {
-        terms: {
-          _id: [ dateString, dateStringPrevious ],
-        },
-      },
-      _source: [ 'footfall', 'date_string', 'store_id', 'down_time', 'footfall_count' ],
-      sort: [
-        {
-          date_iso: {
-            order: 'desc',
+    const { fromDate, toDate, storeId } = inputData;
+
+    // Multi-date range handling for a single store
+    if ( fromDate && toDate && storeId ) {
+      const dayjs = ( await import( 'dayjs' ) ).default;
+      const isSameOrBefore = ( await import( 'dayjs/plugin/isSameOrBefore.js' ) ).default;
+      dayjs.extend( isSameOrBefore );
+
+      let start = dayjs( fromDate );
+      // get start value from the before day one
+      // Move start one day back so we can access "day before" when looping
+      start = start.subtract( 1, 'day' );
+      let end = dayjs( toDate );
+
+      if ( !start.isValid() || !end.isValid() ) {
+        return res.sendError( 'Invalid date range supplied', 400 );
+      }
+
+      if ( end.isBefore( start ) ) {
+        [ start, end ] = [ end, start ];
+      }
+
+      const allDateStrings = [];
+      const orderedDates = [];
+
+      while ( start.isSameOrBefore( end ) ) {
+        const formatted = start.format( 'YYYY-MM-DD' );
+        orderedDates.push( formatted );
+        allDateStrings.push( `${storeId}_${formatted}` );
+        start = start.add( 1, 'day' );
+      }
+
+      if ( allDateStrings.length === 0 ) {
+        return res.sendSuccess( [] );
+      }
+
+      const footfallQuery = {
+        query: {
+          terms: {
+            _id: allDateStrings,
           },
         },
-      ],
-    };
+        _source: [ 'footfall', 'date_string', 'store_id', 'down_time', 'footfall_count' ],
+        sort: [
+          { date_iso: { order: 'asc' } },
+        ],
+        size: allDateStrings.length,
+      };
 
-    const getData = await getOpenSearchData( openSearch.footfall, getQuery );
-    const hits = getData?.body?.hits?.hits || [];
+      const multiGet = await getOpenSearchData( openSearch.footfall, footfallQuery );
+      const multiHits = multiGet?.body?.hits?.hits || [];
+      const hitsMap = new Map();
+      multiHits.forEach( ( hit ) => {
+        hitsMap.set( hit?._id, hit?._source || null );
+      } );
 
-    const processedData = hits.find( ( d ) => d._id === dateString )?._source || null;
-    const previousData = hits.find( ( d ) => d._id === dateStringPrevious )?._source || null;
+      const responseArray = [];
 
-    let footfallCountTrend = 0;
+      for ( let i = 1; i < orderedDates.length; i++ ) {
+        const currentDate = orderedDates[i];
+        const currentId = `${storeId}_${currentDate}`;
+        logger.info( { currentId, currentDate } );
+        const processedData = hitsMap.get( currentId );
+        logger.info( { processedData } );
+        if ( !processedData ) {
+          responseArray.push( {
+            date: currentDate,
+            footfallCount: 0,
+            footfallCountTrend: 0,
+            downtime: 0,
+          } );
+          continue;
+        }
 
-    if ( processedData && previousData && previousData.footfall_count ) {
-      footfallCountTrend = Math.round(
-          ( ( processedData.footfall_count - previousData.footfall_count ) / previousData.footfall_count ) * 100,
-      );
-    }
+        const prevDate = dayjs( currentDate ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' );
+        const prevId = `${storeId}_${prevDate}`;
+        logger.info( { prevId, prevDate } );
+        const previousData = hitsMap.get( prevId );
+
+        let footfallCountTrend = 0;
+        logger.info( { previousData, previoucubr1: previousData?.footfall_count } );
+        if ( previousData && previousData.footfall_count ) {
+          logger.info( { previousData, previoucubr: previousData?.footfall_count } );
+          footfallCountTrend = Math.round(
+              ( ( processedData.footfall_count - previousData?.footfall_count ) / previousData.footfall_count ) * 100,
+          );
+          logger.info( { footfallCountTrend } );
+        }
+        // Add ticket status from openSearch.footfallDirectory (_source.status)
+        let ticketStatus = null;
+        // Try to find a matching footfallDirectory record for this date+storeId
+        // const ticketKey = `${storeId}_${currentDate}`;
+        const footfallDirQuery = {
+          query: {
+            bool: {
+              must: [
+                { term: { 'storeId.keyword': storeId } },
+                { term: { 'dateString': currentDate } },
+                { term: { 'ticketName.keyword': 'footfall-directory' } },
+              ],
+            },
+          },
+          size: 1,
+          _source: [ 'status', 'mappingInfo' ],
+        };
+        try {
+          const footfallDirRes = await getOpenSearchData( openSearch.footfallDirectory, footfallDirQuery );
+          const hit = footfallDirRes?.body?.hits?.hits?.[0];
+          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;
+              }
+            }
+          }
+        } catch ( err ) {
+          logger.warn( { message: 'Could not get ticket status from footfallDirectory', error: err } );
+        }
+        // Check if request status ("raised") should be enabled or disabled by querying MongoDB config
+        // We'll assume findOnerevopConfig can fetch the record with status for this storeId and dateString
+        let raisedStatusEnabled = 'reset'; // default: enabled
+        try {
+          const mongoConfig = await findOneVmsStoreRequest( { storeId: storeId, dateString: currentDate } );
+          if ( mongoConfig && mongoConfig.status ) {
+            raisedStatusEnabled = mongoConfig.status;
+          }
+        } catch ( err ) {
+          logger.warn( { message: 'Could not get request status from MongoDB', error: err } );
+          // Leave raisedStatusEnabled as default
+        }
+
+        responseArray.push( {
+          date: processedData?.date_string || currentDate,
+          footfallCount: processedData?.footfall_count || 0,
+          footfallCountTrend,
+          downtime: processedData?.down_time || 0,
+          ticketStatus,
+          raisedStatusEnabled,
+
+        } );
+
+        if ( raisedStatusEnabled === 'block' ) {
+          // Calculate the number of days from currentDate + 1 to the end of the month
+          // Assume currentDate is in format 'YYYY-MM-DD'
+          const currentDateObj = new Date( currentDate );
+          // Move to next day
+          const nextDay = new Date( currentDateObj );
+          nextDay.setDate( currentDateObj.getDate() + 1 );
+
+          // Get the last date of the current month
+          const endOfMonth = new Date( currentDateObj.getFullYear(), currentDateObj.getMonth() + 1, 0 );
+
+          // Calculate number of days (inclusive of end date, exclusive of nextDay)
+          let noOfBlockedDays = Math.floor( ( endOfMonth - nextDay ) / ( 1000 * 60 * 60 * 24 ) ) + 1;
+          if ( noOfBlockedDays < 0 ) noOfBlockedDays = 0;
+
+          // Add to response
+          responseArray[responseArray.length - 1].noOfBlockedDays = noOfBlockedDays;
+        }
+      }
 
-    return res.sendSuccess( {
-      footfallCount: processedData?.footfall_count || 0,
-      footfallCountTrend,
-      downtime: processedData?.down_time || 0,
-    } );
+      return res.sendSuccess( responseArray );
+    }
+    return res.sendError( 'Required parameters missing', 400 );
   } catch ( error ) {
     logger.error( { message: error, data: req.query, function: 'storeProcessedData' } );
     const err = error.message || 'Internal Server Error';
@@ -287,40 +415,177 @@ export async function footFallImages( req, res ) {
           ],
         },
       },
-      '_source': [ 'dateString', 'storeId', 'duplicateCount', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'junkCount', 'status', 'ticketId', 'comments', 'userName', 'role', 'createdAt', 'email', 'houseKeepingACCount', 'duplicateACCount', 'employeeACCount', 'junkACCount', 'approverEmail', 'approverRole', 'approverUserName' ],
+      '_source': [ 'dateString', 'storeId', 'mappingInfo', 'revicedFootfall', 'revicedPerc', 'createdAt', 'updatedAt', 'footfallCount' ],
 
     };
 
     const getData = await getOpenSearchData( opensearch.footfallDirectory, query );
     const ticketDetails = getData?.body?.hits?.hits[0];
     let temp = [];
-   ticketDetails?._source? temp.push( ticketDetails?._source ) :null;
-   //  temp[0].status = 'open';
-   if ( ticketDetails?._source?.status == 'closed' ) {
-     delete temp[0].status;
-     temp.push( { ...ticketDetails?._source, status: 'closed' } );
-
-     temp[1].userName = getData?.body?.hits?.hits?.[0]?._source?.approverUserName;
-     temp[1].email = getData?.body?.hits?.hits?.[0]?._source?.approverEmail;
-     temp[1].role = getData?.body?.hits?.hits?.[0]?._source?.approverRole;
-     temp[1].employeeCount = getData?.body?.hits?.hits?.[0]?._source?.employeeACCount;
-     temp[1].houseKeepingCount = getData?.body?.hits?.hits?.[0]?._source?.houseKeepingACCount;
-     temp[1].duplicateCount = getData?.body?.hits?.hits?.[0]?._source?.duplicateACCount;
-     temp[1].junkCount = getData?.body?.hits?.hits?.[0]?._source?.junkACCount;
-   }
-   const LamdaURL = revop.getImages;
-   let resultData = await LamdaServiceCall( LamdaURL, inputData );
-   logger.info( { resultData: resultData } );
-   if ( resultData ) {
-   temp.length? temp[0].status = 'open': null;
-   if ( resultData.status_code == '200' ) {
-     return res.sendSuccess( { ...resultData, ticketStatus: temp?.length > 0? temp : null, config: req?.store?.revopTagging } );
-   } else {
-     return res.sendError( 'No Content', 204 );
-   }
-   } else {
-     return res.sendError( 'No Content', 204 );
-   }
+    const footfallValue = ticketDetails?._source?.footfallCount ?? 0;
+    const mappingInfoArray = ticketDetails?._source?.mappingInfo ?? [];
+    // Helper to get mappingInfo for an actionType
+    function getMappingForType( type ) {
+      return mappingInfoArray.find( ( m ) => m.type === type ) || {};
+    }
+
+    // List of actionTypes to process in sequence
+
+    if ( req.user.userType !== 'tango' && req.user.role !== 'superadmin' ) {
+      switch ( req.user.role ) {
+        case 'user':
+          const actionTypesUser = [ 'tagging', 'finalreview' ];
+
+          temp = [];
+          actionTypesUser.forEach( ( type ) => {
+            const mapping = getMappingForType( type );
+            if ( type === 'tagging' ) {
+              const revisedFootfall = mapping.revicedFootfall ?? 0;
+              const revisedPerc =
+                footfallValue > 0 ?
+                  `${Math.round( ( revisedFootfall / footfallValue ) * 100 )}` :
+                  '0';
+              const countObj = mapping.count ? [ ...mapping.count ] : [];
+              temp.push( {
+                actionType: type,
+                footfall: footfallValue,
+                revicedFootfall: revisedFootfall,
+                revicedPerc: revisedPerc,
+                count: countObj,
+                createdAt: mapping.createdAt ?? '',
+                createdByEmail: mapping.createdByEmail ?? '',
+                createdByUserName: mapping.createdByUserName ?? '',
+                createdByRole: mapping.createdByRole ?? '',
+                isUp: false,
+              } );
+            } else if ( type !== 'tagging' && mapping.status === 'closed' ) {
+              const revisedFootfall = mapping.revicedFootfall ?? 0;
+              const revisedPerc =
+                footfallValue > 0 ?
+                  `${Math.round( ( revisedFootfall / footfallValue ) * 100 )}` :
+                  '0';
+              const countObj = mapping.count ? [ ...mapping.count ] : [];
+              temp.push( {
+                actionType: type,
+                footfall: footfallValue,
+                revicedFootfall: revisedFootfall,
+                revicedPerc: revisedPerc,
+                count: countObj,
+                createdAt: mapping.createdAt ?? '',
+                createdByEmail: mapping.createdByEmail ?? '',
+                createdByUserName: mapping.createdByUserName ?? '',
+                createdByRole: mapping.createdByRole ?? '',
+              } );
+            }
+          } );
+          break;
+        case 'admin':
+          const actionTypesAdmin = [ 'tagging', 'review', 'finalreview' ];
+          temp = [];
+          actionTypesAdmin.forEach( ( type ) => {
+            const mapping = getMappingForType( type );
+            if ( type === 'tagging' ) {
+              const revisedFootfall = mapping.revicedFootfall ?? 0;
+              const revisedPerc =
+                footfallValue > 0 ?
+                  `${Math.round( ( revisedFootfall / footfallValue ) * 100 )}` :
+                  '0';
+              const countObj = mapping.count ? [ ...mapping.count ] : [];
+              temp.push( {
+                actionType: type,
+                footfall: footfallValue,
+                revicedFootfall: revisedFootfall,
+                revicedPerc: revisedPerc,
+                count: countObj,
+                createdAt: mapping.createdAt ?? '',
+                createdByEmail: mapping.createdByEmail ?? '',
+                createdByUserName: mapping.createdByUserName ?? '',
+                createdByRole: mapping.createdByRole ?? '',
+                isUp: false,
+              } );
+            } else if ( type !== 'tagging' && mapping.status === 'closed' ) {
+              const revisedFootfall = mapping.revicedFootfall ?? 0;
+              const revisedPerc =
+                footfallValue > 0 ?
+                  `${Math.round( ( revisedFootfall / footfallValue ) * 100 )}` :
+                  '0';
+              const countObj = mapping.count ? [ ...mapping.count ] : [];
+              temp.push( {
+                actionType: type,
+                footfall: footfallValue,
+                revicedFootfall: revisedFootfall,
+                revicedPerc: revisedPerc,
+                count: countObj,
+                createdAt: mapping.createdAt ?? '',
+                createdByEmail: mapping.createdByEmail ?? '',
+                createdByUserName: mapping.createdByUserName ?? '',
+                createdByRole: mapping.createdByRole ?? '',
+              } );
+            }
+          } );
+      }
+    } else {
+      const actionTypes = [ 'tagging', 'review', 'approve', 'finalreview' ];
+
+      // Dynamically add to temp only if actionType matches and status is 'closed',
+      // except for 'tagging' where status must be 'raised'
+      temp = [];
+      actionTypes.forEach( ( type ) => {
+        const mapping = getMappingForType( type );
+        if ( type === 'tagging' ) {
+          const revisedFootfall = mapping.revicedFootfall ?? 0;
+          const revisedPerc =
+            footfallValue > 0 ?
+              `${Math.round( ( revisedFootfall / footfallValue ) * 100 )}` :
+              '0';
+          const countObj = mapping.count ? [ ...mapping.count ] : [];
+          temp.push( {
+            actionType: type,
+            footfall: footfallValue,
+            revicedFootfall: revisedFootfall,
+            revicedPerc: revisedPerc,
+            count: countObj,
+            createdAt: mapping.createdAt ?? '',
+            createdByEmail: mapping.createdByEmail ?? '',
+            createdByUserName: mapping.createdByUserName ?? '',
+            createdByRole: mapping.createdByRole ?? '',
+            isUp: false,
+          } );
+        } else if ( type !== 'tagging' && mapping.status === 'closed' ) {
+          const revisedFootfall = mapping.revicedFootfall ?? 0;
+          const revisedPerc =
+            footfallValue > 0 ?
+              `${Math.round( ( revisedFootfall / footfallValue ) * 100 )}` :
+              '0';
+          const countObj = mapping.count ? [ ...mapping.count ] : [];
+          temp.push( {
+            actionType: type,
+            footfall: footfallValue,
+            revicedFootfall: revisedFootfall,
+            revicedPerc: revisedPerc,
+            count: countObj,
+            createdAt: mapping.createdAt ?? '',
+            createdByEmail: mapping.createdByEmail ?? '',
+            createdByUserName: mapping.createdByUserName ?? '',
+            createdByRole: mapping.createdByRole ?? '',
+          } );
+        }
+      } );
+    }
+
+
+    const LamdaURL = revop.getImages;
+    let resultData = await LamdaServiceCall( LamdaURL, inputData );
+    if ( resultData ) {
+      //  temp.length? temp[0].status = 'open': null;
+      if ( resultData.status_code == '200' ) {
+        return res.sendSuccess( { ...resultData, ticketStatus: temp?.length > 0 && ticketDetails? temp : null, config: req?.store?.footfallDirectoryConfigs } );
+      } else {
+        return res.sendError( 'No Content', 204 );
+      }
+    } else {
+      return res.sendError( 'No Content', 204 );
+    }
   } catch ( error ) {
     logger.error( { message: error, data: req.query, function: 'storeProcessedData' } );
     const err = error.message || 'Internal Server Error';
@@ -348,6 +613,13 @@ export async function tagTempId( req, res ) {
       description: '',
       isChecked: inputData.isChecked,
       duplicateImage: inputData?.duplicateImage?.length>0? inputData?.duplicateImage :[],
+      // Add id to each object in duplicateImage if it exists and is an array
+      duplicateImage: Array.isArray( inputData?.duplicateImage ) ?
+        inputData.duplicateImage.map( ( img ) => ( {
+          ...img,
+          id: `${inputData?.storeId}_${inputData?.dateString}_${img?.tempId}`,
+        } ) ) :
+        [],
       type: 'tagging-reflect',
       ticketStatus: 'submitted',
       isParent: inputData?.revopsType === 'duplicate'? true : false,
@@ -357,6 +629,7 @@ export async function tagTempId( req, res ) {
           action: 'submitted',
         },
       ],
+      comments: inputData.comments || '',
       createdAt: new Date(),
       updatedAt: new Date(),
 
@@ -410,6 +683,7 @@ export async function tagTempId( req, res ) {
           isParent: false,
           type: 'tagging-reflect',
           ticketStatus: 'submitted',
+          comments: inputData.comments || '',
           actions: [
             {
               actionType: 'tagging',

package/src/dtos/revop.dtos.js

@@ -4,7 +4,8 @@ import dayjs from 'dayjs';
 export const storeProcessedDataSchema = joi.object( {
 
   storeId: joi.string().required(),
-  dateString: joi.string().required(),
+  fromDate: joi.string().required(),
+  toDate: joi.string().required(),
 
 } );
 
@@ -65,6 +66,9 @@ export const tagTempIdSchema = joi.object( {
   revopsType: joi.string().required(),
   timeRange: joi.string().required(),
   isChecked: joi.boolean().required().allow( null ),
+  mode: joi.string().valid( 'web', 'mobile' ).required().messages( {
+    'any.only': 'type must be one of [mobile,web]',
+  } ),
   duplicateImage: joi.array().items( joi.object(
       {
         tempId: joi.number().required(),
@@ -80,6 +84,7 @@ export const tagTempIdSchema = joi.object( {
   entryTime: joi.string().required(),
   exitTime: joi.string().required(),
   filePath: joi.string().required(),
+  comments: joi.string().optional().allow( '' ),
 
 } );
 

package/src/services/vmsStoreRequest.service.js

@@ -0,0 +1,5 @@
+import vmsStoreRequestModel from 'tango-api-schema/schema/vmsStoreRequest.model.js';
+
+export async function findOneVmsStoreRequest( query = {} ) {
+  return await vmsStoreRequestModel.findOne( query );
+};

package/src/validations/revop.validation.js

@@ -1,11 +1,24 @@
 import { getOpenSearchCount, logger } from 'tango-app-api-middleware';
-import { findOneStore } from '../services/stores.service.js';
-import { deleteByQuery } from 'tango-app-api-middleware/src/utils/openSearch.js';
+import { deleteByQuery, getOpenSearchData } from 'tango-app-api-middleware/src/utils/openSearch.js';
+import { findOne } from '../services/clients.services.js';
 
 export async function getTaggingConfig( req, res, next ) {
   try {
     const inputData= req.query;
-    const getData = await findOneStore( { storeId: inputData.storeId }, { revopTagging: 1 } );
+    const clientId = inputData.storeId.split( '-' )[0];
+    const getData = await findOne( { clientId: clientId }, { footfallDirectoryConfigs: 1 } );
+
+    // Convert "taggingLimitation" array (if present) to "config" object with expected key-value pairs
+    let config = {};
+    if ( getData && Array.isArray( getData.taggingLimitation ) ) {
+      for ( const item of getData.taggingLimitation ) {
+        if ( item && item.type && typeof item.value !== 'undefined' && item.unit ) {
+          config[item.type] = `${item.value}${item.unit}`;
+        }
+      }
+    }
+    getData.config = config;
+
     req.store = getData;
     next();
   } catch ( error ) {
@@ -51,41 +64,54 @@ export async function getFootfallCount( req, res, next ) {
 export async function mappingConfig( req, res, next ) {
   try {
     const inputData = req.body;
+
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    const config =await findOneStore( { storeId: inputData.storeId }, { revopTagging: 1 } );
-    if ( inputData.revopsType == 'employee' ) {
-      const getQuery = {
-        query: {
-          bool: {
-            must: [
-              {
-                term: {
-                  'storeId.keyword': inputData.storeId,
-                },
-              },
-              {
-                term: {
-                  'dateString': inputData.dateString,
-                },
+    const footfallQuery ={
+      query: {
+        bool: {
+          must: [
+            {
+              term: {
+                'store_id.keyword': inputData.storeId,
               },
-              {
-                term: {
-                  'revopsType.keyword': inputData.revopsType,
-                },
+            },
+            {
+              term: {
+                'date_string': inputData.dateString,
               },
-            ],
-          },
+            },
+
+          ],
         },
-      };
+      },
+    };
 
-      const getData = await getOpenSearchCount( openSearch.revop, getQuery );
-      if ( getData && getData?.body?.count >= config?.revopTagging?.employee ) {
-        return res.sendError( `Select up to ${config?.revopTagging?.employee} items only`, 400 );
-      } else {
-        next();
-      }
-    } else if ( inputData.revopsType == 'house-keeping' ) {
-      const getQuery = {
+
+    const footfallOutput = await getOpenSearchData( openSearch.footfall, footfallQuery );
+    if ( footfallOutput?.body?.hits?.hits?.length === 0 ) {
+      return res.sendError( 'No updated footfall for this date', 400 );
+    }
+    const getFootfallCount = footfallOutput?.body?.hits?.hits;
+    const footfall = getFootfallCount?.[0]?._source?.footfall_count;
+
+    const getConfig = await findOne( { clientId: inputData?.storeId?.split( '-' )[0] }, { footfallDirectoryConfigs: 1 } );
+    const taggingLimitation = getConfig?.footfallDirectoryConfigs?.taggingLimitation;
+    // Find the tagging limitation for the given revopsType
+    let matchedLimitation = null;
+    if ( Array.isArray( taggingLimitation ) ) {
+      matchedLimitation = taggingLimitation.find(
+          ( l ) => l.type === inputData.revopsType,
+      );
+    }
+
+    if ( matchedLimitation ) {
+      // Determine the limit value
+      let limitValue = Number( matchedLimitation.value ) || 0;
+      let unit = matchedLimitation.unit;
+
+      // Assuming getData and/or getOpenSearchCount provides the actual tagged count for revopsType
+      // Query OpenSearch for current tagged count for this revopsType
+      const taggedCountQuery = {
         query: {
           bool: {
             must: [
@@ -104,92 +130,51 @@ export async function mappingConfig( req, res, next ) {
                   'revopsType.keyword': inputData.revopsType,
                 },
               },
+              {
+                term: {
+                  'isParent': false,
+                },
+              },
             ],
           },
         },
       };
-      const getData = await getOpenSearchCount( openSearch.revop, getQuery );
-      if ( getData && getData?.body?.count >= config?.revopTagging?.houseKeeping ) {
-        return res.sendError( `Select up to ${config?.revopTagging?.houseKeeping} items only`, 400 );
+      const taggedData = await getOpenSearchCount( openSearch.revop, taggedCountQuery );
+      const taggedValue = ( taggedData?.body?.count || 0 )+ ( inputData.revopsType == 'duplicate'? inputData?.duplicateImage?.length : 1 );
+      // If the unit is %, compare percentage of taggedValue/footfall, otherwise compare taggedValue to limitValue directly
+      let isLimitExceeded = false;
+      if ( unit === '%' ) {
+        // footfall may be undefined, treat as 0 (avoid division by zero)
+        const totalFootfall = Number( footfall ) || 0;
+        const taggedPercent = totalFootfall > 0 ? ( taggedValue / totalFootfall ) * 100 : 0;
+        isLimitExceeded = taggedPercent > limitValue;
+        logger.info( {
+          limitType: 'PERCENT',
+          taggedValue,
+          totalFootfall,
+          taggedPercent,
+          limitValue,
+          isLimitExceeded,
+          forRevopsType: inputData.revopsType,
+        } );
       } else {
-        next();
+        // Non-percent, treat limitValue as an absolute number
+        isLimitExceeded = taggedValue > limitValue;
+        logger.info( {
+          limitType: 'ABSOLUTE',
+          taggedValue,
+          limitValue,
+          isLimitExceeded,
+          forRevopsType: inputData.revopsType,
+        } );
       }
-    } else if ( inputData.revopsType === 'junk' ) {
-      if ( ( req?.user?.userType == 'client' && req?.user?.userType !== 'user ' ) || req?.user?.userType === 'tango' ) {
-        next();
-        return;
-      } else {
-        return res.sendError( 'Forbidden to junk mapping', 500 );
+      if ( isLimitExceeded ) {
+        return res.sendError( `Limit exceed: Only ${limitValue}${unit || ''} items allowed for ${inputData.revopsType}`, 400 );
       }
+      return next();
     } else {
-      next();
+      return next();
     }
-    // else if ( inputData.revopsType == 'duplicate' ) {
-    //   const getFootfallQuery = {
-    //     query: {
-    //       terms: {
-    //         _id: [ inputData?.dateString ],
-    //       },
-    //     },
-    //     _source: [ 'footfall', 'date_string', 'store_id', 'down_time', 'footfall_count' ],
-    //     sort: [
-    //       {
-    //         date_iso: {
-    //           order: 'desc',
-    //         },
-    //       },
-    //     ],
-    //   };
-
-    //   const getFootfall = await getOpenSearchData( openSearch.footfall, getFootfallQuery );
-    //   const footfall = getFootfall?.body?.hites?.hits?.[0]?._source?.footfall_count;
-    //   const getQuery = {
-    //     query: {
-    //       bool: {
-    //         must: [
-    //           {
-    //             term: {
-    //               'storeId.keyword': inputData.storeId,
-    //             },
-    //           },
-    //           {
-    //             term: {
-    //               'dateString': inputData.dateString,
-    //             },
-    //           },
-    //           {
-    //             term: {
-    //               'revopsType.keyword': inputData.revopsType,
-    //             },
-    //           },
-    //           {
-    //             term: {
-    //               'parent.keyword': null,
-    //             },
-    //           },
-    //         ],
-    //       },
-    //     },
-    //   };
-    //   const getData = await getOpenSearchCount( openSearch.revop, getQuery );
-    //   logger.info( { getData: getData, footfall: footfall, duplicate: config?.revopTagging?.duplicate } );
-    //   if ( getData && footfall && config?.revopTagging?.duplicate ) {
-    //     const data = config?.revopTagging?.duplicate;
-    //     // Convert "20%" → 0.2 (handle both "20%" and 20)
-    //     const percentStr = typeof data === 'string' ? data.replace( '%', '' ) : data;
-    //     logger.info( { percentStr: percentStr } );
-    //     const percentValue =percentStr / 100;
-
-    //     const result = percentValue * footfall;
-
-    //     logger.info( { result: result, footfall: footfall } );
-    //   }
-    //   if ( getData && getData?.body?.count >= Math.round( result ) ) {
-    //     return res.sendError( `Select up to ${config?.revopTagging?.duplicate} items only`, 400 );
-    //   } else {
-    //     next();
-    //   }
-    // }
   } catch ( error ) {
     logger.error( { error: error, message: req.body, function: 'traffic-revop-getTaggingConfig' } );
     next();