fix(saveEntity, saveTripsForCalendar): Resolve missing defaults with GTFS spec change

fix #716, #717

Author: philip-cline

lib/editor/actions/active.js

@@ -6,10 +6,8 @@ import {createAction, type ActionType} from 'redux-actions'
 
 import {createVoidPayloadAction, secureFetch} from '../../common/actions'
 import {ENTITY} from '../constants'
-import {newGtfsEntity, fetchBaseGtfs} from './editor'
 import {fetchFeedSourceAndProject} from '../../manager/actions/feeds'
 import {fetchGTFSEntities} from '../../manager/actions/versions'
-import {saveTripPattern} from './tripPattern'
 import {
   getEditorNamespace,
   getTableById,
@@ -18,10 +16,12 @@ import {
   subSubComponentList
 } from '../util/gtfs'
 import {getMapFromGtfsStrategy, entityIsNew} from '../util/objects'
-
 import type {Entity, Feed} from '../../types'
 import type {dispatchFn, getStateFn, AppState} from '../../types/reducers'
 
+import {saveTripPattern} from './tripPattern'
+import {newGtfsEntity, fetchBaseGtfs} from './editor'
+
 export const clearGtfsContent = createVoidPayloadAction('CLEAR_GTFSEDITOR_CONTENT')
 const receivedNewEntity = createAction(
   'RECEIVE_NEW_ENTITY',
@@ -331,14 +331,25 @@ export function saveEntity (
       return
     }
     dispatch(savingActiveGtfsEntity())
-    const notNew = !entityIsNew(entity)
+    // Add default vals for component
+    const defaults = {}
+    if (component === 'route') {
+      defaults.continuous_pickup = 1 // Default value for no continuous pickup
+      defaults.continuous_drop_off = 1 // Default value for no continuous drop off
+    } else if (component === 'feedinfo') {
+      defaults.default_lang = ''
+      defaults.feed_contact_url = ''
+      defaults.feed_contact_email = ''
+    }
+    const entityWithDefaults = {...defaults, ...(entity: any)} // add defaults, if any.
+    const notNew = !entityIsNew(entityWithDefaults)
     const method = notNew ? 'put' : 'post'
-    const idParam = notNew ? `/${entity.id || ''}` : ''
+    const idParam = notNew ? `/${entityWithDefaults.id || ''}` : ''
     const {sessionId} = getState().editor.data.lock
     const route = component === 'fare' ? 'fareattribute' : component
     const url = `/api/editor/secure/${route}${idParam}?feedId=${feedId}&sessionId=${sessionId || ''}`
     const mappingStrategy = getMapFromGtfsStrategy(component)
-    const data = mappingStrategy(entity)
+    const data = mappingStrategy(entityWithDefaults)
     return dispatch(secureFetch(url, method, data))
       .then(res => res.json())
       .then(savedEntity => {

lib/editor/actions/trip.js

@@ -7,7 +7,6 @@ import {createVoidPayloadAction, fetchGraphQL, secureFetch} from '../../common/a
 import {setErrorMessage} from '../../manager/actions/status'
 import {entityIsNew} from '../util/objects'
 import {getEditorNamespace} from '../util/gtfs'
-
 import type {Pattern, TimetableColumn, Trip} from '../../types'
 import type {dispatchFn, getStateFn, TripCounts} from '../../types/reducers'
 
@@ -159,6 +158,15 @@ export function saveTripsForCalendar (
     trips = trips.map(snakeCaseKeys)
     return Promise.all(trips.filter(t => t).map((trip, index) => {
       const tripExists = !entityIsNew(trip) && trip.id !== null
+      const tripCopy: any = (trip: any)
+      // Add default value to continuous pickup if not provided
+      const defaults = {
+        continuous_pickup: 1,
+        continuous_drop_off: 1
+      }
+      tripCopy.stop_times = tripCopy.stop_times.map((stopTime, index) => {
+        return {...defaults, ...(stopTime: any)}
+      })
       const method = tripExists ? 'put' : 'post'
       const url = tripExists && trip.id
         ? `/api/editor/secure/trip/${trip.id}?feedId=${feedId}&sessionId=${sessionId}`