tango-app-api-analysis-traffic 3.3.1-alpha.1 → 3.3.1-alpha.10-airtel

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.3.1-alpha.1",
+    "version": "3.3.1-alpha.10-airtel",
     "description": "Traffic Analysis",
     "main": "index.js",
     "type": "module",

package/src/controllers/tangoTrafficV1.controllers.js

@@ -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 = [
         {

package/src/controllers/tangoTrafficV3.controllers.js

@@ -588,10 +588,25 @@ 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 Count` :
+    'Bounced Count';
+    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` :
+  'MissedOpportunity';
     if ( !getClientData ) {
       return res.sendError( 'Invalid Client Id', 400 );
     }
     reqestData.featureConfigs = getClientData.featureConfigs;
+
+
     let LamdaURL = 'https://ewen2vlmxmhieea4elztlbjuey0ddqee.lambda-url.ap-south-1.on.aws/';
     let resultData;
     if ( reqestData.export ) {
@@ -619,7 +634,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' ) {
@@ -632,10 +647,10 @@ export const summaryTableV3 = async ( req, res ) => {
                   'Engagers': element.engagersCount,
                   'MissedOpportunity': 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,6 +661,29 @@ 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,
@@ -660,6 +698,7 @@ export const summaryTableV3 = async ( req, res ) => {
                   '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'],
@@ -2005,7 +2044,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 = {