tango-app-api-analysis-traffic 3.8.7-vms.31 → 3.8.7-vms.33

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.8.7-vms.31",
+    "version": "3.8.7-vms.33",
     "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.5.5",
+        "tango-api-schema": "^2.5.14",
         "tango-app-api-middleware": "^3.6.5",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/nob.controllers.js

@@ -3,6 +3,7 @@ import { aggregateStore } from '../services/stores.service.js';
 import { findOneNobBilling, updateOneNobBilling } from '../services/nob.service.js';
 import dayjs from 'dayjs';
 import { findOne } from '../services/clients.services.js';
+import { find } from '../services/tagging.service.js';
 
 export async function storeList( req, res ) {
   try {
@@ -27,7 +28,7 @@ export async function storeList( req, res ) {
       );
     }
 
-    const query =[
+    const query = [
       {
         $match: {
           $and: filter,
@@ -59,11 +60,12 @@ export async function storeList( req, res ) {
 
 export async function addBills( req, res ) {
   try {
-    let resData=[];
+    let resData = [];
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.tempInserData;
+    console.log( '🚀 ~ addBills ~ inputData:', inputData );
 
-    for ( let i=0; i<inputData?.length; i++ ) {
+    for ( let i = 0; i < inputData?.length; i++ ) {
       await updateOneNobBilling( inputData[i]?.query, inputData[i]?.data );
       const getData = await findOneNobBilling( inputData[i]?.query, { _id: 0 } );
       if ( !inputData[i]?.isUpdated ) {
@@ -77,7 +79,7 @@ export async function addBills( req, res ) {
     logger.info( { resData: resData } );
     return res.sendSuccess( 'Data has been inserted/updated successfully' );
   } catch ( error ) {
-    const err= error.message || 'Internal Server Error';
+    const err = error.message || 'Internal Server Error';
     logger.error( { error: error, message: req.body, function: 'nob-addBills' } );
     return res.sendError( err, 500 );
   }
@@ -91,7 +93,7 @@ export async function getNobData( req, res ) {
       return res.sendError( 'No data found', 204 );
     }
     const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( new Date( inputData.toDate ) ) );
-    let temp ={};
+    let temp = {};
     let filter = [
       {
         'terms': {
@@ -99,8 +101,12 @@ export async function getNobData( req, res ) {
         },
       },
       {
-        range: { nobDate: { gte: dateRange.start,
-          lte: dateRange.end } },
+        range: {
+          nobDate: {
+            gte: dateRange.start,
+            lte: dateRange.end,
+          },
+        },
       },
     ];
     if ( req.user.role !== 'superadmin' && req.user.userType !== 'tango' ) {
@@ -116,7 +122,7 @@ export async function getNobData( req, res ) {
       'must': filter,
     };
 
-    if ( inputData.searchValue && inputData.searchValue!== '' ) {
+    if ( inputData.searchValue && inputData.searchValue !== '' ) {
       const searchValue = escapeSpecialChars( inputData.searchValue );
       temp = {
 
@@ -149,9 +155,9 @@ export async function getNobData( req, res ) {
     }
     const getClient = await findOne( { clientId: req.clientId }, { featureConfigs: 1 } );
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    const limit = inputData.isExport? 10000 : inputData.limit || 200;
-    const skip = inputData.offset? ( inputData.offset - 1 ) * limit : 0;
-    const nobQuery={
+    const limit = inputData.isExport ? 10000 : inputData.limit || 200;
+    const skip = inputData.offset ? ( inputData.offset - 1 ) * limit : 0;
+    const nobQuery = {
       'from': skip,
       'size': limit,
       'query': {
@@ -159,17 +165,17 @@ export async function getNobData( req, res ) {
       },
     };
 
-    const getNobData=await getOpenSearchData( openSearch.nob, nobQuery );
+    const getNobData = await getOpenSearchData( openSearch.nob, nobQuery );
     const nobData = getNobData?.body?.hits?.hits;
-    if ( !nobData ||nobData?.length == 0 ) {
-      if ( inputData.searchValue && inputData.searchValue!== '' || inputData.offset> 1 ) {
+    if ( !nobData || nobData?.length == 0 ) {
+      if ( inputData.searchValue && inputData.searchValue !== '' || inputData.offset > 1 ) {
         return res.sendError( 'No Data Found', 204 );
       } else {
         return res.sendSuccess( { initialInsert: false } );
       }
     }
 
-    const footfallQuery={
+    const footfallQuery = {
       'size': 10000,
       'query': {
         'bool': {
@@ -180,29 +186,33 @@ export async function getNobData( req, res ) {
               },
             },
             {
-              range: { date_iso: { gte: `${inputData.fromDate}T00:00:00`,
-                lte: `${inputData.toDate}T00:00:00` } },
+              range: {
+                date_iso: {
+                  gte: `${inputData.fromDate}T00:00:00`,
+                  lte: `${inputData.toDate}T00:00:00`,
+                },
+              },
             },
           ],
         },
       },
     };
 
-    const getFootfall= await getOpenSearchData( openSearch.footfall, footfallQuery );
+    const getFootfall = await getOpenSearchData( openSearch.footfall, footfallQuery );
     const footfall = getFootfall?.body?.hits?.hits;
     logger.info( { footfall: getFootfall, nobData: nobData } );
-    let result=[];
+    let result = [];
     nobData.map( async ( data ) => {
       let count = 0;
-      let temp=[];
+      let temp = [];
 
-      data._source.isUpdated = data._source.createdAt !== data._source.updatedAt? true : false;
-      !data._source.isUpdated ? isEdit = true: null;
+      data._source.isUpdated = data._source.createdAt !== data._source.updatedAt ? true : false;
+      !data._source.isUpdated ? isEdit = true : null;
 
       footfall.map( ( item ) => {
         if ( ( data._source.dateString === item._source.date_string ) && ( data._source.storeId === item._source.store_id ) ) {
           count = 1;
-          temp =[
+          temp = [
             {
               storeName: item._source.store_name,
               footfallCount: item._source.footfall_count,
@@ -217,16 +227,16 @@ export async function getNobData( req, res ) {
       if ( count === 1 ) {
         switch ( getClient?.featureConfigs?.conversionCalculation ) {
           case 'footfall-count':
-            conversionCount = temp[0]?.footfallCount? ( data?._source?.nobCount/temp[0]?.footfallCount )*100 : null;
+            conversionCount = temp[0]?.footfallCount ? ( data?._source?.nobCount / temp[0]?.footfallCount ) * 100 : null;
             break;
           case 'billable-entities':
-            conversionCount = temp[0]?.potentialBuyers? ( data?._source?.nobCount/temp[0]?.potentialBuyers )*100 : null;
+            conversionCount = temp[0]?.potentialBuyers ? ( data?._source?.nobCount / temp[0]?.potentialBuyers ) * 100 : null;
             break;
           case 'engagers-count':
-            conversionCount = temp[0]?.engagersCount? ( data?._source?.nobCount/temp[0]?.engagersCount )*100 : null;
+            conversionCount = temp[0]?.engagersCount ? ( data?._source?.nobCount / temp[0]?.engagersCount ) * 100 : null;
             break;
           default:
-            conversionCount = temp[0]?.engagersCount? ( data?._source?.nobCount/temp[0]?.engagersCount )*100 : null;
+            conversionCount = temp[0]?.engagersCount ? ( data?._source?.nobCount / temp[0]?.engagersCount ) * 100 : null;
         }
         result.push( {
 
@@ -235,7 +245,7 @@ export async function getNobData( req, res ) {
           footfallCount: temp[0]?.footfallCount || null,
           engagersCount: temp[0]?.engagersCount || null,
           potentialBuyers: temp[0]?.potentialBuyers || null,
-          conversionRate: conversionCount == null ? null :`${Math.round( conversionCount )} %`,
+          conversionRate: conversionCount == null ? null : `${Math.round( conversionCount )} %`,
 
         } );
       } else {
@@ -279,7 +289,7 @@ export async function getNobData( req, res ) {
             default:
               exportData[index]['Engagers Count'] = element.engagersCount;
           }
-          element.conversionRate? exportData[index]['Conversion Rate'] = `${element.conversionRate}` : exportData[index]['Conversion Rate'] =null;
+          element.conversionRate ? exportData[index]['Conversion Rate'] = `${element.conversionRate}` : exportData[index]['Conversion Rate'] = null;
         } );
         return exportData;
       } );
@@ -301,3 +311,66 @@ export async function getNobData( req, res ) {
 function escapeSpecialChars( str ) {
   return str.replace( /[-[\]{}()*+?.,\\^$|#]/g, '\\$&' );
 }
+
+
+export async function zonelist( req, res ) {
+  try {
+    let zonelist = await find( { storeId: { $in: req.body.storeId }, productName: 'tangoZone' }, { tagName: 1 } );
+    return res.sendSuccess( zonelist );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.body, function: 'nob-getNobData' } );
+    return res.sendError( err, 500 );
+  }
+}
+export async function zonetemplate( req, res ) {
+  try {
+    if ( req.user.userType === 'tango'||req.user.userType === 'client'&&req.user.role==='superadmin' ) {
+      let storeList = await aggregateStore(
+          [
+            {
+              $match: {
+                clientId: req.body.clientId,
+              },
+            },
+          ],
+      );
+
+
+      let stores = storeList.map( ( data ) => data.storeId );
+
+      req.body.assignedStores = stores;
+    }
+
+
+    let exportData = [];
+    const zonelist = await find(
+        { storeId: { $in: req.body.assignedStores }, productName: 'tangoZone' },
+        { tagName: 1, storeId: 1 },
+    );
+    let uniqueZone = zonelist.map( ( data ) => data.tagName );
+
+    for ( const element of req.body.assignedStores ) {
+      const row = {
+        'Store Id': element,
+        'NoB Date': '',
+        'Overall NoB Count': '',
+      };
+
+      // make tagName as key
+      uniqueZone.forEach( ( zone ) => {
+        row[zone] = ''; // or 0 / true / any value you want
+      } );
+
+      exportData.push( row );
+    }
+
+
+    await download( exportData, res );
+    return;
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.body, function: 'nob-getNobData' } );
+    return res.sendError( err, 500 );
+  }
+}

package/src/controllers/revop.controller.js

@@ -1,7 +1,7 @@
 import { logger, insertOpenSearchData, getOpenSearchData, updateOpenSearchData } from 'tango-app-api-middleware';
 import { findOnerevopConfig } from '../services/revopConfig.service.js';
 import * as clientService from '../services/clients.services.js';
-import { bulkUpdate, insertWithId, searchOpenSearchData, scrollResponse, upsertWithScript } from 'tango-app-api-middleware/src/utils/openSearch.js';
+import { bulkUpdate, insertWithId, scrollResponse, searchOpenSearchData, upsertWithScript } from 'tango-app-api-middleware/src/utils/openSearch.js';
 import { findOneVmsStoreRequest } from '../services/vmsStoreRequest.service.js';
 // import dayjs from 'dayjs';
 // Lamda Service Call //
@@ -70,7 +70,7 @@ export async function revoptagging( req, res ) {
 
       let respo= await getOpenSearchData( openSearch.revops, searchQuery );
       const revopData = respo?.body?.hits?.hits;
-      if ( revopData&& revopData.length>0 ) {
+      if ( revopData && revopData.length>0 ) {
         await updateOpenSearchData( openSearch.revops, revopData[0]._id, { doc: item } );
       } else {
         item.createdAt = new Date();
@@ -140,14 +140,29 @@ export async function getrevoptagging( req, res ) {
 
 export async function migrateRevopIndex( req, res ) {
   try {
-    const { storeId, dateString, size = 500 } = req.body;
+    const { storeId, dateString, size = 100 } = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
 
     const query = {
       size: size,
       query: {
         bool: {
-          must: [],
+          must: [
+            // {
+            //   range: {
+            //     createdAt: {
+            //       gte: '2025-10-01T00:00:00.000Z',
+            //       lte: '2025-10-31T23:59:59.000Z',
+            //     },
+            //   },
+            // },
+            {
+              term: {
+                'type.keyword': 'tagging-reflect',
+
+              },
+            },
+          ],
         },
       },
     };
@@ -168,21 +183,80 @@ export async function migrateRevopIndex( req, res ) {
       } );
     }
 
-    const response = await getOpenSearchData( openSearch.revop, query );
-    const hits = response?.body?.hits?.hits || [];
+    // const response = await getOpenSearchData( openSearch.revop, query );
+    // const hits = response?.body?.hits?.hits || [];
 
-    if ( hits.length === 0 ) {
-      return res.sendSuccess( { message: 'No records found for migration', updated: 0 } );
+    // Use OpenSearch scroll API to retrieve up to 60000 records efficiently
+    let allHits = [];
+    let scrollId = null;
+    let totalFetched = 0;
+    let firstResponse = await searchOpenSearchData( openSearch.revop, query );
+    // Collect first batch
+    let hitsBatch = firstResponse?.body?.hits?.hits || [];
+    if ( hitsBatch.length > 0 ) {
+      allHits.push( ...hitsBatch );
+      totalFetched += hitsBatch.length;
+      scrollId = firstResponse.body._scroll_id;
     }
 
     const bulkBody = [];
-
-    for ( const hit of hits ) {
+    for ( const hit of hitsBatch ) {
       const src = hit._source || {};
       const statusValue = ( src.status || '' ).toLowerCase();
-      const parentValue = src.parent;
-      const idValue = `${src.storeId || ''}_${src.dateString || src.dteString || ''}_${src.tempId || ''}`;
+      // const parentValue = src.parent;
+
+      // Get ticket sattasu from the footfalldirectory index matching src.storeId and src.dateString
+      let ticketStatus = null;
+
+      const footfallQuery = {
+        size: 1,
+        query: {
+          bool: {
+            must: [
+              { term: { 'storeId.keyword': src.storeId } },
+              { term: { 'dateString': src.dateString } },
+            ],
+          },
+        },
+      };
+      const footfallResp = await getOpenSearchData( openSearch.oldFootfallDirectory, footfallQuery );
+      ticketStatus = footfallResp?.body?.hits?.hits?.[0]?._source?.status || null;
+      if ( src?.duplicateImage?.length > 0 ) {
+        src.duplicateImage = src.duplicateImage.map( ( item ) => ( {
+          ...item,
+          id: `${src.storeId || ''}_${src.dateString || src.dteString || ''}_${item.tempId || ''}`,
+          actions: ( ticketStatus === 'closed' && item.isChecked === true ) ? [
+            {
+              actionType: 'tagging',
+              action: 'submitted',
+            },
+            {
+              actionType: 'review',
+              action: 'approved',
+            },
+          ]: ( ticketStatus === 'closed' && item.isChecked === false )?
+        [
+          {
+            actionType: 'tagging',
+            action: 'submitted',
+          },
+          {
+            actionType: 'review',
+            action: 'rejected',
+          },
+        ]:
+        [
+          {
+            actionType: 'tagging',
+            action: 'submitted',
+          },
+        ],
+        // Include relevant action, assuming 'actions' will be determined below
+        } ) );
+      }
+
 
+      const idValue = `${src.storeId || ''}_${src.dateString || src.dteString || ''}_${src.tempId || ''}`;
       let actions = [
         {
           actionType: 'tagging',
@@ -214,12 +288,15 @@ export async function migrateRevopIndex( req, res ) {
         ];
       }
 
+
       const doc = {
+        ...src,
         id: idValue,
-        isParent: parentValue === null || parentValue === undefined ? false : true,
+        revopsType: src?.revopsType === 'house-keeping'? 'houseKeeping' : src?.revopsType,
+        isParent: src?.duplicateImage?.length > 0? true : false,
         actions,
         ticketStatus: src.status,
-        // updatedAt: new Date(),
+      // updatedAt: new Date(),
       };
 
       bulkBody.push(
@@ -229,11 +306,274 @@ export async function migrateRevopIndex( req, res ) {
     }
 
     const bulkRes = await bulkUpdate( bulkBody );
+
     if ( bulkRes?.errors ) {
       logger.error( 'Bulk migration errors:', bulkRes.items );
       return res.sendError( 'Failed to migrate some records', 500 );
     }
 
+    while ( hitsBatch.length > 0 && scrollId ) {
+      // Fetch next batch using scroll_id
+      const nextScrollRes = await scrollResponse( scrollId );
+
+      hitsBatch = nextScrollRes?.body?.hits?.hits || [];
+      if ( hitsBatch.length === 0 ) break;
+      logger.info( { hitsBatch: hitsBatch?.length } );
+      const bulkBody = [];
+      for ( const hit of hitsBatch ) {
+        const src = hit._source || {};
+        const statusValue = ( src.status || '' ).toLowerCase();
+        // const parentValue = src.parent;
+
+        // Get ticket sattasu from the footfalldirectory index matching src.storeId and src.dateString
+        let ticketStatus = null;
+
+        const footfallQuery = {
+          size: 1,
+          query: {
+            bool: {
+              must: [
+                { term: { 'storeId.keyword': src.storeId } },
+                { term: { 'dateString': src.dateString } },
+              ],
+            },
+          },
+        };
+        const footfallResp = await getOpenSearchData( openSearch.oldFootfallDirectory, footfallQuery );
+        ticketStatus = footfallResp?.body?.hits?.hits?.[0]?._source?.status || null;
+        if ( src?.duplicateImage?.length > 0 ) {
+          src.duplicateImage = src.duplicateImage.map( ( item ) => ( {
+            ...item,
+            id: `${src.storeId || ''}_${src.dateString || src.dteString || ''}_${item.tempId || ''}`,
+            actions: ( ticketStatus === 'closed' && item.isChecked === true ) ? [
+              {
+                actionType: 'tagging',
+                action: 'submitted',
+              },
+              {
+                actionType: 'review',
+                action: 'approved',
+              },
+            ]: ( ticketStatus === 'closed' && item.isChecked === false )?
+          [
+            {
+              actionType: 'tagging',
+              action: 'submitted',
+            },
+            {
+              actionType: 'review',
+              action: 'rejected',
+            },
+          ]:
+          [
+            {
+              actionType: 'tagging',
+              action: 'submitted',
+            },
+          ],
+          // Include relevant action, assuming 'actions' will be determined below
+          } ) );
+        }
+
+
+        const idValue = `${src.storeId || ''}_${src.dateString || src.dteString || ''}_${src.tempId || ''}`;
+        logger.info( { idValue } );
+        let actions = [
+          {
+            actionType: 'tagging',
+            action: 'submitted',
+          },
+        ];
+
+        if ( statusValue === 'approved' ) {
+          actions = [
+            {
+              actionType: 'tagging',
+              action: 'submitted',
+            },
+            {
+              actionType: 'review',
+              action: 'approved',
+            },
+          ];
+        } else if ( statusValue === 'rejected' ) {
+          actions = [
+            {
+              actionType: 'tagging',
+              action: 'submitted',
+            },
+            {
+              actionType: 'review',
+              action: 'rejected',
+            },
+          ];
+        }
+
+
+        const doc = {
+          ...src,
+          id: idValue,
+          revopsType: src?.revopsType === 'house-keeping'? 'houseKeeping' : src?.revopsType,
+          isParent: src?.duplicateImage?.length > 0? true : false,
+          actions,
+          ticketStatus: src.status,
+        // updatedAt: new Date(),
+        };
+
+        bulkBody.push(
+            { update: { _index: openSearch.newRevop, _id: hit._id } },
+            { doc: doc, doc_as_upsert: true },
+        );
+      }
+
+      const bulkRes = await bulkUpdate( bulkBody );
+
+      if ( bulkRes?.errors ) {
+        logger.error( 'Bulk migration errors:', bulkRes.items );
+        return res.sendError( 'Failed to migrate some records', 500 );
+      }
+      allHits.push( ...hitsBatch );
+      totalFetched += hitsBatch.length;
+      logger.info( { totalFetched } );
+      // Protect against exceeding limit
+
+      scrollId = nextScrollRes.body._scroll_id;
+    }
+
+    // For downstream logic, use allHits instead of hits
+    const hits = allHits;
+
+    if ( hits.length === 0 ) {
+      return res.sendSuccess( { message: 'No records found for migration', updated: 0 } );
+    }
+
+
+    // for ( const hit of hits ) {
+    //   const src = hit._source || {};
+    //   const statusValue = ( src.status || '' ).toLowerCase();
+    //   // const parentValue = src.parent;
+
+    //   // Get ticket sattasu from the footfalldirectory index matching src.storeId and src.dateString
+    //   let ticketStatus = null;
+
+    //   const footfallQuery = {
+    //     size: 1,
+    //     query: {
+    //       bool: {
+    //         must: [
+    //           { term: { 'storeId.keyword': src.storeId } },
+    //           { term: { 'dateString': src.dateString } },
+    //         ],
+    //       },
+    //     },
+    //   };
+    //   const footfallResp = await getOpenSearchData( openSearch.oldFootfallDirectory, footfallQuery );
+    //   ticketStatus = footfallResp?.body?.hits?.hits?.[0]?._source?.status || null;
+    //   if ( src?.duplicateImage?.length > 0 ) {
+    //     src.duplicateImage = src.duplicateImage.map( ( item ) => ( {
+    //       ...item,
+    //       id: `${src.storeId || ''}_${src.dateString || src.dteString || ''}_${item.tempId || ''}`,
+    //       actions: ( ticketStatus === 'closed' && item.isChecked === true ) ? [
+    //         {
+    //           actionType: 'tagging',
+    //           action: 'submitted',
+    //         },
+    //         {
+    //           actionType: 'review',
+    //           action: 'approved',
+    //         },
+    //       ]: ( ticketStatus === 'closed' && item.isChecked === false )?
+    //       [
+    //         {
+    //           actionType: 'tagging',
+    //           action: 'submitted',
+    //         },
+    //         {
+    //           actionType: 'review',
+    //           action: 'rejected',
+    //         },
+    //       ]:
+    //       [
+    //         {
+    //           actionType: 'tagging',
+    //           action: 'submitted',
+    //         },
+    //       ],
+    //       // Include relevant action, assuming 'actions' will be determined below
+    //     } ) );
+    //   }
+
+
+    //   const idValue = `${src.storeId || ''}_${src.dateString || src.dteString || ''}_${src.tempId || ''}`;
+
+    //   let actions = [
+    //     {
+    //       actionType: 'tagging',
+    //       action: 'submitted',
+    //     },
+    //   ];
+
+    //   if ( statusValue === 'approved' ) {
+    //     actions = [
+    //       {
+    //         actionType: 'tagging',
+    //         action: 'submitted',
+    //       },
+    //       {
+    //         actionType: 'review',
+    //         action: 'approved',
+    //       },
+    //     ];
+    //   } else if ( statusValue === 'rejected' ) {
+    //     actions = [
+    //       {
+    //         actionType: 'tagging',
+    //         action: 'submitted',
+    //       },
+    //       {
+    //         actionType: 'review',
+    //         action: 'rejected',
+    //       },
+    //     ];
+    //   }
+
+
+    //   const doc = {
+    //     ...src,
+    //     id: idValue,
+    //     revopsType: src?.revopsType === 'house-keeping'? 'houseKeeping' : src?.revopsType,
+    //     isParent: src?.duplicateImage?.length > 0? true : false,
+    //     actions,
+    //     ticketStatus: src.status,
+    //     // updatedAt: new Date(),
+    //   };
+
+
+    //   bulkBody.push(
+    //       { update: { _index: openSearch.newRevop, _id: hit._id } },
+    //       { doc: doc, doc_as_upsert: true },
+    //   );
+    // }
+    // Implement batch by batch update
+    // const BATCH_SIZE = 10000; // You can adjust the batch size as needed
+
+    // for ( let i = 0; i < bulkBody.length; i += BATCH_SIZE ) {
+    //   const batch = bulkBody.slice( i, i + BATCH_SIZE );
+    //   const bulkRes = await bulkUpdate( batch );
+
+    //   if ( bulkRes?.errors ) {
+    //     logger.error( 'Bulk migration errors:', bulkRes.items );
+    //     return res.sendError( 'Failed to migrate some records', 500 );
+    //   }
+    // }
+
+    // const bulkRes = await bulkUpdate( bulkBody );
+
+    // if ( bulkRes?.errors ) {
+    //   logger.error( 'Bulk migration errors:', bulkRes.items );
+    //   return res.sendError( 'Failed to migrate some records', 500 );
+    // }
+
     return res.sendSuccess( { message: 'Migration completed', updated: hits.length } );
   } catch ( error ) {
     logger.error( { error: error, message: req.body, function: 'migrateRevopIndex' } );
@@ -1002,7 +1342,7 @@ export async function vmsDataMigration( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
-    const { storeId, dateString, limit = 100 } = inputData;
+    const { storeId, dateString, limit = 10000 } = inputData;
 
     // Build query to fetch old structure documents
     const query = {
@@ -1014,6 +1354,14 @@ export async function vmsDataMigration( req, res ) {
                 'ticketName.keyword': 'footfall-directory',
               },
             },
+            // {
+            //   range: {
+            //     createdAt: {
+            //       gte: '2025-12-01T00:00:00.000Z',
+            //       lte: '2025-12-03T00:00:00.000Z',
+            //     },
+            //   },
+            // },
           ],
         },
       },
@@ -1069,17 +1417,22 @@ export async function vmsDataMigration( req, res ) {
         const documentId = hit._id;
 
         // Calculate revicedFootfall (sum of AC counts)
-        const revicedFootfall = ( oldSource.duplicateACCount || 0 ) +
+        const tempFootfall =oldSource?.status === 'open' ?
+        ( oldSource.duplicateCount || 0 ) +
+          ( oldSource.employeeCount || 0 ) +
+          ( oldSource.houseKeepingCount || 0 ) +
+          ( oldSource.junkCount || 0 ):
+          ( oldSource.duplicateACCount || 0 ) +
           ( oldSource.employeeACCount || 0 ) +
           ( oldSource.houseKeepingACCount || 0 ) +
           ( oldSource.junkACCount || 0 );
 
         // Calculate revicedPerc
         const footfallCount = oldSource.footfallCount || 0;
+        const revicedFootfall = footfallCount - tempFootfall;
         const revicedPerc = footfallCount > 0 ?
           Math.round( ( revicedFootfall / footfallCount ) * 100 ) :
           0;
-
         // Calculate reviced
         const reviced = parseInt( revicedPerc );
 
@@ -1269,7 +1622,8 @@ export async function vmsDataMigration( req, res ) {
         ];
 
         // Create mappingInfo array
-        const mappingInfo = [
+        const mappingInfo = oldSource.status === 'open' ?
+        [
           {
             type: 'tagging',
             mode: 'mobile',
@@ -1290,9 +1644,41 @@ export async function vmsDataMigration( req, res ) {
             revisedDetail,
             status: oldSource.status === 'open' ? 'Open' : oldSource.status || 'Open',
             dueDate: oldSource.updatedAt ? new Date( new Date( oldSource.updatedAt ).getTime() + 3 * 24 * 60 * 60 * 1000 ) : new Date( Date.now() + 3 * 24 * 60 * 60 * 1000 ),
+            createdAt: oldSource.createdAt || new Date(),
           },
-        ];
-
+        ]:
+
+ [
+   {
+     type: 'tagging',
+     mode: 'web',
+     revicedFootfall,
+     revicedPerc: `${revicedPerc}%`,
+     reviced,
+     count,
+     revisedDetail,
+     status: oldSource.status === 'closed' ? 'Closed' : oldSource.status || 'Closed',
+     createdByEmail: oldSource.email || '',
+     createdByUserName: oldSource.userName || '',
+     createdByRole: oldSource.role || 'user',
+     createdAt: oldSource.createdAt || new Date(),
+   },
+   {
+     type: 'review',
+     mode: 'web',
+     revicedFootfall,
+     revicedPerc: `${revicedPerc}%`,
+     reviced,
+     count,
+     revisedDetail,
+     status: oldSource.status === 'closed' ? 'Closed' : oldSource.status || 'Closed',
+     dueDate: oldSource.createdAt ? new Date( new Date( oldSource.createdAt ).getTime() + 3 * 24 * 60 * 60 * 1000 ) : new Date( Date.now() + 3 * 24 * 60 * 60 * 1000 ),
+     createdAt: oldSource.createdAt || new Date(),
+     createdByEmail: oldSource.approverEmail || '',
+     createdByUserName: oldSource.approverUserName || '',
+     createdByRole: oldSource.approverRole || 'user',
+   },
+ ];
         // Create new structure
         const newSource = {
           storeId: oldSource.storeId,
@@ -1305,7 +1691,7 @@ export async function vmsDataMigration( req, res ) {
           ticketId: oldSource.ticketId,
           createdAt: oldSource.createdAt,
           updatedAt: oldSource.updatedAt,
-          status: oldSource.status === 'open' ? 'Raised' : oldSource.status || 'Raised',
+          status: oldSource.status === 'open' ? 'Raised' : 'Closed' || 'Raised',
           comments: oldSource.comments || '',
           revicedFootfall,
           revicedPerc: `${revicedPerc}%`,
@@ -1314,8 +1700,9 @@ export async function vmsDataMigration( req, res ) {
         };
 
         // Update document in OpenSearch
-        // await updateOpenSearchData( openSearch.footfallDirectory, documentId, { doc: newSource } );
-        // migratedCount++;
+        const updatedData = await updateOpenSearchData( openSearch.footfallDirectory, documentId, { doc: newSource, doc_as_upsert: true } );
+        logger.info( { updatedData } );
+        migratedCount++;
 
         logger.info( { message: 'Document migrated successfully', newSource, documentId, storeId: oldSource.storeId, dateString: oldSource.dateString } );
       } catch ( error ) {

package/src/dtos/nob.dtos.js

@@ -21,6 +21,19 @@ export const addBillsSchema = joi.object( {
           'string.empty': 'Please enter a valid NOB Count',
           'any.required': 'NOB Count is required',
         } ).allow( null ),
+        zonewisenob: joi.array().items(
+            joi.object( {
+              zoneName: joi.string().required().messages( {
+                'string.empty': 'Zone name is required',
+                'any.required': 'Zone name is required',
+              } ),
+
+              nobCount: joi.number().required().messages( {
+                'number.base': 'Please enter a valid Zone NOB Count',
+                'any.required': 'Zone NOB Count is required',
+              } ),
+            } ),
+        ).optional(),
       } ),
   ).required(),
 

package/src/routes/nob.routes.js

@@ -1,7 +1,7 @@
 import express from 'express';
 import { accessVerification, bulkValidate, getAssinedStore, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { addBillsValid, getNobDataValid, storeListValid } from '../dtos/nob.dtos.js';
-import { addBills, getNobData, storeList } from '../controllers/nob.controllers.js';
+import { addBills, getNobData, storeList, zonelist, zonetemplate } from '../controllers/nob.controllers.js';
 import { clientValidations, fieldValidation, roleVerification } from '../validations/nob.validations.js';
 
 const nobRouter=express.Router();
@@ -13,4 +13,8 @@ nobRouter.post( '/add-bills', isAllowedSessionHandler, accessVerification( { use
 
 nobRouter.post( '/get-nob-data', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), validate( getNobDataValid ), clientValidations, getAssinedStore, getNobData );
 
+nobRouter.post( '/zonelist', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), zonelist );
+
+nobRouter.post( '/zonetemplate', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), getAssinedStore, zonetemplate );
+
 export default nobRouter;

package/src/services/nob.service.js

@@ -1,6 +1,7 @@
 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/nob.validations.js

@@ -121,6 +121,7 @@ export async function fieldValidation( req, res, next ) {
           nobDate: nobDateIso,
           nobCount: inputFilter[i]?.nobCount,
           dateString: inputFilter[i]?.nobDate,
+          zonewisenob: inputFilter[i]?.zonewisenob?inputFilter[i]?.zonewisenob:[],
         };
         const query ={ storeId: storeData[0]?.storeId, nobDate: inputFilter[i]?.nobDate };