tango-app-api-analysis-traffic 3.1.0-alpha.8 → 3.3.1-alpha-1-1

package/index.js

@@ -4,7 +4,6 @@ import { analysisTrafficRouter } from './src/routes/traffic.routes.js';
 import { mobileTrafficAnalysisRouter } from './src/routes/mobileTraffic.routes.js';
 import { nobDocs } from './src/docs/nob.docs.js';
 import nobRouter from './src/routes/nob.routes.js';
-import emailersRouter from './src/routes/emailers.js';
 
-export { analysisTrafficRouter, mobileTrafficAnalysisRouter, nobDocs, nobRouter, emailersRouter };
+export { analysisTrafficRouter, mobileTrafficAnalysisRouter, nobDocs, nobRouter };
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.1.0-alpha.8",
+    "version": "3.3.1-alpha-1-1",
     "description": "Traffic Analysis",
     "main": "index.js",
     "type": "module",
@@ -18,16 +18,13 @@
         "dotenv": "^16.4.5",
         "express": "^4.19.2",
         "handlebars": "^4.7.8",
-        "html-pdf": "^3.0.1",
-        "html-pdf-node": "^1.0.8",
         "joi-to-swagger": "^6.2.0",
         "lodash": "^4.17.21",
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
-        "puppeteer": "^23.11.1",
         "swagger-ui-express": "^5.0.1",
         "tango-api-schema": "^2.2.7",
-        "tango-app-api-middleware": "^3.1.53",
+        "tango-app-api-middleware": "^3.1.55",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/tangoTrafficV1.controllers.js

@@ -1,4 +1,4 @@
-import { logger, download, signedUrl } from 'tango-app-api-middleware';
+import { logger, download, signedUrl, getChecklistUsers } from 'tango-app-api-middleware';
 import * as clientService from '../services/clients.services.js';
 import {
   aggregateStore,
@@ -1070,6 +1070,8 @@ export const headerStoresV2 = async ( req, res ) => {
                 { storeId: { $in: totalStores } },
                 { storeId: { $in: unqueCityStores } },
                 { storeId: { $in: unqueGroupStores } },
+                { 'edge.firstFile': true },
+                { status: { $eq: 'active' } },
               ],
             },
           },
@@ -1089,6 +1091,8 @@ export const headerStoresV2 = async ( req, res ) => {
               $and: [
                 { storeId: { $in: totalStores } },
                 { storeId: { $in: uniqueCityStores } },
+                { 'edge.firstFile': true },
+                { status: { $eq: 'active' } },
               ],
             },
           },
@@ -1108,6 +1112,8 @@ export const headerStoresV2 = async ( req, res ) => {
               $and: [
                 { storeId: { $in: totalStores } },
                 { storeId: { $in: uniqueclusterStores } },
+                { 'edge.firstFile': true },
+                { status: { $eq: 'active' } },
               ],
             },
           },
@@ -1126,6 +1132,8 @@ export const headerStoresV2 = async ( req, res ) => {
             $match: {
               $and: [
                 { storeId: { $in: totalStores } },
+                { 'edge.firstFile': true },
+                { status: { $eq: 'active' } },
               ],
             },
           },
@@ -1360,6 +1368,7 @@ async function getAssignedAllStores( userClientId ) {
             $and: [
               { clientId: { $eq: userClientId } },
               { status: { $eq: 'active' } },
+              { 'edge.firstFile': true },
             ],
           },
         },
@@ -1489,6 +1498,7 @@ async function getLocationStores( userClientId, cityList, req ) {
       if ( req.body.assignedStores&&req.body.assignedStores.length>0 ) {
         filter.push( { storeId: { $in: req.body.assignedStores } } );
       }
+      filter.push( { 'edge.firstFile': true }, { status: { $eq: 'active' } } );
 
       let storeQuery = [
         {
@@ -1928,3 +1938,21 @@ export const getStoreMapData = async ( req, res ) => {
 // }
 // let getGEO = await getGeocodedAddress( 12.900260100404893, 80.23384232089138 );
 //     console.log( 'getGEO =>', getGEO );
+
+export async function getUserEmails( req, res ) {
+  try {
+    let requestData = req.body;
+    // Get User Based Checklist //
+    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    let getUserEmails = await getChecklistUsers( loginUser );
+    // End: Get User Based Checklist////
+    if ( !getUserEmails.length ) {
+      return res.sendError( { error: 'No Users Found' }, 204 );
+    } else {
+      return res.sendSuccess( { userEmailData: getUserEmails } );
+    }
+  } catch ( e ) {
+    logger.error( { function: 'getUserEmails', error: e, message: req.body } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/controllers/tangoTrafficV3.controllers.js

@@ -588,6 +588,19 @@ export const summaryTableV3 = async ( req, res ) => {
   try {
     let reqestData = req.body;
     let getClientData = await getClientConfig( reqestData.clientId );
+    let featureConfigs = getClientData?.featureConfigs || {};
+    const engagersLabel = featureConfigs?.bouncedLimit?.value ?
+    `More than ${featureConfigs.bouncedLimit.value} mins` :
+    'Engagers';
+    const bouncedLabel = featureConfigs?.bouncedLimit?.value ?
+    `Less than ${featureConfigs.bouncedLimit.value} mins Footfall` :
+    'Bounced Footfall';
+    const conversionLabel = featureConfigs?.conversion?.value ?
+    `More than ${featureConfigs.conversion.value} mins Rate` :
+    'Conversion Rate';
+    const missedlabel = featureConfigs?.bouncedLimit?.value && featureConfigs?.conversion?.value ?
+  `${featureConfigs.bouncedLimit.value} - ${featureConfigs.conversion.value} mins` :
+  'Missed Opportunity';
     if ( !getClientData ) {
       return res.sendError( 'Invalid Client Id', 400 );
     }
@@ -619,7 +632,7 @@ export const summaryTableV3 = async ( req, res ) => {
     if ( resultData ) {
       if ( resultData.status_code == '200' ) {
         if ( reqestData.export ) {
-          if ( resultData.summaryData.length>0 ) {
+          if ( resultData.summaryData.length > 0 ) {
             const exportdata = [];
             resultData.summaryData.forEach( ( element ) => {
               if ( reqestData.clientId === '193' ) {
@@ -628,14 +641,14 @@ export const summaryTableV3 = async ( req, res ) => {
                   'Store ID': element.storeId,
                   ...( req.body.storeId.length ==1 ) ? { Date: element['date'] }:{},
                   'Footfall': element.footfallCount,
-                  'Bounced Count': element.bouncedCount,
+                  'Bounced Footfall': element.bouncedCount,
                   'Engagers': element.engagersCount,
-                  'MissedOpportunity': element.missedOpportunityCount,
+                  'Missed Opportunity': element.missedOpportunityCount,
                   'Potential Buyers': element.potentialBuyersCount,
-                  'Conversion Rate': element.conversionRate,
                   'NOB Count': element.NOBCount,
                   'Avg.Dwell Time': element.avgDwellTime,
                   'Avg.Infra DownTime': element.avgInfraDowntime,
+                  ...( element.passerBy_count !== undefined ? { 'Passer By': element.passerBy_count } : {} ),
                   'Below12': element.below12,
                   '13-19': element['13-19'],
                   '20-30': element['20-30'],
@@ -646,20 +659,44 @@ export const summaryTableV3 = async ( req, res ) => {
                   'Male': element.male,
                   'Female': element.female,
                 } );
+              } else if ( reqestData.clientId === '452' ) {
+                exportdata.push( {
+                  'Store Name': element.storeName,
+                  'Store ID': element.storeId,
+                  ...( req.body.storeId.length ==1 ) ? { Date: element['date'] }:{},
+                  'Footfall': element.footfallCount,
+                  ...( bouncedLabel ? { [bouncedLabel]: element.bouncedCount } : {} ),
+                  ...( engagersLabel ? { [engagersLabel]: element.engagersCount } : {} ),
+                  ...( missedlabel ? { [missedlabel]: element.missedOpportunityCount } : {} ),
+                  ...( conversionLabel ? { [conversionLabel]: element.conversionRate } : {} ),
+                  'NOB Count': element.NOBCount,
+                  'Avg.Dwell Time': element.avgDwellTime,
+                  'Avg.Infra DownTime': element.avgInfraDowntime,
+                  ...( element.passerBy_count !== undefined ? { 'Passer By': element.passerBy_count } : {} ),
+                  'Below12': element.below12,
+                  '13-19': element['13-19'],
+                  '20-30': element['20-30'],
+                  '31-45': element['31-45'],
+                  '46-59': element['46-59'],
+                  '60 above': element['60 above'],
+                  'Male': element.male,
+                  'Female': element.female,
+                } );
               } else {
                 exportdata.push( {
                   'Store Name': element.storeName,
                   'Store ID': element.storeId,
                   ...( req.body.storeId.length ==1 ) ? { Date: element['date'] }:{},
                   'Footfall': element.footfallCount,
-                  'Bounced Count': element.bouncedCount,
+                  'Bounced Footfall': element.bouncedCount,
                   'Engagers': element.engagersCount,
-                  'MissedOpportunity': element.missedOpportunityCount,
+                  'Missed Opportunity': element.missedOpportunityCount,
                   'Potential Buyers': element.potentialBuyersCount,
                   'Conversion Rate': element.conversionRate,
                   'NOB Count': element.NOBCount,
                   'Avg.Dwell Time': element.avgDwellTime,
                   'Avg.Infra DownTime': element.avgInfraDowntime,
+                  ...( element.passerBy_count !== undefined ? { 'Passer By': element.passerBy_count } : {} ),
                   'Below12': element.below12,
                   '13-19': element['13-19'],
                   '20-30': element['20-30'],
@@ -753,27 +790,48 @@ export const performanceMatrixV3 = async ( req, res ) => {
     if ( resultData ) {
       if ( resultData.status_code == '200' ) {
         let data = [];
-        resultData.performanceData.forEach( ( item, index ) => {
-          let findprevIndex = data.findLastIndex( ( ele ) => ele.position == item.position );
-          if ( findprevIndex != -1 ) {
-            item.top = data[findprevIndex].top + 7;
-            item.left = data[findprevIndex].left + 5;
+        let performanceData = resultData.performanceData.reduce( ( acc, ele ) => {
+          if ( !acc[ele.position] ) {
+            console.log( ele );
+            acc[ele.position] = [ ele ];
           } else {
-            if ( item.position == 'High_Low' ) {
-              item.left = 5;
-              item.top = 10;
-            } else if ( item.position == 'High_High' ) {
-              item.left = 50;
-              item.top = 10;
-            } else if ( item.position == 'Low_Low' ) {
-              item.left = 5;
-              item.top = 55;
+            acc[ele.position].push( ele );
+          }
+          return acc;
+        }, {} );
+
+        Object.keys( performanceData ).forEach( ( key ) => {
+          performanceData[key].forEach( ( item, index ) => {
+            let findprevIndex = data.findIndex( ( ele ) => ele.position == item.position );
+            let findLastIndex = data.findLastIndex( ( ele ) => ele.position == item.position );
+            if ( findprevIndex != -1 ) {
+              let num = index < 5 ? 0 : index < 10 ? 10 : 20;
+              let left = data[findLastIndex].left;
+              let leftNum = 8;
+              if ( [ 0, 5, 10 ].includes( index ) ) {
+                left = data[findprevIndex].left;
+                leftNum = 0;
+              }
+              console.log( leftNum );
+              item.top = data[findprevIndex].top + num;
+              item.left = left + leftNum;
             } else {
-              item.left = 50;
-              item.top = 55;
+              if ( item.position == 'High_Low' ) {
+                item.left = 3;
+                item.top = 10;
+              } else if ( item.position == 'High_High' ) {
+                item.left = 55;
+                item.top = 10;
+              } else if ( item.position == 'Low_Low' ) {
+                item.left = 3;
+                item.top = 55;
+              } else {
+                item.left = 55;
+                item.top = 55;
+              }
             }
-          }
-          data.push( item );
+            data.push( item );
+          } );
         } );
         resultData.performanceData = data;
         return res.sendSuccess( resultData );
@@ -2005,7 +2063,7 @@ async function getGroupStoresIds( userClientId, storeIds, getRole, getUserType,
 
 async function getClientConfig( clientId ) {
   try {
-    let getClientData = await clientService.findOne( { clientId: clientId }, { 'paymentInvoice.currencyType': 1, 'averageTransactionValue': 1, 'featureConfigs.billableCalculation': 1, 'featureConfigs.missedOpportunityCalculation': 1, 'featureConfigs.conversionCalculation': 1, 'featureConfigs.open': 1, 'featureConfigs.close': 1, 'isFootfallAuditStores': 1 } );
+    let getClientData = await clientService.findOne( { clientId: clientId }, { 'paymentInvoice.currencyType': 1, 'averageTransactionValue': 1, 'featureConfigs.billableCalculation': 1, 'featureConfigs.missedOpportunityCalculation': 1, 'featureConfigs.conversionCalculation': 1, 'featureConfigs.open': 1, 'featureConfigs.close': 1, 'isFootfallAuditStores': 1, 'featureConfigs.bouncedLimit': 1, 'featureConfigs.conversion': 1 } );
     if ( !getClientData ) {
       return false;
     }

package/src/dtos/nob.dtos.js

@@ -8,10 +8,15 @@ export const addBillsSchema = joi.object( {
           'string.empty': 'Please enter a valid Store ID',
           'any.required': 'Store ID is required',
         } ).allow( null ),
-        nobDate: joi.string().required().messages( {
-          'string.empty': 'Please enter a valid NOB Date',
-          'any.required': 'NOB Date is required',
-        } ).allow( null ),
+        nobDate: joi.string()
+            .pattern( /^\d{4}-\d{2}-\d{2}$/ ) // Ensures format YYYY-MM-DD
+            .required()
+            .messages( {
+              'string.pattern.base': 'NOB Date must be in YYYY-MM-DD format',
+              'string.empty': 'Please enter a valid NOB Date',
+              'any.required': 'NOB Date is required',
+            } )
+            .allow( null ),
         nobCount: joi.number().required().messages( {
           'string.empty': 'Please enter a valid NOB Count',
           'any.required': 'NOB Count is required',

package/src/dtos/validation.dtos.js

@@ -10,6 +10,7 @@ const baseSchema = {
   nob: joi.boolean().optional().allow( '' ),
   dateType: joi.string().optional().allow( '' ),
   normalize: joi.boolean().optional().allow( '' ),
+  conversiontype: joi.string().optional().allow( '' ),
 };
 
 // Schema for Card Funnel
@@ -37,6 +38,7 @@ export const validateRecapVideoSchema = joi.object( {
   recapVideoDate: joi.string().required(),
   valueType: joi.string().optional().allow( '' ),
   nob: joi.boolean().optional().allow( '' ),
+  conversiontype: joi.string().optional().allow( '' ),
 } );
 
 export const validateRecapVideoParams = {
@@ -192,6 +194,7 @@ export const validateperformanceMatrixSchema = joi.object( {
   ...baseSchema,
   processtype1: joi.string().required(),
   processtype2: joi.string().required(),
+  topStores: joi.number().optional().allow( '' ),
 } );
 
 export const validateperformanceMatrixParams = {
@@ -233,23 +236,3 @@ export const getStoreCameraImageSchema = joi.object( {
 export const getStoreCameraImageParams = {
   body: getStoreCameraImageSchema,
 };
-
-export const createEmailersSchema = joi.object( {
-  clientId: joi.string().required(),
-  fromDate: joi.string().required(),
-  toDate: joi.string().required(),
-  templateType: joi.string().required(),
-} );
-
-export const createEmailersParams = {
-  body: createEmailersSchema,
-};
-
-export const sendEmailersSchema = joi.object( {
-  _id: joi.string().required(),
-} );
-
-export const sendEmailersParams = {
-  body: sendEmailersSchema,
-};
-

package/src/routes/traffic.routes.js

@@ -57,6 +57,7 @@ import {
   headerStoresV2,
   headerClustersV2,
   headerLocationsV2,
+  getUserEmails,
 } from '../controllers/tangoTrafficV1.controllers.js';
 
 import {
@@ -165,6 +166,7 @@ analysisTrafficRouter
     .post( '/storeOperation_v3', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateStoreOperationParams ), storeOperationV3 )
     .post( '/performanceMatrix_v3', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateperformanceMatrixParams ), performanceMatrixV3 )
     .post( '/zoneDwellTimeSplit_v3', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateStoreOperationParams ), zoneDwellTimeSplitV3 )
-    .post( '/storesMap_v1', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateStoresMapParams ), storesMapV1 );
+    .post( '/storesMap_v1', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateStoresMapParams ), storesMapV1 )
+    .post( '/headerUserEmails_v2', isAllowedSessionHandler, getUserEmails );
 
 export default analysisTrafficRouter;