tango-app-api-analysis-traffic 3.0.0-alpha.57 → 3.0.0-alpha.59

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.0.0-alpha.57",
+    "version": "3.0.0-alpha.59",
     "description": "Traffic Analysis",
     "main": "index.js",
     "type": "module",
@@ -24,7 +24,7 @@
         "nodemon": "^3.1.4",
         "swagger-ui-express": "^5.0.1",
         "tango-api-schema": "^2.2.7",
-        "tango-app-api-middleware": "^3.1.46",
+        "tango-app-api-middleware": "^3.1.47",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"
     },

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/validations/nob.validations.js

@@ -7,7 +7,7 @@ export async function clientValidations( req, res, next ) {
     const inputData = req.method === 'POST' ? req.body : req.query;
     const clientId = req.user.userType === 'tango' ? inputData.clientId :req.user.clientId;
     if ( !clientId ) {
-      return res.sendError( 'Give valid clientId', 400 );
+      return res.sendError( 'Please enter a valid clientId', 400 );
     }
     req.clientId = clientId;
     return next();
@@ -23,7 +23,7 @@ export async function roleVerification( req, res, next ) {
     if ( [ 'admin', 'superadmin' ].includes( req?.user?.role ) ) {
       return next();
     } else {
-      return res.sendError( 'access forbidden', 403 );
+      return res.sendError( 'Access Denied', 403 );
     }
   } catch ( error ) {
     logger.error( { error: error, message: req.body, function: 'nob-roleVerification' } );
@@ -36,7 +36,7 @@ export async function fieldValidation( req, res, next ) {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
     if ( req.user.role !== 'superadmin' && req.user.userType !== 'tango'&& ( inputData?.assignedStores?.length == 0 || !inputData?.assignedStores ) ) {
-      return res.sendError( 'access forbidden', 403 );
+      return res.sendError( 'Access Denied', 403 );
     }
     let tempInserData = [];
     let filter = [];
@@ -53,7 +53,7 @@ export async function fieldValidation( req, res, next ) {
       if ( seen.has( key ) ) {
         logger.info( { message: 'deupkilicare' } );
         // duplicates.push( { ...item, originalIndex: index } );
-        return res.sendError( `Error in index ${i+1}: Dublicate record exist`, 403 );
+        return res.sendError( `Dublicate record exist`, 403 );
       } else {
         seen.set( key, i );
       }
@@ -84,7 +84,7 @@ export async function fieldValidation( req, res, next ) {
       ];
       let storeData= await aggregateStore( query );
       if ( storeData?.length ==0 ) {
-        return res.sendError( `Error in index ${i+1}: Store code is not mapped with tango`, 403 );
+        return res.sendError( `Store ID / Store Code is not associated with this brand`, 403 );
       } else {
         let searchQuery={
           'size': 1,
@@ -107,7 +107,7 @@ export async function fieldValidation( req, res, next ) {
         };
         let searchData=await getOpenSearchData( openSearch.nob, searchQuery );
         if ( searchData?.body?.hits?.hits.length > 0 && searchData?.body?.hits?.hits[0]?._source?.createdAt !== searchData?.body?.hits?.hits[0]?._source?.updatedAt ) {
-          return res.sendError( `Error in index ${i+1}: Access Forbidden.You are trying to re-upload/edit more than one time `, 403 );
+          return res.sendError( `You are restricted to re-upload/edit more than one time`, 403 );
         }
 
         let nobDateIso =new Date( inputFilter[i]?.nobDate );
@@ -132,11 +132,11 @@ export async function fieldValidation( req, res, next ) {
           req.tempInserData = tempInserData;
           return next();
         } else {
-          return res.sendError( 'Bad Request', 400 );
+          return res.sendError( 'One or more value is missing in row or column', 400 );
         }
       }
     }
-    return res.sendError( 'Bad Request', 400 );
+    return res.sendError( 'One or more value is missing in row or column', 400 );
   } catch ( error ) {
     logger.error( { error: error, message: req.body, function: 'nob-roleVerification' } );
     return res.sendError( error, 500 );