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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.8.7-vms.32",
+    "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/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 };