tango-app-api-analysis-traffic 3.0.0-alpha.27 → 3.0.0-alpha.29

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.0.0-alpha.27",
+    "version": "3.0.0-alpha.29",
     "description": "Traffic Analysis",
     "main": "index.js",
     "type": "module",
@@ -22,7 +22,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "tango-api-schema": "^2.0.131",
-        "tango-app-api-middleware": "^3.1.26",
+        "tango-app-api-middleware": "^3.1.41",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/tangoTrafficV1.controllers.js

@@ -304,7 +304,7 @@ export const footfallDirectoryFoldersV1 = async ( req, res ) => {
     let resultData = await LamdaServiceCall( LamdaURL, reqestData );
     if ( resultData ) {
       if ( resultData.status_code == '200' ) {
-        return res.sendSuccess( resultData );
+        return res.sendSuccess( { ...resultData, isFootfallAuditStores: getClientData?.isFootfallAuditStores } );
       } else {
         return res.sendError( 'No Content', 204 );
       }
@@ -329,7 +329,7 @@ export const footfallDirectoryV1 = async ( req, res ) => {
     let resultData = await LamdaServiceCall( LamdaURL, reqestData );
     if ( resultData ) {
       if ( resultData.status_code == '200' ) {
-        return res.sendSuccess( resultData );
+        return res.sendSuccess( { ...resultData, isFootfallAuditStores: getClientData?.isFootfallAuditStores } );
       } else {
         return res.sendError( 'No Content', 204 );
       }
@@ -351,7 +351,29 @@ export const summaryTableV1 = async ( req, res ) => {
     }
     reqestData.featureConfigs = getClientData.featureConfigs;
     let LamdaURL = 'https://fpmvquqpi7xw6hpaalxa5oa6pi0cvbql.lambda-url.ap-south-1.on.aws/';
-    let resultData = await LamdaServiceCall( LamdaURL, reqestData );
+    let resultData;
+    if ( reqestData.export ) {
+      let limit = 10000;
+      let count = 0;
+      for ( let i=0; i<=limit; i += 1000 ) {
+        reqestData.limit = 1000;
+        reqestData.offset = count;
+        let data = await LamdaServiceCall( LamdaURL, reqestData );
+        count ++;
+        if ( data.status_code == '200' && data.summaryData.length ) {
+          data = {
+            'status_code': '200',
+            'totalCount': resultData?.totalCount ? resultData?.totalCount + data.totalCount : data.totalCount,
+            'summaryData': resultData?.summaryData ? [ ...resultData?.summaryData, ...data.summaryData ] : data.summaryData,
+          };
+          resultData = data;
+        } else {
+          break;
+        }
+      }
+    } else {
+      resultData = await LamdaServiceCall( LamdaURL, reqestData );
+    }
     if ( resultData ) {
       if ( resultData.status_code == '200' ) {
         if ( reqestData.export ) {
@@ -360,24 +382,24 @@ export const summaryTableV1 = async ( req, res ) => {
             resultData.summaryData.forEach( ( element ) => {
               exportdata.push( {
                 'Store Name': element.storeName,
-                'Store Id': element.storeId,
-                'Footfall Count': element.footfallCount,
+                'Store ID': element.storeId,
+                ...( req.body.storeId.length ==1 ) ? { Date: element['date'] }:{},
+                'Footfall': element.footfallCount,
                 'Bounced Count': element.bouncedCount,
-                'Engagers Count': element.engagersCount,
+                'Engagers': element.engagersCount,
+                'MissedOpportunity': element.missedOpportunityCount,
+                'Potential Buyers': element.potentialBuyersCount,
                 'Conversion Rate': element.conversionRate,
-                'PotentialBuyers Count': element.potentialBuyersCount,
-                'MissedOpportunity Count': element.missedOpportunityCount,
-                'AVG Dwell Time': element.avgDwellTime,
-                'AVG InfraDown Time': element.avgInfraDowntime,
-                'Male': element.male,
-                'Female': element.female,
-                'below12': element.below12,
+                'Avg.Dwell Time': element.avgDwellTime,
+                'Avg.Infra DownTime': element.avgInfraDowntime,
+                'Below12': element.below12,
                 '13-19': element['13-19'],
                 '20-30': element['20-30'],
-                '31-40': element['31-40'],
-                '41-50': element['41-50'],
-                '51-60': element['51-60'],
+                '31-45': element['31-45'],
+                '46-59': element['46-59'],
                 '60 above': element['60 above'],
+                'Male': element.male,
+                'Female': element.female,
               } );
             } );
             return await download( exportdata, res );
@@ -461,21 +483,32 @@ export const performanceMatrixV1 = async ( req, res ) => {
     let resultData = await LamdaServiceCall( LamdaURL, reqestData );
     if ( resultData ) {
       if ( resultData.status_code == '200' ) {
-        let data = JSON.parse( JSON.stringify( resultData.performanceData ) );
-        data.forEach( ( item, index ) => {
+        resultData.performanceData.forEach( ( item ) => {
+          delete item.top;
+          delete item.left;
+        } );
+        let data = [];
+        resultData.performanceData.forEach( ( item, index ) => {
+          data.push( item );
           if ( item.position == 'High_Low' ) {
-            data[index].left = ( Math.floor( Math.random() * 46 ) + 5 ) + '%';
-            data[index].top = ( Math.floor( Math.random() * 46 ) + 51 ) + '%';
+            data[index].left = Math.floor( Math.random() * 40 );
+            data[index].top = Math.floor( Math.random() * 37 ) + 7;
           } else if ( item.position == 'High_High' ) {
-            data[index].left = ( Math.floor( Math.random() * 46 ) + 51 ) + '%';
-            data[index].top = ( Math.floor( Math.random() * 46 ) + 51 ) + '%';
+            data[index].left = Math.floor( Math.random() * 40 ) + 50;
+            data[index].top = Math.floor( Math.random() * 37 ) + 7; ;
           } else if ( item.position == 'Low_Low' ) {
-            data[index].left = ( Math.floor( Math.random() * 46 ) + 5 ) + '%';
-            data[index].top = ( Math.floor( Math.random() * 46 ) + 5 ) + '%';
-            console.log( data[index].left );
+            data[index].left = Math.floor( Math.random() * 40 );
+            data[index].top = Math.floor( Math.random() * 37 ) + 51;
           } else {
-            data[index].left = ( Math.floor( Math.random() * 46 ) + 51 ) + '%';
-            data[index].top = ( Math.floor( Math.random() * 46 ) + 5 ) + '%';
+            data[index].left = Math.floor( Math.random() * 40 ) + 50;
+            data[index].top = Math.floor( Math.random() * 37 ) + 51;
+          }
+          let maxTop = data[index].top + 3;
+          let minTop = data[index].top - 3;
+          let checkNearest = data.filter( ( ele ) => ele.position == item.position && minTop <= ele.top && maxTop >= ele.top );
+          if ( checkNearest.length ) {
+            data[index].top = data[index].top + 3;
+            data[index].left = data[index].left + 5;
           }
         } );
         resultData.performanceData = data;
@@ -1287,7 +1320,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 } );
+    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 } );
     if ( !getClientData ) {
       return false;
     }
@@ -1298,44 +1331,6 @@ async function getClientConfig( clientId ) {
   }
 }
 
-export async function isAllowedClient( req, res, next ) {
-  try {
-    let reqestData = req.body;
-    let getUserEmail = req.user.email;
-    let getUserType = req.user.userType;
-    let getClientId = req.user.clientId;
-    let getRole = req.user.role;
-    if ( getUserType == 'tango' ) {
-      if ( getRole == 'superadmin' ) {
-        next();
-      } else {
-        const assignedQuery = {
-          userEmail: getUserEmail,
-          assignedType: 'client',
-          assignedValue: reqestData.clientId,
-        };
-        const getAssignedType = await findOneUserAssignedStore( assignedQuery );
-        if ( getAssignedType ) {
-          next();
-        } else {
-          return res.sendError( 'Client Not Assigned', 400 );
-        }
-      }
-    } else if ( getUserType == 'client' ) {
-      if ( getClientId == reqestData.clientId ) {
-        next();
-      } else {
-        return res.sendError( 'Client Not Assigned', 400 );
-      }
-    } else {
-      return res.sendError( 'Client Not Assigned', 400 );
-    }
-  } catch ( error ) {
-    logger.error( { error: error, function: 'isAllowedClient' } );
-    return res.sendError( error, 500 );
-  }
-}
-
 export const getMySubscription = async ( req, res ) => {
   try {
     let reqestData = req.body;

package/src/routes/mobileTraffic.routes.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { validate, isAllowedSessionHandler, authorize } from 'tango-app-api-middleware';
+import { validate, isAllowedMobileSessionHandler, authorize } from 'tango-app-api-middleware';
 import * as validationDtos from '../dtos/validation.dtos.js';
 export const mobileTrafficAnalysisRouter = express.Router();
 import {
@@ -21,85 +21,85 @@ import {
 } from '../controllers/mobileTraffic.controllers.js';
 
 mobileTrafficAnalysisRouter
-    .post( '/cardsFunnel_v1', isAllowedSessionHandler, isAllowedClient, authorize( {
+    .post( '/cardsFunnel_v1', isAllowedMobileSessionHandler, isAllowedClient, authorize( {
       userType: [ 'tango', 'client' ], access: [
         { featureName: 'analytics', name: 'tangoTraffic', permissions: [ 'isView' ] },
       ],
     } ), validate( validationDtos.validateCardFunnelParams ), cardsFunnelV1 )
 
-    .post( '/cardsGraphs_v1', isAllowedSessionHandler, isAllowedClient, authorize( {
+    .post( '/cardsGraphs_v1', isAllowedMobileSessionHandler, isAllowedClient, authorize( {
       userType: [ 'tango', 'client' ], access: [
         { featureName: 'analytics', name: 'tangoTraffic', permissions: [ 'isView' ] },
       ],
     } ), validate( validationDtos.validateCardGraphParams ), cardsGraphsV1 )
 
-    .post( '/recapVideo_v1', isAllowedSessionHandler, isAllowedClient, authorize( {
+    .post( '/recapVideo_v1', isAllowedMobileSessionHandler, isAllowedClient, authorize( {
       userType: [ 'tango', 'client' ], access: [
         { featureName: 'analytics', name: 'tangoTraffic', permissions: [ 'isView' ] },
       ],
     } ), validate( validationDtos.validateRecapVideoParams ), recapVideoV1 )
 
-    .post( '/densityDwell_v1', isAllowedSessionHandler, isAllowedClient, authorize( {
+    .post( '/densityDwell_v1', isAllowedMobileSessionHandler, isAllowedClient, authorize( {
       userType: [ 'tango', 'client' ], access: [
         { featureName: 'analytics', name: 'tangoTraffic', permissions: [ 'isView' ] },
       ],
     } ), validate( validationDtos.validateDensityDwellParams ), densityDwellV1 )
 
-    .post( '/overallCards_v1', isAllowedSessionHandler, isAllowedClient, authorize( {
+    .post( '/overallCards_v1', isAllowedMobileSessionHandler, isAllowedClient, authorize( {
       userType: [ 'tango', 'client' ], access: [
         { featureName: 'analytics', name: 'tangoTraffic', permissions: [ 'isView' ] },
       ],
     } ), validate( validationDtos.validateOverallCharParams ), overallCardsV1 )
 
-    .post( '/overallChart_v1', isAllowedSessionHandler, isAllowedClient, authorize( {
+    .post( '/overallChart_v1', isAllowedMobileSessionHandler, isAllowedClient, authorize( {
       userType: [ 'tango', 'client' ], access: [
         { featureName: 'analytics', name: 'tangoTraffic', permissions: [ 'isView' ] },
       ],
     } ), validate( validationDtos.validateOverallCharParams ), overallChartV1 )
 
-    .post( '/singleStoreChart_v1', isAllowedSessionHandler, isAllowedClient, authorize( {
+    .post( '/singleStoreChart_v1', isAllowedMobileSessionHandler, isAllowedClient, authorize( {
       userType: [ 'tango', 'client' ], access: [
         { featureName: 'analytics', name: 'tangoTraffic', permissions: [ 'isView' ] },
       ],
     } ), validate( validationDtos.validateSingleStoreChartParams ), singleStoreChartV1 )
 
-    .post( '/demographicChart_v1', isAllowedSessionHandler, isAllowedClient, authorize( {
+    .post( '/demographicChart_v1', isAllowedMobileSessionHandler, isAllowedClient, authorize( {
       userType: [ 'tango', 'client' ], access: [
         { featureName: 'analytics', name: 'tangoTraffic', permissions: [ 'isView' ] },
       ],
     } ), validate( validationDtos.validateDemographicChartParams ), demographicChartV1 )
 
-    .post( '/buyerChart_v1', isAllowedSessionHandler, isAllowedClient, authorize( {
+    .post( '/buyerChart_v1', isAllowedMobileSessionHandler, isAllowedClient, authorize( {
       userType: [ 'tango', 'client' ], access: [
         { featureName: 'analytics', name: 'tangoTraffic', permissions: [ 'isView' ] },
       ],
     } ), validate( validationDtos.validateBuyerChartParams ), buyerChartV1 )
 
-    .post( '/footfallDirectoryFolders_v1', isAllowedSessionHandler, isAllowedClient, authorize( {
+    .post( '/footfallDirectoryFolders_v1', isAllowedMobileSessionHandler, isAllowedClient, authorize( {
       userType: [ 'tango', 'client' ], access: [
         { featureName: 'analytics', name: 'tangoTraffic', permissions: [ 'isView' ] },
       ],
     } ), validate( validationDtos.validateFootfallDirectoryFoldersParams ), footfallDirectoryFoldersV1 )
 
-    .post( '/footfallDirectory_v1', isAllowedSessionHandler, isAllowedClient, authorize( {
+    .post( '/footfallDirectory_v1', isAllowedMobileSessionHandler, isAllowedClient, authorize( {
       userType: [ 'tango', 'client' ], access: [
         { featureName: 'analytics', name: 'tangoTraffic', permissions: [ 'isView' ] },
       ],
     } ), validate( validationDtos.validateFootfallDirectoryParams ), footfallDirectoryV1 )
 
-    .post( '/storeOperation_v1', isAllowedSessionHandler, isAllowedClient, authorize( {
+    .post( '/storeOperation_v1', isAllowedMobileSessionHandler, isAllowedClient, authorize( {
       userType: [ 'tango', 'client' ], access: [
         { featureName: 'analytics', name: 'tangoTraffic', permissions: [ 'isView' ] },
       ],
     } ), validate( validationDtos.validateStoreOperationParams ), storeOperationV1 )
 
-    .post( '/zoneDwellTimeSplit_v1', isAllowedSessionHandler, isAllowedClient, authorize( {
+    .post( '/zoneDwellTimeSplit_v1', isAllowedMobileSessionHandler, isAllowedClient, authorize( {
       userType: [ 'tango', 'client' ], access: [
         { featureName: 'analytics', name: 'tangoTraffic', permissions: [ 'isView' ] },
       ],
     } ), validate( validationDtos.validateStoreOperationParams ), zoneDwellTimeSplitV1 )
 
-    .post( '/getMySubscription_v1', isAllowedSessionHandler, validate( validationDtos.getMyProductParams ), getMySubscription );
+    .post( '/getMySubscription_v1', isAllowedMobileSessionHandler, validate( validationDtos.getMyProductParams ), getMySubscription );
 
 
 export default mobileTrafficAnalysisRouter;

package/src/routes/traffic.routes.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { validate, isAllowedSessionHandler, authorize } from 'tango-app-api-middleware';
+import { validate, isAllowedSessionHandler, authorize, isAllowedClient } from 'tango-app-api-middleware';
 import * as validationDtos from '../dtos/validation.dtos.js';
 
 export const analysisTrafficRouter = express.Router();
@@ -51,7 +51,6 @@ import {
   headerStoresV1,
   headerLocationsV1,
   headerGroupsV1,
-  isAllowedClient,
   getMySubscription,
   getStoreMapData,
 } from '../controllers/tangoTrafficV1.controllers.js';