tango-app-api-analysis-traffic 3.0.0-alpha.51 → 3.0.0-alpha.54

package/package.json

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

package/src/controllers/nob.controllers.js

@@ -64,20 +64,29 @@ export async function addBills( req, res ) {
     let errorData=[];
     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 );
+    }
+
+    let filter = [];
+    if ( req.user.role !== 'superadmin' && req.user.userType !== 'tango' ) {
+      filter.push( { storeId: { $in: inputData?.assignedStores } } );
+    }
     for ( let i=0; i<inputData?.bills?.length; i++ ) {
+      filter = [
+        { clientId: { $eq: req.clientId } },
+        { status: { $eq: 'active' } },
+        {
+          $or: [
+            { 'storeId': inputData?.bills[i]?.storeCode },
+            { 'storeProfile.storeCode': inputData?.bills[i]?.storeCode },
+          ],
+        },
+      ];
       const query = [
         {
           $match: {
-            $and: [
-              { clientId: { $eq: req.clientId } },
-              { status: { $eq: 'active' } },
-              {
-                $or: [
-                  { 'storeId': inputData?.bills[i]?.storeCode },
-                  { 'storeProfile.storeCode': inputData?.bills[i]?.storeCode },
-                ],
-              },
-            ],
+            $and: filter,
           },
         },
         {
@@ -115,11 +124,12 @@ export async function addBills( req, res ) {
         let searchData=await getOpenSearchData( openSearch.nob, searchQuery );
         let nobDateIso =new Date( inputData?.bills[i]?.nobDate );
         nobDateIso.setUTCHours( 0, 0, 0, 0 );
+        const storeName = storeData[0]?.storeName;
         let inserData={
           clientId: req?.clientId,
           storeId: storeData[0]?.storeId,
           storeCode: storeData[0]?.storeCode,
-          storeName: storeData[0]?.storeName,
+          storeName: storeName.toLowerCase(),
           nobDate: nobDateIso,
           nobCount: inputData?.bills[i]?.nobCount,
           dateString: inputData?.bills[i]?.nobDate,
@@ -185,6 +195,7 @@ export async function getNobData( req, res ) {
       const searchValue = escapeSpecialChars( inputData.searchValue );
       logger.info( { searchvalue: inputData.searchValue, searchValue: searchValue } );
       temp = {
+
         'must': filter,
         'should': [
           {
@@ -204,7 +215,7 @@ export async function getNobData( req, res ) {
           {
             'wildcard': {
               'storeName.keyword': {
-                'value': `${searchValue}*`,
+                'value': `${searchValue.toLowerCase()}*`,
               },
             },
           },
@@ -313,7 +324,7 @@ export async function getNobData( req, res ) {
           footfallCount: temp[0]?.footfallCount || null,
           engagersCount: temp[0]?.engagersCount || null,
           potentialBuyers: temp[0]?.potentialBuyers || null,
-          conversionRate: parseFloat( conversionCount.toFixed( 1 ) ),
+          conversionRate: conversionCount == null ? null :Math.round( conversionCount ),
 
         } );
       } else {

package/src/dtos/nob.dtos.js

@@ -4,9 +4,18 @@ export const addBillsSchema = joi.object( {
 
   bills: joi.array().items(
       joi.object( {
-        storeCode: joi.string().required(),
-        nobDate: joi.string().required(),
-        nobCount: joi.number().required(),
+        storeCode: joi.string().required().messages( {
+          'string.empty': 'Please enter a valid Store ID',
+          'any.required': 'Store ID is required',
+        } ),
+        nobDate: joi.string().required().messages( {
+          'string.empty': 'Please enter a valid NOB Date',
+          'any.required': 'NOB Date is required',
+        } ),
+        nobCount: joi.number().required().messages( {
+          'string.empty': 'Please enter a valid NOB Count',
+          'any.required': 'NOB Count is required',
+        } ),
       } ),
   ).required(),
 

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