tango-app-api-analysis-traffic 3.0.0-alpha.47 → 3.0.0-alpha.49

package/package.json

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

package/src/controllers/nob.controllers.js

@@ -156,7 +156,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 filter = [
       {
         'terms': {
@@ -170,28 +170,47 @@ export async function getNobData( req, res ) {
     ];
     if ( req.user.role !== 'superadmin' && req.user.userType !== 'tango' ) {
       filter.push(
-          req.user.userType !== 'tango',
+          {
+            'terms': {
+              'storeId.keyword': inputData?.assignedStores,
+            },
+          },
       );
     }
+    temp = {
+      'must': filter,
+    };
 
     if ( inputData.searchValue && inputData.searchValue!== '' ) {
       const searchValue = escapeSpecialChars( inputData.searchValue );
       logger.info( { searchvalue: inputData.searchValue, searchValue: searchValue } );
-      filter.push(
+      temp = {
+        'must': filter,
+        'should': [
           {
             'wildcard': {
               'storeId.keyword': {
                 'value': `${searchValue}*`,
               },
+            },
+          },
+          {
+            'wildcard': {
               'storeCode.keyword': {
                 'value': `${searchValue}*`,
               },
+            },
+          },
+          {
+            'wildcard': {
               'storeName.keyword': {
                 'value': `${searchValue}*`,
               },
             },
           },
-      );
+        ],
+        'minimum_should_match': 1,
+      };
     }
     const getClient = await findOne( { clientId: req.clientId }, { featureConfigs: 1 } );
     const openSearch = JSON.parse( process.env.OPENSEARCH );
@@ -201,21 +220,38 @@ export async function getNobData( req, res ) {
       'from': skip,
       'size': limit,
       'query': {
-        'bool': {
-          'must': filter,
-        },
+        'bool': temp,
       },
     };
 
     const getNobData=await getOpenSearchData( openSearch.nob, nobQuery );
     const nobData = getNobData?.body?.hits?.hits;
     if ( !nobData ||nobData?.length == 0 ) {
-      return res.sendError( 'No Data Found', 204 );
+      const initialQuery={
+        'size': 1,
+        'query': {
+          'bool': {
+            'must': [
+              {
+                'term': {
+                  'clientId.keyword': req.clientId,
+                },
+              },
+            ],
+          },
+        },
+      };
+      const getInitialData=await getOpenSearchData( openSearch.nob, initialQuery );
+      const initialData = getInitialData?.body?.hits?.hits;
+      logger.info( { initialData: initialData, clientId: req.clientId } );
+      if ( initialData && initialData.length > 0 ) {
+        return res.sendError( 'No Data Found', 204 );
+      } else {
+        return res.sendSuccess( { initialInsert: false } );
+      }
     }
 
     const footfallQuery={
-      // 'from': skip,
-      // 'size': limit,
       'query': {
         'bool': {
           'must': [
@@ -304,24 +340,24 @@ export async function getNobData( req, res ) {
             'Store Id': element.storeId,
             'Date': dayjs( element.nobDate ).format( 'D MMM,YYYY' ),
             'NoB\'s Count': element.nobCount,
-            'Conversion Rate': `${element.conversionRate} %`,
-
 
           } );
           switch ( getClient?.featureConfigs?.conversionCalculation ) {
             case 'footfall-count':
-              exportData['Footfall'] = element.footfallCount;
+              exportData[index]['Footfall'] = element.footfallCount;
               break;
             case 'billable-entities':
-              exportData['Potential Buyers'] = element.potentialBuyers;
+              exportData[index]['Potential Buyers'] = element.potentialBuyers;
               break;
             case 'engagers-count':
-              exportData['Engagers Count'] = element.engagersCount;
+              exportData[index]['Engagers Count'] = element.engagersCount;
               break;
             default:
-              exportData['Engagers Count'] = element.engagersCount;
+              exportData[index]['Engagers Count'] = element.engagersCount;
           }
+          element.conversionRate? exportData[index]['Conversion Rate'] = `${element.conversionRate} %` : exportData[index]['Conversion Rate'] =null;
         } );
+        logger.info( { exportData: exportData } );
         return exportData;
       } );
       const mappedArrays = await Promise.all( promises );

package/src/routes/nob.routes.js

@@ -2,14 +2,14 @@ import express from 'express';
 import { accessVerification, 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 { clientValidations } from '../validations/nob.validations.js';
+import { clientValidations, roleVerification } from '../validations/nob.validations.js';
 
 const nobRouter=express.Router();
 
 // store list
 nobRouter.get( '/store-list', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), validate( storeListValid ), clientValidations, getAssinedStore, storeList );
 
-nobRouter.post( '/add-bills', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), validate( addBillsValid ), clientValidations, addBills );
+nobRouter.post( '/add-bills', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), validate( addBillsValid ), roleVerification, clientValidations, addBills );
 
 nobRouter.post( '/get-nob-data', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), validate( getNobDataValid ), clientValidations, getAssinedStore, getNobData );
 

package/src/validations/nob.validations.js

@@ -13,3 +13,16 @@ export async function clientValidations( req, res, next ) {
     return res.sendError( err, 500 );
   }
 }
+
+export async function roleVerification( req, res, next ) {
+  try {
+    if ( [ 'admin', 'superadmin' ].includes( req?.user?.role ) ) {
+      return next();
+    } else {
+      return res.sendError( 'access forbidden', 403 );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, message: req.body, function: 'nob-roleVerification' } );
+    return res.sendError( error, 500 );
+  }
+}