Add route to retrieve GTFS feed info from microservice (#271)

Author: manishsaha

docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - /usr/src/app/node_modules
 
   ghopper:
-    image: cornellappdev/transit-ghopper:v1.0.2
+    image: cornellappdev/transit-ghopper:v1.0.7
     ports:
       - "8988:8988"
 
@@ -28,7 +28,7 @@ services:
       - "8987:8987"
 
   live-tracking:
-    image: cornellappdev/transit-python:v1.0.2
+    image: cornellappdev/transit-python:v1.0.7
     env_file: python.envrc
     ports:
       - "5000:5000"

envrc.template

@@ -5,5 +5,6 @@ NODE_ENV=production
 PLACES_KEY=PLACES_KEY
 PORT=3000
 PYTHON_APP=live-tracking
+PYTHON_PORT=5000
 RELEASE_URL=http://localhost:3001/
 TOKEN=TOKEN

package-lock.json

@@ -21,6 +21,7 @@ class API extends ApplicationAPI {
       Routers.AppleSearchRouter,
       Routers.DelayRouter,
       Routers.DelaysRouter,
+      Routers.GTFSFeedInfoRouter,
       Routers.HelloWorldRouter,
       Routers.MultiRouteRouter,
       Routers.PlacesAutocompleteRouter,

src/API.js

@@ -5,6 +5,7 @@ import AppleSearchRouter from './v1/AppleSearchRouter';
 import DelayRouter from './v1/DelayRouter';
 import DelaysRouter from './v2/DelaysRouter';
 import DocsRouter from './DocsRouter';
+import GTFSFeedInfoRouter from './v1/GTFSFeedInfoRouter';
 import HelloWorldRouter from './v1/HelloWorldRouter';
 import MultiRouteRouter from './v1/MultiRouteRouter';
 import PlacesAutocompleteRouter from './v1/PlacesAutocompleteRouter';
@@ -23,6 +24,7 @@ export default {
   DelayRouter,
   DelaysRouter,
   DocsRouter,
+  GTFSFeedInfoRouter,
   HelloWorldRouter,
   MultiRouteRouter,
   PlacesAutocompleteRouter,

src/routers/index.js

@@ -0,0 +1,20 @@
+// @flow
+import GTFSUtils from '../../utils/GTFSUtils';
+import ApplicationRouter from '../../appdev/ApplicationRouter';
+
+class GTFSFeedInfoRouter extends ApplicationRouter<Array<Object>> {
+  constructor() {
+    super(['GET']);
+  }
+
+  getPath(): string {
+    return '/GTFSFeedInfo/';
+  }
+
+  // eslint-disable-next-line require-await
+  async content(req): Promise<any> {
+    return GTFSUtils.getFeedInfo();
+  }
+}
+
+export default new GTFSFeedInfoRouter().router;

src/routers/v1/GTFSFeedInfoRouter.js

@@ -5,6 +5,7 @@ const {
   MAP_MATCHING,
   NODE_ENV,
   PYTHON_APP,
+  PYTHON_PORT,
   TOKEN,
 } = process.env;
 
@@ -14,5 +15,6 @@ export {
   MAP_MATCHING,
   NODE_ENV,
   PYTHON_APP,
+  PYTHON_PORT,
   TOKEN,
 };

src/utils/EnvUtils.js

@@ -1,17 +1,28 @@
 // @flow
-import { PYTHON_APP } from './EnvUtils';
+import { PYTHON_APP, PYTHON_PORT } from './EnvUtils';
 import RequestUtils from './RequestUtils';
 
 async function fetchRoutes(): Object {
   const options = {
     method: 'GET',
-    url: `http://${PYTHON_APP || 'localhost'}:5000/gtfs`,
+    url: `http://${PYTHON_APP || 'localhost'}:${+PYTHON_PORT}/gtfs`,
     headers: { 'Cache-Control': 'no-cache' },
   };
   const data = await RequestUtils.createRequest(options, 'Fetch routes request failed');
   return JSON.parse(data);
 }
 
+async function getFeedInfo(): Object {
+  const options = {
+    method: 'GET',
+    url: `http://${PYTHON_APP || 'localhost'}:${+PYTHON_PORT}/gtfs-feed-info`,
+    headers: { 'Cache-Control': 'no-cache' },
+  };
+  const data = await RequestUtils.createRequest(options, 'Get GTFS feed info request failed');
+  return JSON.parse(data);
+}
+
 export default {
   fetchRoutes,
+  getFeedInfo,
 };