fix(graphql): use POST-based fetchGraphQL for feed entity fetching

fixes #211
ibi-group · Jul 11, 2018 · aafdd8b · aafdd8b
1 parent 30f11ba
commit aafdd8b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 33 deletions.
diff --git a/lib/common/actions/index.js b/lib/common/actions/index.js
@@ -1,4 +1,5 @@
 import fetch from 'isomorphic-fetch'
+
 import {GTFS_GRAPHQL_PREFIX} from '../../common/constants'
 import { setErrorMessage } from '../../manager/actions/status'
 

diff --git a/lib/gtfs/actions/patterns.js b/lib/gtfs/actions/patterns.js
@@ -2,7 +2,7 @@
 
 import {createAction} from 'redux-actions'
 
-import {secureFetch} from '../../common/actions'
+import {fetchGraphQL} from '../../common/actions'
 import {compose, patterns} from '../../gtfs/util/graphql'
 import {updateRouteFilter, updatePatternFilter} from './filter'
 
@@ -32,17 +32,17 @@ export function fetchPatterns (namespace: string, routeId: ?string) {
     }
     const {date} = getState().gtfs.filter.dateTimeFilter
     return dispatch(
-      secureFetch(compose(patterns, {namespace, routeId, date}))
+      fetchGraphQL({query: patterns, variables: {namespace, routeId, date}})
     )
-      .then(response => {
-        if (response.status >= 300) {
-          return dispatch(errorFetchingPatterns())
-        }
-        return response.json()
-      })
-      .then(json => {
-        if (json.data) {
-          const {routes} = json.data.feed
+      // .then(response => {
+      //   if (response.status >= 300) {
+      //     return dispatch(errorFetchingPatterns())
+      //   }
+      //   return response.json()
+      // })
+      .then(data => {
+        if (data) {
+          const {routes} = data.feed
           dispatch(receivePatterns({routes}))
         } else {
           console.log('Error fetching patterns')

diff --git a/lib/gtfs/actions/routes.js b/lib/gtfs/actions/routes.js
@@ -2,7 +2,7 @@
 
 import {createAction} from 'redux-actions'
 
-import {secureFetch} from '../../common/actions'
+import {fetchGraphQL} from '../../common/actions'
 import {updateRouteOffset} from './filter'
 import {allRoutes, compose, routeDetails} from '../../gtfs/util/graphql'
 
@@ -33,23 +33,20 @@ export function fetchRouteDetails (namespace: string) {
     } = state.gtfs.filter
     dispatch(fetchingRouteDetails(namespace))
     return dispatch(
-      secureFetch(
-        compose(routeDetails, {
-          date: dateTimeFilter.date,
-          namespace,
-          routeLimit,
-          routeOffset
-        })
-      )
+      fetchGraphQL({query: routeDetails, variables: {
+        date: dateTimeFilter.date,
+        namespace,
+        routeLimit,
+        routeOffset
+      }})
     )
-      .then(response => response.json())
-      .then(json => {
+      .then(data => {
         const {
           routes,
           row_counts: {
             routes: numRoutes
           }
-        } = json.data.feed
+        } = data.feed
         dispatch(receiveRouteDetails({numRoutes, routes}))
       })
   }
@@ -58,10 +55,9 @@ export function fetchRouteDetails (namespace: string) {
 export function fetchRoutes (namespace: string) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     dispatch(fetchingRoutes(namespace))
-    return dispatch(secureFetch(compose(allRoutes, { namespace })))
-      .then(response => response.json())
-      .then(json => {
-        dispatch(receiveRoutes(json.data.feed.routes))
+    return dispatch(fetchGraphQL({query: allRoutes, variables: {namespace}}))
+      .then(data => {
+        dispatch(receiveRoutes(data.feed.routes))
       })
   }
 }

diff --git a/lib/gtfs/actions/timetables.js b/lib/gtfs/actions/timetables.js
@@ -2,7 +2,7 @@
 
 import {createAction} from 'redux-actions'
 
-import {secureFetch} from '../../common/actions'
+import {fetchGraphQL} from '../../common/actions'
 import {
   updateArrivalDisplay,
   updatePatternFilter,
@@ -39,10 +39,9 @@ export function fetchTimetablesWithFilters (namespace: string) {
       return dispatch(receiveTimetables({data: {trips: []}}))
     }
     dispatch(fetchingTimetables())
-    const params = {date, from, namespace, patternId, routeId, to}
-    dispatch(secureFetch(compose(timetables, params)))
-      .then(response => response.json())
-      .then(json => dispatch(receiveTimetables({data: json.data})))
+    const variables = {date, from, namespace, patternId, routeId, to}
+    return dispatch(fetchGraphQL({query: timetables, variables}))
+      .then(data => dispatch(receiveTimetables({data})))
   }
 }
 

diff --git a/lib/gtfs/util/graphql.js b/lib/gtfs/util/graphql.js
@@ -2,7 +2,13 @@
 
 import {GTFS_GRAPHQL_PREFIX} from '../../common/constants'
 
-// variable names/keys must match those specified in GraphQL schema
+/**
+ * Construct GET GraphQL request URL. NOTE: variable names/keys must match those
+ * specified in GraphQL schema.
+ *
+ * @deprecated Request can become too large and generate a 413 'request entity
+ *   too large' server error. Use lib/common/actions#fetchGraphQL instead.
+ */
 export function compose (query: string, variables: Object) {
   return `${GTFS_GRAPHQL_PREFIX}?query=${encodeURIComponent(query)}&variables=${encodeURIComponent(JSON.stringify(variables))}`
 }