tango-app-api-analysis-traffic 3.0.0-alpha.17 → 3.0.0-alpha.18

package/package.json

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

package/src/controllers/tangoTrafficV1.controllers.js

@@ -444,7 +444,7 @@ export const storesMapV1 = async ( req, res ) => {
           'spocDetails': { $arrayElemAt: [ '$spocDetails', 0 ] },
           'businessType': 1,
           'storeType': 1,
-          'avgFootfall': '100',
+          'avgFootfall': '',
           'avgWeekdayFootfall': '',
           'avgWeekendFootfall': '',
           'hourlyFootfall': '',
@@ -465,36 +465,6 @@ export const storesMapV1 = async ( req, res ) => {
       return res.sendError( 'No Content', 204 );
     } else {
       if ( getStores.length >0 ) {
-        reqestData.fromDate = reqestData.storeDate;
-        reqestData.toDate = reqestData.storeDate;
-        let hourlyLamdaURL = 'https://ksxkjnhwwzvrgp7ngttw2ribsy0twqip.lambda-url.ap-south-1.on.aws/';
-        let hourlyResultData = await LamdaServiceCall( hourlyLamdaURL, reqestData );
-        if ( hourlyResultData && hourlyResultData.status_code == '200' && hourlyResultData.hourData.length>0 ) {
-          for ( let i = 0; i < getStores.length; i++ ) {
-            for ( let j = 0; j < hourlyResultData.hourData.length; j++ ) {
-              if ( getStores[i].storeId == hourlyResultData.hourData[j].storeId ) {
-                getStores[i].hourlyFootfall = hourlyResultData.hourData[j].hourlyFootfall;
-                getStores[i].openTime = hourlyResultData.hourData[j].openTime;
-                getStores[i].closeTime = hourlyResultData.hourData[j].closeTime;
-              }
-            }
-          }
-        }
-        let fromDate = new Date( dayjs( reqestData.fromDate ).subtract( 30, 'days' ) );
-        reqestData.fromDate = dayjs( fromDate ).format( 'YYYY-MM-DD' );
-        let footfallLamdaURL = 'https://3ircml3r6dm7fbiif3ti2wwdee0zqhyb.lambda-url.ap-south-1.on.aws/';
-        let footfallResultData = await LamdaServiceCall( footfallLamdaURL, reqestData );
-        if ( footfallResultData && footfallResultData.status_code == '200' && footfallResultData.avgData.length>0 ) {
-          for ( let k = 0; k < getStores.length; k++ ) {
-            for ( let l = 0; l < footfallResultData.avgData.length; l++ ) {
-              if ( getStores[k].storeId == footfallResultData.avgData[l].storeId ) {
-                getStores[k].avgWeekendFootfall = footfallResultData.avgData[l].avgWeekendFootfall;
-                getStores[k].avgWeekdayFootfall = footfallResultData.avgData[l].avgWeekdayFootfall;
-                getStores[k].avgFootfall = footfallResultData.avgData[l].avgFootfall;
-              }
-            }
-          }
-        }
         return res.sendSuccess( { storeData: getStores } );
       } else {
         return res.sendError( 'No Content', 204 );
@@ -1319,10 +1289,11 @@ export const getMySubscription = async ( req, res ) => {
   }
 };
 
-export const getStoreCameraImage = async ( req, res ) => {
+export const getStoreMapData = async ( req, res ) => {
   try {
     let reqestData = req.body;
     if ( reqestData.storeId && reqestData.storeId.length > 0 ) {
+      let cameraBaseImage = '';
       const bucket= JSON.parse( process.env.BUCKET );
       if ( bucket && bucket.baseImage && bucket.baseImage != '' ) {
         const camera = await findCamera( { storeId: reqestData.storeId[0], isUp: true, isActivated: true }, { thumbnailImage: 1 } );
@@ -1331,16 +1302,38 @@ export const getStoreCameraImage = async ( req, res ) => {
             file_path: camera.thumbnailImage,
             Bucket: bucket.baseImage,
           };
-          let cameraBaseImage = await signedUrl( params );
-          let resultData = { cameraBaseImage: cameraBaseImage };
-
-          return res.sendSuccess( resultData );
-        } else {
-          return res.sendError( 'No Camera', 400 );
+          cameraBaseImage = await signedUrl( params );
         }
-      } else {
-        return res.sendError( 'Bucket Name Missing', 400 );
       }
+      reqestData.fromDate = reqestData.storeDate;
+      reqestData.toDate = reqestData.storeDate;
+      let avgData = {
+        'avgFootfall': '',
+        'avgWeekdayFootfall': '',
+        'avgWeekendFootfall': '',
+      };
+      let hourlyData = {
+        'hourlyFootfall': '',
+        'openTime': '',
+        'closeTime': '',
+      };
+      let hourlyLamdaURL = 'https://ksxkjnhwwzvrgp7ngttw2ribsy0twqip.lambda-url.ap-south-1.on.aws/';
+      let hourlyResultData = await LamdaServiceCall( hourlyLamdaURL, reqestData );
+      if ( hourlyResultData && hourlyResultData.hourData.length>0 ) {
+        hourlyData.hourlyFootfall = hourlyResultData.hourData[0].hourlyFootfall;
+        hourlyData.openTime = hourlyResultData.hourData[0].openTime;
+        hourlyData.closeTime = hourlyResultData.hourData[0].closeTime;
+      }
+      let fromDate = new Date( dayjs( reqestData.fromDate ).subtract( 30, 'days' ) );
+      reqestData.fromDate = dayjs( fromDate ).format( 'YYYY-MM-DD' );
+      let footfallLamdaURL = 'https://3ircml3r6dm7fbiif3ti2wwdee0zqhyb.lambda-url.ap-south-1.on.aws/';
+      let footfallResultData = await LamdaServiceCall( footfallLamdaURL, reqestData );
+      if ( footfallResultData && footfallResultData.avgData.length>0 ) {
+        avgData.avgFootfall = footfallResultData.avgData[0].avgFootfall;
+        avgData.avgWeekdayFootfall = footfallResultData.avgData[0].avgWeekdayFootfall;
+        avgData.avgWeekendFootfall = footfallResultData.avgData[0].avgWeekendFootfall;
+      }
+      return res.sendSuccess( { cameraBaseImage: cameraBaseImage, hourlyData: hourlyData, avgData: avgData } );
     } else {
       return res.sendError( 'Store Id rewuired', 400 );
     }

package/src/dtos/validation.dtos.js

@@ -211,6 +211,7 @@ export const getMyProductParams = {
 export const getStoreCameraImageSchema = joi.object( {
   clientId: joi.string().required(),
   storeId: joi.array().optional().empty(),
+  storeDate: joi.string().required(),
 } );
 
 export const getStoreCameraImageParams = {

package/src/routes/traffic.routes.js

@@ -53,7 +53,7 @@ import {
   headerGroupsV1,
   isAllowedClient,
   getMySubscription,
-  getStoreCameraImage,
+  getStoreMapData,
 } from '../controllers/tangoTrafficV1.controllers.js';
 
 
@@ -186,6 +186,6 @@ analysisTrafficRouter
       ],
     } ), validate( validationDtos.validateHeaderParams ), headerStoresV1 )
     .post( '/getMySubscription', isAllowedSessionHandler, validate( validationDtos.getMyProductParams ), getMySubscription )
-    .post( '/getStoreCameraImage', isAllowedSessionHandler, validate( validationDtos.getStoreCameraImageParams ), getStoreCameraImage );
+    .post( '/getStoreMapData', isAllowedSessionHandler, validate( validationDtos.getStoreCameraImageParams ), getStoreMapData );
 
 export default analysisTrafficRouter;