Fix "promise chaining cycle" due to modifying promises in walking route (#275)

* Remove modifying directions

* Do simply checks instead

* Try moving try catch block

Author: alanna-zhou

src/utils/GraphhopperUtils.js

@@ -200,7 +200,7 @@ function getValidBusRoutes(busRoutes: Array<Object>, busRoutesToCheck: Array<Obj
  * @returns {Array<Object>}
  */
 async function fetchRoutes(end: string, start: string, departureTimeDateNow: string,
-  isArriveByQuery: boolean): Array<Object> {
+  isArriveByQuery: boolean): Promise<Array<Object>> {
   let routes;
 
   const sharedOptions = { method: 'GET', qsStringifyOptions: { arrayFormat: 'repeat' } };

src/utils/ParseRouteUtils.js

@@ -460,15 +460,28 @@ function parseRoutes(
   originalDepartureTimeMs: number,
   isArriveByQuery: boolean,
 ): Promise<Array<Object>> {
-  return Promise.all(busRoutes.map(async (busRoute) => {
-    try {
+  try {
+    return Promise.all(busRoutes.map(async (busRoute) => {
       // array containing legs of journey. e.g. walk, bus ride, walk
       const { legs } = busRoute;
       const numberOfLegs = legs.length;
 
       // string 2018-02-21T17:27:00Z
-      const { departureTime } = legs[0];
-      const arriveTime = legs[numberOfLegs - 1].arrivalTime;
+      let { departureTime } = legs[0];
+      let arriveTime = legs[numberOfLegs - 1].arrivalTime;
+
+      // Readjust the walking start and end times by accounting for the buffer
+      // times that were initially passed into Graphhopper to get routes
+      if (busRoute.transfers === -1) {
+        let startTimeMs = originalDepartureTimeMs;
+        let endTimeMs = originalDepartureTimeMs + busRoute.time;
+        if (isArriveByQuery) {
+          startTimeMs = originalDepartureTimeMs - busRoute.time;
+          endTimeMs = originalDepartureTimeMs;
+        }
+        departureTime = convertMillisecondsToISOString(startTimeMs);
+        arriveTime = convertMillisecondsToISOString(endTimeMs);
+      }
       const totalDuration = getDifferenceInMinutes(departureTime, arriveTime);
 
       const startingLocationGeometry = legs[0].geometry;
@@ -483,8 +496,13 @@ function parseRoutes(
 
       const directions = await Promise.all(legs.map(async (currLeg, j, legsArray) => {
         let { type } = currLeg;
-        const startTime = currLeg.departureTime;
-        const endTime = currLeg.arrivalTime;
+        let startTime = currLeg.departureTime;
+        let endTime = currLeg.arrivalTime;
+
+        if (busRoute.transfers === -1) {
+          startTime = departureTime;
+          endTime = arriveTime;
+        }
 
         if (type === 'pt') {
           type = DIRECTION_TYPE.DEPART;
@@ -662,39 +680,6 @@ function parseRoutes(
         stopName: destinationName,
       });
 
-      // Readjust the walking start and end times by accounting for the buffer
-      // times that were initially passed into Graphhopper to get routes
-      if (busRoute.transfers === -1) {
-        let startTimeMs = originalDepartureTimeMs;
-        let endTimeMs = originalDepartureTimeMs + busRoute.time;
-
-        if (isArriveByQuery) {
-          startTimeMs = originalDepartureTimeMs - busRoute.time;
-          endTimeMs = originalDepartureTimeMs;
-        }
-
-        const walkDepartureTime = convertMillisecondsToISOString(startTimeMs);
-        const walkArrivalTime = convertMillisecondsToISOString(endTimeMs);
-
-        directions[0].startTime = walkDepartureTime;
-        directions[0].endTime = walkArrivalTime;
-
-        return {
-          arrivalTime: walkArrivalTime,
-          boundingBox,
-          departureTime: walkDepartureTime,
-          directions,
-          endCoords,
-          endName: destinationName,
-          numberOfTransfers: busRoute.transfers,
-          routeSummary,
-          startCoords,
-          startName: originName,
-          totalDuration,
-          travelDistance,
-        };
-      }
-
       return {
         arrivalTime: arriveTime,
         boundingBox,
@@ -709,12 +694,12 @@ function parseRoutes(
         totalDuration,
         travelDistance,
       };
-    } catch (error) {
-      throw new Error(
-        LogUtils.logErr(error, busRoutes.length, 'Parse final route failed'),
-      );
-    }
-  }));
+    }));
+  } catch (error) {
+    throw new Error(
+      LogUtils.logErr(error, busRoutes.length, 'Parse final route failed'),
+    );
+  }
 }
 
 export default {