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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.8.7-vms.33",
+    "version": "3.8.7-vms.35",
     "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.14",
+        "tango-api-schema": "^2.5.5",
         "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,7 +3,6 @@ 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 {
@@ -28,7 +27,7 @@ export async function storeList( req, res ) {
       );
     }
 
-    const query = [
+    const query =[
       {
         $match: {
           $and: filter,
@@ -60,12 +59,11 @@ 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 ) {
@@ -79,7 +77,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 );
   }
@@ -93,7 +91,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': {
@@ -101,12 +99,8 @@ 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' ) {
@@ -122,7 +116,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 = {
 
@@ -155,9 +149,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': {
@@ -165,17 +159,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': {
@@ -186,33 +180,29 @@ 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,
@@ -227,16 +217,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( {
 
@@ -245,7 +235,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 {
@@ -289,7 +279,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;
       } );
@@ -311,66 +301,3 @@ 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

@@ -3,7 +3,7 @@ import { findOnerevopConfig } from '../services/revopConfig.service.js';
 import * as clientService from '../services/clients.services.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';
+import dayjs from 'dayjs';
 // Lamda Service Call //
 async function LamdaServiceCall( url, data ) {
   try {
@@ -584,12 +584,11 @@ export async function migrateRevopIndex( req, res ) {
 export async function expireReviewStatus( req, res ) {
   try {
     const {
-      thresholdDate = '2025-12-20',
+      thresholdDate = '2025-12-29',
       batchSize = 500,
       storeId,
       dateString,
     } = req.body;
-    logger.info( { inputData: req.body, msg: '........1' } );
     const cutoffDate = new Date( thresholdDate );
     if ( Number.isNaN( cutoffDate.getTime() ) ) {
       return res.sendError( 'Invalid thresholdDate', 400 );
@@ -632,7 +631,6 @@ export async function expireReviewStatus( req, res ) {
 
     let firstResponse = await searchOpenSearchData( openSearch.footfallDirectory, query );
     let hitsBatch = firstResponse?.body?.hits?.hits || [];
-    logger.info( { hitsBatch } );
     scrollId = firstResponse?.body?._scroll_id;
 
     while ( hitsBatch.length > 0 ) {
@@ -642,25 +640,38 @@ export async function expireReviewStatus( req, res ) {
         const src = hit._source || {};
         const mappingInfo = Array.isArray( src.mappingInfo ) ? src.mappingInfo : [];
         let changed = false;
-        const updatedMapping = mappingInfo.map( ( item ) => {
+        let updatedMapping = mappingInfo.map( ( item ) => {
           if ( item?.type === 'review'&& item?.type !== 'Closed' && item?.dueDate ) {
             const due = new Date( item.dueDate );
             logger.info( { due, msg: '..........1', cutoffDate } );
             if ( !Number.isNaN( due.getTime() ) && due < cutoffDate ) {
               changed = true;
+
               return { ...item, status: 'Expired' };
             }
           }
+
           return item;
         } );
 
+        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' };
+            }
+          } );
+        }
+
 
         if ( changed ) {
           const doc = {
             mappingInfo: updatedMapping,
             status: 'Expired',
           };
-
+          logger.info( { updatedMapping } );
           bulkBody.push(
               { update: { _index: openSearch.footfallDirectory, _id: hit._id } },
               { doc: doc, doc_as_upsert: true },
@@ -1099,7 +1110,7 @@ export async function footFallImages( req, res ) {
             actionType: type,
             footfall: footfallValue,
             revicedFootfall: mapping.revicedFootfall ?? 0,
-            revicedPerc: mapping.revicedPerc ?? '--',
+            revicedPerc: mapping?.reviced?.toString() ?? '--',
             count: countObj,
             createdAt: mapping.createdAt ?? '',
             createdByEmail: mapping.createdByEmail ?? '',
@@ -1114,7 +1125,7 @@ export async function footFallImages( req, res ) {
             actionType: type,
             footfall: footfallValue,
             revicedFootfall: mapping.revicedFootfall ?? 0,
-            revicedPerc: mapping.revicedPerc ?? '--',
+            revicedPerc: mapping?.reviced?.toString() ?? '--',
             count: countObj,
             createdAt: mapping.createdAt ?? '',
             createdByEmail: mapping.createdByEmail ?? '',
@@ -1148,8 +1159,15 @@ export async function footFallImages( req, res ) {
 
 export async function tagTempId( req, res ) {
   try {
-    const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
+    const today = dayjs();
+    const diff = today.diff( inputData.dateString, 'day' );
+    const taggingDueDate = req?.client?.footfallDirectoryConfigs?.allowTangoReview || 0;
+    if ( diff > taggingDueDate ) {
+      return res.sendError( `Tagging is not allowed for a period exceeding ${taggingDueDate} days`, 400 );
+    }
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+
     const upsertRecord = {
       clientId: inputData.storeId.split( '-' )[0],
       storeId: inputData.storeId,

package/src/dtos/nob.dtos.js

@@ -21,19 +21,6 @@ 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/dtos/revop.dtos.js

@@ -48,18 +48,10 @@ export const tagTempIdSchema = joi.object( {
   storeId: joi.string().required(),
   dateString: joi.string().required().custom( ( value, helpers ) => {
     const inputDate = dayjs( value, 'YYYY-MM-DD', true );
-    const today = dayjs();
 
     if ( !inputDate.isValid() ) {
       return helpers.error( 'any.invalid' );
     }
-
-    const diff = today.diff( inputDate, 'day' );
-
-    if ( diff > 3 ) {
-      return helpers.message( 'Tagging is not allowed for a period exceeding 3 days' );
-    }
-
     return value;
   } ), // yyyy-mm-dd
   tempId: joi.number().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, zonelist, zonetemplate } from '../controllers/nob.controllers.js';
+import { addBills, getNobData, storeList } from '../controllers/nob.controllers.js';
 import { clientValidations, fieldValidation, roleVerification } from '../validations/nob.validations.js';
 
 const nobRouter=express.Router();
@@ -13,8 +13,4 @@ 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,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/nob.validations.js

@@ -121,7 +121,6 @@ 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 };
 

package/src/validations/revop.validation.js

@@ -241,6 +241,7 @@ export async function mappingConfig( req, res, next ) {
       },
     ];
     const getConfig = await aggregate( configQuery );
+    req.client = getConfig[0];
     const taggingLimitation = getConfig?.[0]?.effectiveLimitation?.values;
 
     // Find the tagging limitation for the given revopsType