fix put/post

Author: miles-grant-ibigroup

gtfs.yml

@@ -1020,7 +1020,7 @@
 
 # Fares v2
 
-- id: fare_product
+- id: fareproduct
   name: fare_products.txt
   helpContent: Used to describe the range of fares available for purchase by riders or taken into account when computing the total fare for journeys with multiple legs, such as transfer costs.
   fields:
@@ -1039,7 +1039,7 @@
     - name: currency
       required: true
       inputType: TEXT # FARE-TODO: Dropdownx
-- id: fare_media
+- id: faremedia
   name: fare_media.txt
   helpContent: To describe the different fare media that can be employed to use fare products. Fare media are physical or virtual holders used for the representation and/or validation of a fare product.
   fields:
@@ -1058,7 +1058,7 @@
       - value: '2'
       - value: '3'
       - value: '4'
-- id: fare_transfer_rule
+- id: faretransferrule
   name: fare_transfer_rules.txt
   helpContent: Fare rules for transfers between legs of travel defined in fare_leg_rules.txt.
   fields:
@@ -1090,7 +1090,7 @@
     - name: fare_product_id
       required: false
       inputType: TEXT # FARE-TODO: Needs to reference fare_products
-- id: fare_leg_rule
+- id: farelegrule
   name: fare_leg_rules.txt
   # FARE-TODO: Some help content?
   fields:

lib/editor/util/gtfs.js

@@ -32,10 +32,10 @@ export const COMPONENT_LIST = [
   { id: 'calendar', tableName: 'calendar' },
   { id: 'scheduleexception', tableName: 'schedule_exceptions' },
   { id: 'agency', tableName: 'agency' },
-  { id: 'fare_product', tableName: 'fare_product' },
-  { id: 'fare_media', tableName: 'fare_media' },
-  { id: 'fare_transfer_rule', tableName: 'fare_transfer_rule' },
-  { id: 'fare_leg_rule', tableName: 'fare_leg_rule' }
+  { id: 'fareproduct', tableName: 'fare_product' },
+  { id: 'faremedia', tableName: 'fare_media' },
+  { id: 'faretransferrule', tableName: 'fare_transfer_rule' },
+  { id: 'farelegrule', tableName: 'fare_leg_rule' }
 ]
 
 export function getTableById (tableData: any, id?: string, emptyArrayOnNull: boolean = true): any {
@@ -244,10 +244,6 @@ export function getEntityName (entity: any): string {
     nameKey = 'description'
   } else if (typeof entity.fare_id !== 'undefined') {
     nameKey = 'fare_id'
-  } else if (typeof entity.fare_product_id !== 'undefined') {
-    nameKey = 'fare_product_id' // FARE-TODO: fare_product_name?
-  } else if (typeof entity.fare_media_id !== 'undefined') {
-    nameKey = 'fare_media_id' // FARE-TODO: fare_media_name? Some combo?
   }
   // FARE-TODO: what to do with fare_transfer_rules.txt?
   // FARE-TODO: what to do with fare_leg_rules.txt?

lib/editor/util/ui.js

@@ -75,32 +75,32 @@ export const GTFS_ICONS = [
     label: messages('fare.label')
   },
   {
-    id: 'fare_product',
-    tableName: 'fare_product',
+    id: 'fareproduct',
+    tableName: 'fareproduct',
     icon: 'shopping-cart',
     addable: true,
     title: 'FARE PRODUCT TEST TITLE',
     label: 'FARE PRODUCT TEST LABEL'
   },
   {
-    id: 'fare_media',
-    tableName: 'fare_media',
+    id: 'faremedia',
+    tableName: 'faremedia',
     icon: 'id-card',
     addable: true,
     title: 'FARE MEDIA TEST TITLE',
     label: 'FARE MEDIA TEST LABEL'
   },
   {
-    id: 'fare_transfer_rule',
-    tableName: 'fare_transfer_rule',
+    id: 'faretransferrule',
+    tableName: 'faretransferrule',
     icon: 'link',
     addable: true,
     title: 'FARE TRANSFER RULE TEST TITLE',
     label: 'FARE TRANSFER RULE TEST LABEL'
   },
   {
-    id: 'fare_leg_rule',
-    tableName: 'fare_leg_rule',
+    id: 'farelegrule',
+    tableName: 'farelegrule',
     icon: 'book',
     addable: true,
     title: 'FARE LEG RULE TEST TITLE',

lib/gtfs/util/index.js

@@ -15,13 +15,13 @@ export function getEntityIdField (type: string): string {
       return 'agency_id'
     case 'fare':
       return 'fare_id'
-    case 'fare_product':
+    case 'fareproduct':
       return 'fare_product_id'
-    case 'fare_media':
+    case 'faremedia':
       return 'fare_media_id'
-    case 'fare_transfer_rule':
+    case 'faretransferrule':
       return 'id'
-    case 'fare_leg_rule':
+    case 'farelegrule':
       return 'id'
     case 'calendar':
       return 'service_id'
@@ -111,20 +111,20 @@ export function getGraphQLFieldsForEntity (type: string, editor: boolean = false
           contains_id
         }
       `
-    case 'fare_product':
+    case 'fareproduct':
       return `
       ${fields}
       `
-    case 'fare_media':
+    case 'faremedia':
       return `
       ${fields}
       `
-    case 'fare_transfer_rule':
+    case 'faretransferrule':
       return `
       id
       ${fields}
       `
-    case 'fare_leg_rule':
+    case 'farelegrule':
       return `
       id
       ${fields}
@@ -168,13 +168,13 @@ export function getEntityGraphQLRoot (type: string): string {
       return 'calendar'
     case 'fare':
       return 'fares'
-    case 'fare_product':
+    case 'fareproduct':
       return 'fare_product'
-    case 'fare_media':
+    case 'faremedia':
       return 'fare_media'
-    case 'fare_transfer_rule':
+    case 'faretransferrule':
       return 'fare_transfer_rule'
-    case 'fare_leg_rule':
+    case 'farelegrule':
       return 'fare_leg_rule'
     case 'feedinfo':
       return 'feed_info'
@@ -209,16 +209,16 @@ export function getEntityTableString (type: string): string {
       return 'calendar'
     case 'fare': // Fares v1
       return 'fare_attributes' // Fares v1
-    case 'fare_product':
-      return 'fare_product'
-    case 'fare_media':
-      return 'fare_media'
+    case 'fareproduct':
+      return 'fareproduct'
+    case 'faremedia':
+      return 'faremedia'
     case 'fare_rules': // Fares v1
       return 'fare_rules' // Fares v1
-    case 'fare_transfer_rule':
-      return 'fare_transfer_rule'
-    case 'fare_leg_rule':
-      return 'fare_leg_rule'
+    case 'faretransferrule':
+      return 'faretransferrule'
+    case 'farelegrule':
+      return 'farelegrule'
     case 'feedinfo':
       return 'feedinfo'
     case 'stop':