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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.0.0-alpha.53",
+    "version": "3.0.0-alpha.55",
     "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.43-alpha.10",
+        "tango-app-api-middleware": "^3.1.46",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/nob.controllers.js

@@ -10,7 +10,6 @@ export async function storeList( req, res ) {
     if ( req.user.userType !== 'superadmin' && inputData?.assignedStores?.length == 0 ) {
       return res.sendSuccess( { result: [] } );
     }
-    logger.info( { assignedStores: inputData?.assignedStores } );
     let filter = [
       {
         clientId: { $eq: req.clientId },
@@ -61,101 +60,26 @@ export async function storeList( req, res ) {
 export async function addBills( req, res ) {
   try {
     let resData=[];
-    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 );
-    }
+    const inputData = req.tempInserData;
 
-    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: filter,
-          },
-        },
-        {
-          $project: {
-            storeId: 1,
-            storeName: 1,
-            storeCode: '$storeProfile.storeCode',
-
-          },
-        },
-      ];
-      let storeData= await aggregateStore( query );
-      if ( storeData?.length ==0 ) {
-        errorData.push( { code: 400, storeId: inputData?.bills[i]?.storeId, message: 'Store code is not mapped with tango' } );
+    for ( let i=0; i<inputData?.length; i++ ) {
+      await updateOneNobBilling( inputData[i]?.query, inputData[i]?.data );
+      const getData = await findOneNobBilling( inputData[i]?.query, { _id: 0 } );
+      if ( !inputData[i]?.isUpdated ) {
+        await insertOpenSearchData( openSearch.nob, getData );
+        resData.push( { code: 200, tangoCode: getData.storeId, storeId: inputData[i]?.data?.storeCode, message: 'Data Inserted Successfully' } );
       } else {
-        let searchQuery={
-          'size': 1,
-          'query': {
-            'bool': {
-              'must': [
-                {
-                  'term': {
-                    'storeId.keyword': storeData[0].storeId,
-                  },
-                },
-                {
-                  'term': {
-                    'nobDate': dayjs( inputData?.bills[i]?.nobDate ).format( 'YYYY-MM-DD' ),
-                  },
-                },
-              ],
-            },
-          },
-        };
-        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: storeName.toLowerCase(),
-          nobDate: nobDateIso,
-          nobCount: inputData?.bills[i]?.nobCount,
-          dateString: inputData?.bills[i]?.nobDate,
-          nobAmount: 1.0,
-        };
-        const query ={ storeId: storeData[0]?.storeId, nobDate: inputData?.bills[i]?.nobDate };
-        await updateOneNobBilling( query, inserData );
-        const getData = await findOneNobBilling( query, { _id: 0 } );
-        if ( searchData?.body?.hits?.hits?.length==0 || searchData?.body==undefined ) {
-          await insertOpenSearchData( openSearch.nob, getData );
-          resData.push( { code: 200, tangoCode: getData.storeId, storeId: inputData?.bills[i]?.storeCode, message: 'Data Inserted Successfully' } );
-        } else {
-          await updateOpenSearchData( openSearch.nob, searchData.body.hits.hits[0]._id, { doc: getData } );
-          resData.push( { code: 200, tangoCode: storeData[0]?.storeId, storeId: inputData?.bills[i]?.storeCode, message: 'Data Updated Successfully' } );
-        }
+        await updateOpenSearchData( openSearch.nob, inputData[i]?.searchData?.body?.hits?.hits[0]?._id, { doc: getData } );
+        resData.push( { code: 200, tangoCode: inputData[i]?.data?.storeId, storeId: inputData[i]?.data?.storeCode, message: 'Data Updated Successfully' } );
       }
     }
-    if ( errorData.length > 0 && resData.length == 0 ) {
-      return res.sendError( 'Store code is not mapped with tango', 400 );
-    }
-    logger.info( { resData: resData, errorData: errorData, function: 'nob-addbills' } );
-    return res.sendSuccess( 'Data has been inserted successfully' );
+    logger.info( { resData: resData } );
+    return res.sendSuccess( 'Data has been inserted/updated successfully' );
   } catch ( error ) {
     const err= error.message || 'Internal Server Error';
     logger.error( { error: error, message: req.body, function: 'nob-addBills' } );
-    res.sendError( err, 500 );
+    return res.sendError( err, 500 );
   }
 }
 
@@ -193,7 +117,6 @@ export async function getNobData( req, res ) {
 
     if ( inputData.searchValue && inputData.searchValue!== '' ) {
       const searchValue = escapeSpecialChars( inputData.searchValue );
-      logger.info( { searchvalue: inputData.searchValue, searchValue: searchValue } );
       temp = {
 
         'must': filter,
@@ -238,24 +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 ) {
-      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 ) {
+      if ( inputData.searchValue && inputData.searchValue!== '' ) {
         return res.sendError( 'No Data Found', 204 );
       } else {
         return res.sendSuccess( { initialInsert: false } );
@@ -288,9 +194,8 @@ export async function getNobData( req, res ) {
       let temp=[];
 
       data._source.isUpdated = data._source.createdAt !== data._source.updatedAt? true : false;
-
       footfall.filter( ( item ) => {
-        if ( ( data._source.date_string === item._source.dateString ) && ( data._source.store_id === item._source.storeId ) ) {
+        if ( ( data._source.dateString === item._source.date_string ) && ( data._source.storeId === item._source.store_id ) ) {
           count = 1;
           temp =[
             {
@@ -303,7 +208,6 @@ export async function getNobData( req, res ) {
       } );
 
       let conversionCount;
-
       if ( count === 1 ) {
         switch ( getClient?.featureConfigs?.conversionCalculation ) {
           case 'footfall-count':
@@ -324,7 +228,7 @@ export async function getNobData( req, res ) {
           footfallCount: temp[0]?.footfallCount || null,
           engagersCount: temp[0]?.engagersCount || null,
           potentialBuyers: temp[0]?.potentialBuyers || null,
-          conversionRate: conversionCount == null ? null :parseFloat( conversionCount.toFixed( 1 ) ),
+          conversionRate: conversionCount == null ? null :Math.round( conversionCount ),
 
         } );
       } else {
@@ -368,7 +272,6 @@ export async function getNobData( req, res ) {
           }
           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/dtos/nob.dtos.js

@@ -7,15 +7,15 @@ export const addBillsSchema = joi.object( {
         storeCode: joi.string().required().messages( {
           'string.empty': 'Please enter a valid Store ID',
           'any.required': 'Store ID is required',
-        } ),
+        } ).allow( null ),
         nobDate: joi.string().required().messages( {
           'string.empty': 'Please enter a valid NOB Date',
           'any.required': 'NOB Date is required',
-        } ),
+        } ).allow( null ),
         nobCount: joi.number().required().messages( {
           'string.empty': 'Please enter a valid NOB Count',
           'any.required': 'NOB Count is required',
-        } ),
+        } ).allow( null ),
       } ),
   ).required(),
 

package/src/routes/nob.routes.js

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

package/src/validations/nob.validations.js

@@ -1,3 +1,7 @@
+import { getOpenSearchData, logger } from 'tango-app-api-middleware';
+import dayjs from 'dayjs';
+import { aggregateStore } from '../services/stores.service.js';
+
 export async function clientValidations( req, res, next ) {
   try {
     const inputData = req.method === 'POST' ? req.body : req.query;
@@ -26,3 +30,104 @@ export async function roleVerification( req, res, next ) {
     return res.sendError( error, 500 );
   }
 }
+
+export async function fieldValidation( req, res, next ) {
+  try {
+    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 tempInserData = [];
+    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++ ) {
+      if ( inputData?.bills[i]?.storeCode == null ) {
+        delete inputData?.bills[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: filter,
+          },
+        },
+        {
+          $project: {
+            storeId: 1,
+            storeName: 1,
+            storeCode: '$storeProfile.storeCode',
+
+          },
+        },
+      ];
+      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 );
+      } else {
+        let searchQuery={
+          'size': 1,
+          'query': {
+            'bool': {
+              'must': [
+                {
+                  'term': {
+                    'storeId.keyword': storeData[0].storeId,
+                  },
+                },
+                {
+                  'term': {
+                    'nobDate': dayjs( inputData?.bills[i]?.nobDate ).format( 'YYYY-MM-DD' ),
+                  },
+                },
+              ],
+            },
+          },
+        };
+        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 );
+        }
+
+        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: storeName.toLowerCase(),
+          nobDate: nobDateIso,
+          nobCount: inputData?.bills[i]?.nobCount,
+          dateString: inputData?.bills[i]?.nobDate,
+        };
+        const query ={ storeId: storeData[0]?.storeId, nobDate: inputData?.bills[i]?.nobDate };
+
+        tempInserData.push( { data: inserData, query: query, searchData: searchData, isUpdated: ( searchData?.body?.hits?.hits?.length==0 || searchData?.body==undefined )? false:true } );
+      }
+
+      if ( inputData?.bills?.length == i+1 ) {
+        if ( tempInserData.length > 0 ) {
+          req.tempInserData = tempInserData;
+          return next();
+        } else {
+          return res.sendError( 'Bad Request', 400 );
+        }
+      }
+    }
+  } catch ( error ) {
+    logger.error( { error: error, message: req.body, function: 'nob-roleVerification' } );
+    return res.sendError( error, 500 );
+  }
+}