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

package/package.json

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

package/src/controllers/nob.controllers.js

@@ -169,6 +169,9 @@ export async function getNobData( req, res ) {
     }
 
     const footfallQuery={
+      '_source': {
+        'exclude': [ 'storeName' ], // Specify the fields to exclude
+      },
       'query': {
         'bool': {
           'must': [
@@ -188,6 +191,7 @@ 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 } );
     let result=[];
     nobData.map( ( data ) => {
       let count = 0;
@@ -199,6 +203,7 @@ export async function getNobData( req, res ) {
           count = 1;
           temp =[
             {
+              storeName: item._source.store_name,
               footfallCount: item._source.footfall_count,
               engagersCount: item._source.engagers_count,
               potentialBuyers: item._source.potentialBuyers_count,
@@ -225,10 +230,11 @@ export async function getNobData( req, res ) {
         result.push( {
 
           ...data._source,
+          storeName: temp[0]?.storeName,
           footfallCount: temp[0]?.footfallCount || null,
           engagersCount: temp[0]?.engagersCount || null,
           potentialBuyers: temp[0]?.potentialBuyers || null,
-          conversionRate: conversionCount == null ? null :Math.round( conversionCount ),
+          conversionRate: conversionCount == null ? null :`${Math.round( conversionCount )} %`,
 
         } );
       } else {

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 );
 

package/src/validations/nob.validations.js

@@ -43,17 +43,27 @@ export async function fieldValidation( req, res, next ) {
     if ( req.user.role !== 'superadmin' && req.user.userType !== 'tango' ) {
       filter.push( { storeId: { $in: inputData?.assignedStores } } );
     }
-    for ( let i=0; i<inputData?.bills?.length; i++ ) {
-      if ( inputData?.bills[i]?.storeCode == null ) {
-        delete inputData?.bills[i];
+    const inputFilter = inputData?.bills.filter( ( item ) => ( item.storeCode !== null && item.nobDate !== null && item.nobCount !== null ) );
+    // Find duplicates
+    const seen = new Map();
+    logger.info( { inputFilter: inputFilter } );
+    for ( let i=0; i<inputFilter?.length&& inputFilter.length !== 0; i++ ) {
+      const key = `${inputFilter[i]?.storeCode}-${inputFilter[i]?.nobDate}`; // Combine `storeCode` and `nobDate` to create a unique key
+      logger.info( { key: key } );
+      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 );
+      } else {
+        seen.set( key, i );
       }
       filter = [
         { clientId: { $eq: req.clientId } },
         { status: { $eq: 'active' } },
         {
           $or: [
-            { 'storeId': inputData?.bills[i]?.storeCode },
-            { 'storeProfile.storeCode': inputData?.bills[i]?.storeCode },
+            { 'storeId': inputFilter[i]?.storeCode },
+            { 'storeProfile.storeCode': inputFilter[i]?.storeCode },
           ],
         },
       ];
@@ -88,7 +98,7 @@ export async function fieldValidation( req, res, next ) {
                 },
                 {
                   'term': {
-                    'nobDate': dayjs( inputData?.bills[i]?.nobDate ).format( 'YYYY-MM-DD' ),
+                    'nobDate': dayjs( inputFilter[i]?.nobDate ).format( 'YYYY-MM-DD' ),
                   },
                 },
               ],
@@ -100,7 +110,7 @@ export async function fieldValidation( req, res, next ) {
           return res.sendError( `Error in index ${i+1}: Access Forbidden.You are trying to re-upload/edit more than one time `, 403 );
         }
 
-        let nobDateIso =new Date( inputData?.bills[i]?.nobDate );
+        let nobDateIso =new Date( inputFilter[i]?.nobDate );
         nobDateIso.setUTCHours( 0, 0, 0, 0 );
         const storeName = storeData[0]?.storeName;
         let inserData={
@@ -109,10 +119,10 @@ export async function fieldValidation( req, res, next ) {
           storeCode: storeData[0]?.storeCode,
           storeName: storeName.toLowerCase(),
           nobDate: nobDateIso,
-          nobCount: inputData?.bills[i]?.nobCount,
-          dateString: inputData?.bills[i]?.nobDate,
+          nobCount: inputFilter[i]?.nobCount,
+          dateString: inputFilter[i]?.nobDate,
         };
-        const query ={ storeId: storeData[0]?.storeId, nobDate: inputData?.bills[i]?.nobDate };
+        const query ={ storeId: storeData[0]?.storeId, nobDate: inputFilter[i]?.nobDate };
 
         tempInserData.push( { data: inserData, query: query, searchData: searchData, isUpdated: ( searchData?.body?.hits?.hits?.length==0 || searchData?.body==undefined )? false:true } );
       }
@@ -126,6 +136,7 @@ export async function fieldValidation( req, res, next ) {
         }
       }
     }
+    return res.sendError( 'Bad Request', 400 );
   } catch ( error ) {
     logger.error( { error: error, message: req.body, function: 'nob-roleVerification' } );
     return res.sendError( error, 500 );