tango-app-api-analysis-traffic 3.0.0-alpha.56 → 3.0.0-alpha.58

package/package.json

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

package/src/controllers/nob.controllers.js

@@ -99,7 +99,7 @@ export async function getNobData( req, res ) {
       },
       {
         range: { nobDate: { gte: dateRange.start,
-          lt: dateRange.end } },
+          lte: dateRange.end } },
       },
     ];
     if ( req.user.role !== 'superadmin' && req.user.userType !== 'tango' ) {
@@ -161,7 +161,7 @@ export async function getNobData( req, res ) {
     const getNobData=await getOpenSearchData( openSearch.nob, nobQuery );
     const nobData = getNobData?.body?.hits?.hits;
     if ( !nobData ||nobData?.length == 0 ) {
-      if ( inputData.searchValue && inputData.searchValue!== '' ) {
+      if ( inputData.searchValue && inputData.searchValue!== '' || inputData.offset> 1 ) {
         return res.sendError( 'No Data Found', 204 );
       } else {
         return res.sendSuccess( { initialInsert: false } );
@@ -169,9 +169,7 @@ export async function getNobData( req, res ) {
     }
 
     const footfallQuery={
-      '_source': {
-        'exclude': [ 'storeName' ], // Specify the fields to exclude
-      },
+      'size': 10000,
       'query': {
         'bool': {
           'must': [
@@ -191,14 +189,14 @@ export async function getNobData( req, res ) {
 
     const getFootfall= await getOpenSearchData( openSearch.footfall, footfallQuery );
     const footfall = getFootfall?.body?.hits?.hits;
-    logger.info( { footfall: footfall, nobData: nobData } );
+    logger.info( { footfall: getFootfall, nobData: nobData } );
     let result=[];
-    nobData.map( ( data ) => {
+    nobData.map( async ( data ) => {
       let count = 0;
       let temp=[];
 
       data._source.isUpdated = data._source.createdAt !== data._source.updatedAt? true : false;
-      footfall.filter( ( item ) => {
+      footfall.map( ( item ) => {
         if ( ( data._source.dateString === item._source.date_string ) && ( data._source.storeId === item._source.store_id ) ) {
           count = 1;
           temp =[
@@ -238,6 +236,8 @@ export async function getNobData( req, res ) {
 
         } );
       } else {
+        // const getStore = await findOneStore( { storeId: data.storeId }, { _id: 0, storeName: 1 } );
+        // data._source.storeName = getStore.storeName || data.storeName;
         result.push( {
 
           ...data._source,
@@ -276,7 +276,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;
       } );

package/src/routes/nob.routes.js

@@ -9,7 +9,7 @@ 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' ] } ), bulkValidate( addBillsValid ), roleVerification, clientValidations, fieldValidation, getAssinedStore, addBills );
+nobRouter.post( '/add-bills', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), bulkValidate( addBillsValid ), roleVerification, clientValidations, getAssinedStore, fieldValidation, addBills );
 
 nobRouter.post( '/get-nob-data', isAllowedSessionHandler, accessVerification( { userType: [ 'client', 'tango' ] } ), validate( getNobDataValid ), clientValidations, getAssinedStore, getNobData );