Merge branch 'fares-v2' into fares-v2-e2e

Author: josh-willis-arcadis

gtfs.yml

@@ -1199,4 +1199,41 @@
       inputType: TIME
     - name: service_id
       required: true
-      inputType: GTFS_SERVICE
+      inputType: GTFS_SERVICE
+- id: ridercategory
+  name: rider_categories.txt
+  helpContent: Categories of riders that can be used to define fare products.
+  fields:
+    - name: rider_category_id
+      required: true
+      inputType: GTFS_ID
+    - name: rider_category_name
+      required: true
+      inputType: TEXT
+    - name: is_default_fare_category
+      required: true
+      inputType: DROPDOWN
+      options:
+        - value: '0'
+          text: No (0)
+        - value: '1'
+          text: Yes (1)
+    - name: eligibility_url
+      required: false
+      inputType: URL
+- id: farelegjoinrule
+  name: fare_leg_join_rules.txt
+  helpContent: Rules for joining fare legs when calculating total fare for a journey with multiple legs.
+  fields:
+    - name: from_network_id
+      required: true
+      inputType: TEXT # FARE-TODO: Needs to reference routes.network_id or networks.network_id
+    - name: to_network_id
+      required: true
+      inputType: TEXT # FARE-TODO: Needs to reference routes.network_id or networks.network_id
+    - name: from_stop_id
+      required: false
+      inputType: GTFS_STOP
+    - name: to_stop_id
+      required: false
+      inputType: GTFS_STOP

lib/editor/actions/editor.js

@@ -523,11 +523,20 @@ export function fetchBaseGtfs ({
             leg_group_id
             id
           }
+          fare_leg_join_rule (limit: -1) {
+            from_network_id
+            to_network_id
+            id
+          }
           network (limit: -1) {
             id
             network_id
             network_name
           }
+          rider_category (limit: -1) {
+            id
+            rider_category_id
+          }
           routes (limit: -1) {
             id
             route_id

lib/editor/components/EntityListSecondaryActions.js

@@ -148,7 +148,9 @@ export default class EntityListSecondaryActions extends Component<Props> {
       case 'faremedia':
       case 'faretransferrule':
       case 'farelegrule':
+      case 'farelegjoinrule':
       case 'network':
+      case 'ridercategory':
       case 'timeframe':
         console.log('entities::::::', entities)
         const faresv2Tables = [
@@ -157,7 +159,9 @@ export default class EntityListSecondaryActions extends Component<Props> {
           'fareproduct',
           'faretransferrule',
           'farelegrule',
+          'farelegjoinrule',
           'network',
+          'ridercategory',
           'timeframe'
         ]
         return (

lib/editor/reducers/data.js

@@ -34,11 +34,13 @@ export const defaultState = {
     calendar: [],
     fares: [],
     fare_leg_rule: [],
+    fare_leg_join_rule: [],
     fare_media: [],
     fare_product: [],
     fare_transfer_rule: [],
     feed_info: [],
     network: [],
+    rider_category: [],
     routes: [],
     schedule_exceptions: [],
     stops: [],

lib/editor/util/gtfs.js

@@ -36,6 +36,8 @@ export const COMPONENT_LIST = [
   { id: 'faremedia', tableName: 'fare_media' },
   { id: 'faretransferrule', tableName: 'fare_transfer_rule' },
   { id: 'farelegrule', tableName: 'fare_leg_rule' },
+  { id: 'farelegjoinrule', tableName: 'fare_leg_join_rule' },
+  { id: 'ridercategory', tableName: 'rider_category' },
   { id: 'area', tableName: 'area' },
   { id: 'network', tableName: 'network' },
   { id: 'timeframe', tableName: 'time_frame' }
@@ -269,6 +271,8 @@ export function getEntityName (entity: any): string {
     nameKey = 'network_id' // FARE-TODO: network_name?
   } else if (typeof entity.timeframe_group_id !== 'undefined') {
     nameKey = 'timeframe_group_id' // FARE-TODO: timeframe name?
+  } else if (typeof entity.rider_category_id !== 'undefined') {
+    nameKey = 'rider_category_id'
   }
   // FARE-TODO: what to do with fare_products.txt?
 
@@ -402,5 +406,5 @@ export function gtfsSort (a: Entity, b: Entity): number {
 }
 
 export function isComponentFaresv2 (component: string): boolean {
-  return ['fareproduct', 'faremedia', 'faretransferrule', 'farelegrule', 'timeframe'].includes(component)
+  return ['fareproduct', 'faremedia', 'faretransferrule', 'farelegrule', 'farelegjoinrule', 'ridercategory', 'timeframe'].includes(component)
 }

lib/editor/util/objects.js

@@ -15,6 +15,8 @@ export function componentToText (component: string): string {
       return 'transfer rule'
     case 'farelegrule':
       return 'leg rule'
+    case 'farelegjoinrule':
+      return 'leg join rule'
     default:
       return component
   }

lib/editor/util/validation.js

@@ -177,14 +177,17 @@ export function validate (
         console.log('validating fare_product_id uniqueness', {field, value, entities, entity})
         if (isRequiredButEmpty) return emptyFieldValidationIssue()
         if (entities && value) {
-          const currentFareMediaId = entity && typeof entity.fare_media_id !== 'undefined' ? entity.fare_media_id : null
-          const currentRiderCategoryId = entity && typeof entity.rider_category_id !== 'undefined' ? entity.rider_category_id : null
+          // $FlowFixMe: fare_media_id and rider_category_id are fares v2 fields
+          const currentFareMediaId = entity && 'fare_media_id' in entity ? entity.fare_media_id : null
+          // $FlowFixMe: fare_media_id and rider_category_id are fares v2 fields
+          const currentRiderCategoryId = entity && 'rider_category_id' in entity ? entity.rider_category_id : null
           for (let i = 0; i < entities.length; i++) {
             const e = entities[i]
             if (entity && e.id === entity.id) continue
+            // $FlowFixMe: fare_media_id and rider_category_id are fares v2 fields
             if (e.fare_product_id === value) {
-              const eFareMedia = typeof e.fare_media_id !== 'undefined' ? e.fare_media_id : null
-              const eRider = typeof e.rider_category_id !== 'undefined' ? e.rider_category_id : null
+              const eFareMedia = 'fare_media_id' in e && typeof e.fare_media_id !== 'undefined' ? e.fare_media_id : null
+              const eRider = 'rider_category_id' in e && typeof e.rider_category_id !== 'undefined' ? e.rider_category_id : null
               if (eFareMedia === currentFareMediaId && eRider === currentRiderCategoryId) {
                 return validationIssue(messages('fareProductIdCombinationDuplicate'))
               }

lib/gtfs/util/index.js

@@ -23,6 +23,10 @@ export function getEntityIdField (type: string): string {
       return 'id'
     case 'farelegrule':
       return 'id'
+    case 'farelegjoinrule':
+      return 'id'
+    case 'ridercategory':
+      return 'rider_category_id'
     case 'area':
       return 'area_id'
     case 'network':
@@ -137,6 +141,15 @@ export function getGraphQLFieldsForEntity (type: string, editor: boolean = false
       id
       ${fields}
       `
+    case 'farelegjoinrule':
+      return `
+      id
+      ${fields}
+      `
+    case 'ridercategory':
+      return `
+      ${fields}
+      `
     case 'area':
       return `
       ${fields}
@@ -200,6 +213,10 @@ export function getEntityGraphQLRoot (type: string): string {
       return 'fare_transfer_rule'
     case 'farelegrule':
       return 'fare_leg_rule'
+    case 'farelegjoinrule':
+      return 'fare_leg_join_rule'
+    case 'ridercategory':
+      return 'rider_category'
     case 'timeframe':
       return 'time_frame'
     case 'feedinfo':
@@ -247,6 +264,10 @@ export function getEntityTableString (type: string): string {
       return 'faretransferrule'
     case 'farelegrule':
       return 'farelegrule'
+    case 'farelegjoinrule':
+      return 'farelegjoinrule'
+    case 'ridercategory':
+      return 'ridercategory'
     case 'timeframe':
       return 'timeframe'
     case 'feedinfo':

lib/types/reducers.js

@@ -122,6 +122,7 @@ export type EditorTables = {
     id: number,
     service_id: string
   }>,
+  fare_leg_join_rule: Array<{}>, // FARE-TODO: Do this
   fare_leg_rule: Array<{}>, // FARE-TODO: Do this
   fare_media: Array<{}>, // FARE-TODO: Do this
   fare_product: Array<{}>, // FARE-TODO: Do this
@@ -146,6 +147,7 @@ export type EditorTables = {
     network_id: string,
     network_name: ?string
   }>,
+  rider_category: Array<{}>, // FARE-TODO: Do this
   routes: Array<{
     id: number,
     route_id: string,