Changes made togetTravelTime Method

Author: prabir-vora

src/db/mongoose.js

@@ -1,6 +1,6 @@
 const mongoose = require('mongoose')
 
-mongoose.connect('mongodb://127.0.0.1:27017/dine-out-api', {
+mongoose.connect(process.env.MongoDBURL, {
     useNewUrlParser: true,
     useCreateIndex: true
 }, (error) => {

src/googleAPI/distanceMatrix.js

@@ -43,4 +43,102 @@ const getTravelTime = function (user, restaurant) {
 
 }
 
-module.exports = getTravelTime
+
+
+const getTravelTimeRecursive = async function(user, restaurantsArray, callback) {
+
+    function iterate(index) {
+        if (index == restaurantsArray.length) {
+            return callback()
+        }
+
+        const userLat = user.address[0].lat
+        const userLng = user.address[0].lng
+
+        const restLat = restaurantsArray[index].address.location.lat 
+        const restLng = restaurantsArray[index].address.location.lng 
+
+        var options = {
+            uri: "https://maps.googleapis.com/maps/api/distancematrix/json",
+            qs: {
+                origins: `${userLat},${userLng}`,
+                destinations: `${restLat},${restLng}`,
+                key: process.env.googleAPIKey
+            },
+            json: true
+        } 
+
+        rp(options).then((body) => {
+        
+            console.log(body.rows[0].elements[0])
+            restaurantsArray[index].distanceMatrix.distance = body.rows[0].elements[0].distance.text
+            restaurantsArray[index].distanceMatrix.duration = body.rows[0].elements[0].duration.text
+            
+            iterate(index + 1)
+ 
+        }).catch((err) => {
+            console.log(err)
+
+            callback(err)
+        })
+
+    }
+
+    iterate(0)
+}
+
+const getTravelTimeParralel = function(user, restaurantsArray, callback) {
+
+    // let completed = 0, hasErrors = false 
+
+    // function done(err) {
+    //     if(err) {
+    //         hasErrors = true;
+    //         return callback(err);
+    //     }
+
+    //     if(++completed === links.length && !hasErrors) {
+    //         return callback();
+    //     }
+    // }
+
+    restaurantsArray.forEach(restaurant => {
+        const userLat = user.address[0].lat
+        const userLng = user.address[0].lng 
+
+        const restLat = restaurant.address.location.lat 
+        const restLng = restaurant.address.location.lng 
+
+        console.log({userLat, userLng})
+        console.log({restLat, restLng})
+
+        var options = {
+            uri: "https://maps.googleapis.com/maps/api/distancematrix/json",
+            qs: {
+                origins: `${userLat},${userLng}`,
+                destinations: `${restLat},${restLng}`,
+                key: process.env.googleAPIKey
+            },
+            json: true
+        } 
+
+        rp(options).then((body) => {
+        
+            console.log(body.rows[0].elements[0])
+            restaurant.distanceMatrix.distance = body.rows[0].elements[0].distance.text
+            restaurant.distanceMatrix.duration = body.rows[0].elements[0].duration.text
+            
+            callback()
+ 
+        }).catch((err) => {
+            console.log(err)
+            
+            callback(err)
+            
+        })
+    });
+}
+
+module.exports = { getTravelTime,
+    getTravelTimeRecursive,
+getTravelTimeParralel }

src/routers/restaurant.js

@@ -2,7 +2,7 @@ const express = require('express')
 const Restaurant = require('../model/restaurant')
 const userauth = require('../middleware/auth')
 const router = new express.Router()
-const getTravelTime = require('../googleAPI/distanceMatrix')
+const { getTravelTimeParralel } = require('../googleAPI/distanceMatrix')
 
 router.post('/restaurant', async (req, res) => {
     const restaurant = new Restaurant( req.body )
@@ -63,17 +63,48 @@ router.get('/restaurants/location', userauth, async (req, res) => {
         if (!restaurants) {
             throw new Error( {error: "No results Found"})
         }
+        
+        //This code was for parallel implementation using getTravelTimeParallel... much faster than sequential implementation 
+
+        let completed = 0, hasErrors = false 
 
-        let modifiedRestaurants = []
+        function done(err) {
+            if(err) {
+                hasErrors = true;
+                throw new Error(err);
+            }
 
-        for (let i = 0; i < restaurants.length; i++) {
-            const newRest = await getTravelTime(req.user, restaurants[i])
-            modifiedRestaurants.push(newRest)
+            if(++completed === restaurants.length && !hasErrors) {
+                res.send(restaurants)
+            }
         }
+
 
+        getTravelTimeParralel(req.user, restaurants, done)
+
+        //This code was for sequential non-recursive implementation using getTravelTime
+
+        // let modifiedRestaurants = []
+
+        // for (let i = 0; i < restaurants.length; i++) {
+        //     const newRest = await getTravelTime(req.user, restaurants[i])
+        //     modifiedRestaurants.push(newRest)
+        // }
+
+        // console.log(modifiedRestaurants)
+        // res.send(modifiedRestaurants)
+
+
+        //This code was for sequential recursive implementation using getTravelTimeRecursive
+
+        // getTravelTimeRecursive(req.user, restaurants, (err) => {
+        //     if (err) {
+        //         throw new Error(err)
+        //     } 
+
+        //     res.send(restaurants)
+        // })
 
-        console.log(modifiedRestaurants)
-        res.send(modifiedRestaurants)
     } catch (e) {
         res.status(400).send(e)
     }