From fbf52822497ff58f572ea96c2d1fc26b8a4a9c7e Mon Sep 17 00:00:00 2001 From: Robin Beer Date: Tue, 28 Jan 2025 10:37:40 +0000 Subject: [PATCH] refactor(Replaced camel case with snake case for GrpahQL objs): --- .../graphql/GraphQLGtfsFaresV2Schema.java | 68 ++++++---- src/test/resources/graphql/feedAreas.txt | 2 +- .../resources/graphql/feedFareLegRules.txt | 12 +- src/test/resources/graphql/feedFareMedias.txt | 2 +- .../resources/graphql/feedFareProducts.txt | 4 +- .../graphql/feedFareTransferRules.txt | 10 +- .../resources/graphql/feedRouteNetworks.txt | 2 +- src/test/resources/graphql/feedStopAreas.txt | 2 +- src/test/resources/graphql/feedTimeFrames.txt | 2 +- .../GTFSGraphQLTest/canFetchAreas-0.json | 4 +- .../canFetchFareLegRules-0.json | 124 +++++++++--------- .../GTFSGraphQLTest/canFetchFareMedias-0.json | 2 +- .../canFetchFareProducts-0.json | 22 ++-- .../canFetchFareTransferRules-0.json | 22 ++-- .../canFetchRouteNetworks-0.json | 2 +- .../GTFSGraphQLTest/canFetchStopAreas-0.json | 2 +- .../GTFSGraphQLTest/canFetchTimeFrames-0.json | 50 +++++++ 17 files changed, 196 insertions(+), 136 deletions(-) create mode 100644 src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchTimeFrames-0.json diff --git a/src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsFaresV2Schema.java b/src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsFaresV2Schema.java index ea1fe4e6..f1092a3d 100644 --- a/src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsFaresV2Schema.java +++ b/src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsFaresV2Schema.java @@ -23,9 +23,19 @@ public class GraphQLGtfsFaresV2Schema { + private static final String AREA_TYPE_NAME = "area"; + private static final String STOP_AREA_TYPE_NAME = "stop_area"; + private static final String TIME_FRAME_TYPE_NAME = "time_frame"; + private static final String NETWORK_TYPE_NAME = "network"; + private static final String ROUTE_NETWORK_TYPE_NAME = "route_network"; + private static final String FARE_MEDIA_TYPE_NAME = "fare_media"; + private static final String FARE_PRODUCT_TYPE_NAME = "fare_product"; + private static final String FARE_LEG_RULE_TYPE_NAME = "fare_leg_rule"; + private static final String FARE_TRANSFER_RULE_TYPE_NAME = "fare_transfer_rule"; + private GraphQLGtfsFaresV2Schema() {} - public static final GraphQLObjectType stopAreaType = newObject().name("stopArea") + public static final GraphQLObjectType stopAreaType = newObject().name(STOP_AREA_TYPE_NAME) .description("A GTFS stop area object") .field(MapFetcher.field("id", GraphQLInt)) .field(MapFetcher.field(StopArea.AREA_ID_NAME)) @@ -33,15 +43,15 @@ private GraphQLGtfsFaresV2Schema() {} .field(createFieldDefinition("stops", GraphQLGtfsSchema.stopType, "stops", StopArea.STOP_ID_NAME)) .build(); - public static final GraphQLObjectType areaType = newObject().name("area") + public static final GraphQLObjectType areaType = newObject().name(AREA_TYPE_NAME) .description("A GTFS area object") .field(MapFetcher.field("id", GraphQLInt)) .field(MapFetcher.field(Area.AREA_ID_NAME)) .field(MapFetcher.field(Area.AREA_NAME_NAME)) - .field(createFieldDefinition("stopAreas", stopAreaType, StopArea.TABLE_NAME, Area.AREA_ID_NAME)) + .field(createFieldDefinition("stop_areas", stopAreaType, StopArea.TABLE_NAME, Area.AREA_ID_NAME)) .build(); - public static final GraphQLObjectType timeFrameType = newObject().name("timeFrame") + public static final GraphQLObjectType timeFrameType = newObject().name(TIME_FRAME_TYPE_NAME) .description("A GTFS time frame object") .field(MapFetcher.field("id", GraphQLInt)) .field(MapFetcher.field(TimeFrame.TIME_FRAME_GROUP_ID_NAME)) @@ -50,14 +60,14 @@ private GraphQLGtfsFaresV2Schema() {} .field(MapFetcher.field(TimeFrame.SERVICE_ID_NAME)) .build(); - public static final GraphQLObjectType networkType = newObject().name("network") + public static final GraphQLObjectType networkType = newObject().name(NETWORK_TYPE_NAME) .description("A GTFS network object") .field(MapFetcher.field("id", GraphQLInt)) .field(MapFetcher.field(Network.NETWORK_ID_NAME)) .field(MapFetcher.field(Network.NETWORK_NAME_NAME)) .build(); - public static final GraphQLObjectType routeNetworkType = newObject().name("routeNetwork") + public static final GraphQLObjectType routeNetworkType = newObject().name(ROUTE_NETWORK_TYPE_NAME) .description("A GTFS route network object") .field(MapFetcher.field("id", GraphQLInt)) .field(MapFetcher.field(RouteNetwork.NETWORK_ID_NAME)) @@ -65,7 +75,7 @@ private GraphQLGtfsFaresV2Schema() {} .field(createFieldDefinition("networks", networkType, Network.TABLE_NAME, RouteNetwork.NETWORK_ID_NAME)) .build(); - public static final GraphQLObjectType fareMediaType = newObject().name("fareMedia") + public static final GraphQLObjectType fareMediaType = newObject().name(FARE_MEDIA_TYPE_NAME) .description("A GTFS fare media object") .field(MapFetcher.field("id", GraphQLInt)) .field(MapFetcher.field(FareMedia.FARE_MEDIA_ID_NAME)) @@ -73,7 +83,7 @@ private GraphQLGtfsFaresV2Schema() {} .field(MapFetcher.field(FareMedia.FARE_MEDIA_TYPE_NAME)) .build(); - public static final GraphQLObjectType fareProductType = newObject().name("fareProduct") + public static final GraphQLObjectType fareProductType = newObject().name(FARE_PRODUCT_TYPE_NAME) .description("A GTFS fare product object") .field(MapFetcher.field("id", GraphQLInt)) .field(MapFetcher.field(FareProduct.FARE_PRODUCT_ID_NAME)) @@ -81,10 +91,10 @@ private GraphQLGtfsFaresV2Schema() {} .field(MapFetcher.field(FareProduct.FARE_MEDIA_ID_NAME)) .field(MapFetcher.field(FareProduct.AMOUNT_NAME)) .field(MapFetcher.field(FareProduct.CURRENCY_NAME)) - .field(createFieldDefinition("fareMedia", fareMediaType, FareMedia.TABLE_NAME, FareProduct.FARE_MEDIA_ID_NAME)) + .field(createFieldDefinition(FARE_MEDIA_TYPE_NAME, fareMediaType, FareMedia.TABLE_NAME, FareProduct.FARE_MEDIA_ID_NAME)) .build(); - public static final GraphQLObjectType fareLegRuleType = newObject().name("fareLegRule") + public static final GraphQLObjectType fareLegRuleType = newObject().name(FARE_LEG_RULE_TYPE_NAME) .description("A GTFS fare leg rule object") .field(MapFetcher.field("id", GraphQLInt)) .field(MapFetcher.field(FareLegRule.LEG_GROUP_ID_NAME)) @@ -98,27 +108,27 @@ private GraphQLGtfsFaresV2Schema() {} // Will return either routes or networks, not both. .field(createFieldDefinition("routes", GraphQLGtfsSchema.routeType, Route.TABLE_NAME, FareLegRule.NETWORK_ID_NAME)) .field(createFieldDefinition("networks", networkType, Network.TABLE_NAME, Network.NETWORK_ID_NAME)) - .field(createFieldDefinition("fareProducts", fareProductType, FareProduct.TABLE_NAME, FareLegRule.FARE_PRODUCT_ID_NAME)) + .field(createFieldDefinition("fare_products", fareProductType, FareProduct.TABLE_NAME, FareLegRule.FARE_PRODUCT_ID_NAME)) // fromTimeFrame and toTimeFrame may return multiple time frames. .field(createFieldDefinition( - "fromTimeFrame", + "from_time_frame", timeFrameType, TimeFrame.TABLE_NAME, FareLegRule.FROM_TIMEFRAME_GROUP_ID_NAME, TimeFrame.TIME_FRAME_GROUP_ID_NAME )) .field(createFieldDefinition( - "toTimeFrame", + "to_time_frame", timeFrameType, TimeFrame.TABLE_NAME, FareLegRule.TO_TIMEFRAME_GROUP_ID_NAME, TimeFrame.TIME_FRAME_GROUP_ID_NAME )) - .field(createFieldDefinition("toArea", areaType, Area.TABLE_NAME, FareLegRule.TO_AREA_ID_NAME, Area.AREA_ID_NAME)) - .field(createFieldDefinition("fromArea", areaType, Area.TABLE_NAME, FareLegRule.FROM_AREA_ID_NAME, Area.AREA_ID_NAME)) + .field(createFieldDefinition("to_area", areaType, Area.TABLE_NAME, FareLegRule.TO_AREA_ID_NAME, Area.AREA_ID_NAME)) + .field(createFieldDefinition("from_area", areaType, Area.TABLE_NAME, FareLegRule.FROM_AREA_ID_NAME, Area.AREA_ID_NAME)) .build(); - public static final GraphQLObjectType fareTransferRuleType = newObject().name("fareTransferRule") + public static final GraphQLObjectType fareTransferRuleType = newObject().name(FARE_TRANSFER_RULE_TYPE_NAME) .description("A GTFS fare transfer rule object") .field(MapFetcher.field("id", GraphQLInt)) .field(MapFetcher.field(FareTransferRule.FROM_LEG_GROUP_ID_NAME)) @@ -127,17 +137,17 @@ private GraphQLGtfsFaresV2Schema() {} .field(MapFetcher.field(FareTransferRule.DURATION_LIMIT_NAME)) .field(MapFetcher.field(FareTransferRule.DURATION_LIMIT_TYPE_NAME)) .field(MapFetcher.field(FareTransferRule.FARE_PRODUCT_ID_NAME)) - .field(createFieldDefinition("toArea", areaType, Area.TABLE_NAME, FareLegRule.TO_AREA_ID_NAME, Area.AREA_ID_NAME)) - .field(createFieldDefinition("fareProducts", fareProductType, FareProduct.TABLE_NAME, FareProduct.FARE_PRODUCT_ID_NAME)) + .field(createFieldDefinition("to_area", areaType, Area.TABLE_NAME, FareLegRule.TO_AREA_ID_NAME, Area.AREA_ID_NAME)) + .field(createFieldDefinition("fare_products", fareProductType, FareProduct.TABLE_NAME, FareProduct.FARE_PRODUCT_ID_NAME)) .field(createFieldDefinition( - "fromFareLegRule", + "from_fare_leg_rule", fareLegRuleType, FareLegRule.TABLE_NAME, FareTransferRule.FROM_LEG_GROUP_ID_NAME, FareLegRule.LEG_GROUP_ID_NAME )) .field(createFieldDefinition( - "toFareLegRule", + "to_fare_leg_rule", fareLegRuleType, FareLegRule.TABLE_NAME, FareTransferRule.TO_LEG_GROUP_ID_NAME, @@ -147,15 +157,15 @@ private GraphQLGtfsFaresV2Schema() {} public static List getFaresV2FieldDefinitions() { return Arrays.asList( - createFieldDefinition("area", areaType, Area.TABLE_NAME), - createFieldDefinition("stopArea", stopAreaType, StopArea.TABLE_NAME), - createFieldDefinition("fareTransferRule", fareTransferRuleType, FareTransferRule.TABLE_NAME), - createFieldDefinition("fareProduct", fareProductType, FareProduct.TABLE_NAME), - createFieldDefinition("fareMedia", fareMediaType, FareMedia.TABLE_NAME), - createFieldDefinition("fareLegRule", fareLegRuleType, FareLegRule.TABLE_NAME), - createFieldDefinition("timeFrame", timeFrameType, TimeFrame.TABLE_NAME), - createFieldDefinition("network", networkType, Network.TABLE_NAME), - createFieldDefinition("routeNetwork", routeNetworkType, RouteNetwork.TABLE_NAME) + createFieldDefinition(AREA_TYPE_NAME, areaType, Area.TABLE_NAME), + createFieldDefinition(FARE_LEG_RULE_TYPE_NAME, fareLegRuleType, FareLegRule.TABLE_NAME), + createFieldDefinition(FARE_MEDIA_TYPE_NAME, fareMediaType, FareMedia.TABLE_NAME), + createFieldDefinition(FARE_PRODUCT_TYPE_NAME, fareProductType, FareProduct.TABLE_NAME), + createFieldDefinition(FARE_TRANSFER_RULE_TYPE_NAME, fareTransferRuleType, FareTransferRule.TABLE_NAME), + createFieldDefinition(NETWORK_TYPE_NAME, networkType, Network.TABLE_NAME), + createFieldDefinition(ROUTE_NETWORK_TYPE_NAME, routeNetworkType, RouteNetwork.TABLE_NAME), + createFieldDefinition(STOP_AREA_TYPE_NAME, stopAreaType, StopArea.TABLE_NAME), + createFieldDefinition(TIME_FRAME_TYPE_NAME, timeFrameType, TimeFrame.TABLE_NAME) ); } } diff --git a/src/test/resources/graphql/feedAreas.txt b/src/test/resources/graphql/feedAreas.txt index 0cbe237a..b2a19a71 100644 --- a/src/test/resources/graphql/feedAreas.txt +++ b/src/test/resources/graphql/feedAreas.txt @@ -5,7 +5,7 @@ query ($namespace: String) { area_id area_name id - stopAreas { + stop_areas { area_id stop_id id diff --git a/src/test/resources/graphql/feedFareLegRules.txt b/src/test/resources/graphql/feedFareLegRules.txt index 021c9f75..23778268 100644 --- a/src/test/resources/graphql/feedFareLegRules.txt +++ b/src/test/resources/graphql/feedFareLegRules.txt @@ -1,7 +1,7 @@ query ($namespace: String) { feed(namespace: $namespace) { feed_version - fareLegRule(limit: 10) { + fare_leg_rule(limit: 10) { leg_group_id network_id from_area_id @@ -19,30 +19,30 @@ query ($namespace: String) { network_id network_name } - fareProducts { + fare_products { fare_product_id fare_product_name fare_media_id amount currency } - fromTimeFrame { + from_time_frame { timeframe_group_id start_time end_time service_id } - toTimeFrame { + to_time_frame { timeframe_group_id start_time end_time service_id } - toArea { + to_area { area_id area_name } - fromArea { + from_area { area_id area_name } diff --git a/src/test/resources/graphql/feedFareMedias.txt b/src/test/resources/graphql/feedFareMedias.txt index d35b2b05..9d4d08e0 100644 --- a/src/test/resources/graphql/feedFareMedias.txt +++ b/src/test/resources/graphql/feedFareMedias.txt @@ -1,7 +1,7 @@ query ($namespace: String) { feed(namespace: $namespace) { feed_version - fareMedia { + fare_media { fare_media_id fare_media_name fare_media_type diff --git a/src/test/resources/graphql/feedFareProducts.txt b/src/test/resources/graphql/feedFareProducts.txt index bb550d47..536ae181 100644 --- a/src/test/resources/graphql/feedFareProducts.txt +++ b/src/test/resources/graphql/feedFareProducts.txt @@ -1,13 +1,13 @@ query ($namespace: String) { feed(namespace: $namespace) { feed_version - fareProduct(limit: 10) { + fare_product(limit: 10) { fare_product_id fare_product_name fare_media_id amount currency - fareMedia { + fare_media { fare_media_id fare_media_name fare_media_type diff --git a/src/test/resources/graphql/feedFareTransferRules.txt b/src/test/resources/graphql/feedFareTransferRules.txt index b407b702..b8d5fc76 100644 --- a/src/test/resources/graphql/feedFareTransferRules.txt +++ b/src/test/resources/graphql/feedFareTransferRules.txt @@ -1,27 +1,27 @@ query ($namespace: String) { feed(namespace: $namespace) { feed_version - fareTransferRule (limit: 2) { + fare_transfer_rule (limit: 2) { from_leg_group_id to_leg_group_id transfer_count duration_limit duration_limit_type fare_product_id - fareProducts { + fare_products { fare_product_id fare_product_name fare_media_id amount currency - fareMedia { + fare_media { fare_media_id fare_media_name fare_media_type id } } - fromFareLegRule { + from_fare_leg_rule { leg_group_id network_id from_area_id @@ -32,7 +32,7 @@ query ($namespace: String) { rule_priority id } - toFareLegRule { + to_fare_leg_rule { leg_group_id network_id from_area_id diff --git a/src/test/resources/graphql/feedRouteNetworks.txt b/src/test/resources/graphql/feedRouteNetworks.txt index 24a30384..19fb4eef 100644 --- a/src/test/resources/graphql/feedRouteNetworks.txt +++ b/src/test/resources/graphql/feedRouteNetworks.txt @@ -1,7 +1,7 @@ query ($namespace: String) { feed(namespace: $namespace) { feed_version - routeNetwork { + route_network { network_id route_id } diff --git a/src/test/resources/graphql/feedStopAreas.txt b/src/test/resources/graphql/feedStopAreas.txt index 91999bfd..5e455f11 100644 --- a/src/test/resources/graphql/feedStopAreas.txt +++ b/src/test/resources/graphql/feedStopAreas.txt @@ -1,7 +1,7 @@ query ($namespace: String) { feed(namespace: $namespace) { feed_version - stopArea { + stop_area { area_id stop_id id diff --git a/src/test/resources/graphql/feedTimeFrames.txt b/src/test/resources/graphql/feedTimeFrames.txt index 6a259e89..80331f44 100644 --- a/src/test/resources/graphql/feedTimeFrames.txt +++ b/src/test/resources/graphql/feedTimeFrames.txt @@ -1,7 +1,7 @@ query ($namespace: String) { feed(namespace: $namespace) { feed_version - timeFrame { + time_frame { timeframe_group_id start_time end_time diff --git a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchAreas-0.json b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchAreas-0.json index a40f5d45..25b2ec25 100644 --- a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchAreas-0.json +++ b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchAreas-0.json @@ -5,7 +5,7 @@ "area_id" : "area_bl", "area_name" : "Blue Line", "id" : 2, - "stopAreas" : [ { + "stop_areas" : [ { "area_id" : "area_bl", "id" : 229, "stop_id" : "4u6g", @@ -186,7 +186,7 @@ "area_id" : "area_bl_airport", "area_name" : "Blue Line - Airport Station", "id" : 3, - "stopAreas" : [ { + "stop_areas" : [ { "area_id" : "area_bl_airport", "id" : 238, "stop_id" : "4u6g", diff --git a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareLegRules-0.json b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareLegRules-0.json index 0403cdb2..db5a0cc3 100644 --- a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareLegRules-0.json +++ b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareLegRules-0.json @@ -1,20 +1,21 @@ { "data" : { "feed" : { - "fareLegRule" : [ { - "fareProducts" : [ { + "fare_leg_rule" : [ { + "fare_product_id" : "prod_rapid_transit_quick_subway", + "fare_products" : [ { "amount" : "2.4", "currency" : "USD", "fare_media_id" : "charlieticket", "fare_product_id" : "prod_rapid_transit_quick_subway", "fare_product_name" : "Subway Quick Ticket" } ], - "fare_product_id" : "prod_rapid_transit_quick_subway", - "fromArea" : [ { + "from_area" : [ { "area_id" : "area_bl_airport", "area_name" : "Blue Line - Airport Station" } ], - "fromTimeFrame" : [ { + "from_area_id" : "area_bl_airport", + "from_time_frame" : [ { "end_time" : null, "service_id" : "04100312-8fe1-46a5-a9f2-556f39478f57", "start_time" : null, @@ -25,7 +26,6 @@ "start_time" : "9000", "timeframe_group_id" : "timeframe_regular" } ], - "from_area_id" : "area_bl_airport", "from_timeframe_group_id" : "timeframe_regular", "id" : 2, "leg_group_id" : "leg_airport_rapid_transit_quick_subway", @@ -36,12 +36,13 @@ "route_long_name" : "RL" } ], "rule_priority" : null, - "toArea" : [ ], - "toTimeFrame" : [ ], + "to_area" : [ ], "to_area_id" : null, + "to_time_frame" : [ ], "to_timeframe_group_id" : null }, { - "fareProducts" : [ { + "fare_product_id" : "prod_cape_buzzards_hyannis_fare", + "fare_products" : [ { "amount" : "5.0", "currency" : "USD", "fare_media_id" : "cash", @@ -60,13 +61,12 @@ "fare_product_id" : "prod_cape_buzzards_hyannis_fare", "fare_product_name" : "CapeFLYER Middleborough/Lakeville one-way fare" } ], - "fare_product_id" : "prod_cape_buzzards_hyannis_fare", - "fromArea" : [ { + "from_area" : [ { "area_id" : "area_cf_zone_buzzards", "area_name" : "CapeFLYER - Wareham/Buzzards Bay/Bourne" } ], - "fromTimeFrame" : [ ], "from_area_id" : "area_cf_zone_buzzards", + "from_time_frame" : [ ], "from_timeframe_group_id" : null, "id" : 3, "leg_group_id" : "leg_cape_buzzards_hyannis_cash", @@ -74,15 +74,16 @@ "networks" : [ ], "routes" : [ ], "rule_priority" : null, - "toArea" : [ { + "to_area" : [ { "area_id" : "area_cf_zone_hyannis", "area_name" : "CapeFLYER - Hyannis" } ], - "toTimeFrame" : [ ], "to_area_id" : "area_cf_zone_hyannis", + "to_time_frame" : [ ], "to_timeframe_group_id" : null }, { - "fareProducts" : [ { + "fare_product_id" : "prod_cape_buzzards_hyannis_fare", + "fare_products" : [ { "amount" : "5.0", "currency" : "USD", "fare_media_id" : "cash", @@ -101,13 +102,12 @@ "fare_product_id" : "prod_cape_buzzards_hyannis_fare", "fare_product_name" : "CapeFLYER Middleborough/Lakeville one-way fare" } ], - "fare_product_id" : "prod_cape_buzzards_hyannis_fare", - "fromArea" : [ { + "from_area" : [ { "area_id" : "area_cf_zone_hyannis", "area_name" : "CapeFLYER - Hyannis" } ], - "fromTimeFrame" : [ ], "from_area_id" : "area_cf_zone_hyannis", + "from_time_frame" : [ ], "from_timeframe_group_id" : null, "id" : 4, "leg_group_id" : "leg_cape_buzzards_hyannis_cash", @@ -115,15 +115,16 @@ "networks" : [ ], "routes" : [ ], "rule_priority" : null, - "toArea" : [ { + "to_area" : [ { "area_id" : "area_cf_zone_buzzards", "area_name" : "CapeFLYER - Wareham/Buzzards Bay/Bourne" } ], - "toTimeFrame" : [ ], "to_area_id" : "area_cf_zone_buzzards", + "to_time_frame" : [ ], "to_timeframe_group_id" : null }, { - "fareProducts" : [ { + "fare_product_id" : "prod_cape_buzzards_hyannis_fare", + "fare_products" : [ { "amount" : "5.0", "currency" : "USD", "fare_media_id" : "cash", @@ -142,13 +143,12 @@ "fare_product_id" : "prod_cape_buzzards_hyannis_fare", "fare_product_name" : "CapeFLYER Middleborough/Lakeville one-way fare" } ], - "fare_product_id" : "prod_cape_buzzards_hyannis_fare", - "fromArea" : [ { + "from_area" : [ { "area_id" : "area_cf_zone_hyannis", "area_name" : "CapeFLYER - Hyannis" } ], - "fromTimeFrame" : [ ], "from_area_id" : "area_cf_zone_hyannis", + "from_time_frame" : [ ], "from_timeframe_group_id" : null, "id" : 5, "leg_group_id" : "leg_cape_buzzards_hyannis_cash", @@ -156,15 +156,16 @@ "networks" : [ ], "routes" : [ ], "rule_priority" : null, - "toArea" : [ { + "to_area" : [ { "area_id" : "area_commuter_rail_zone_8", "area_name" : "Commuter Rail Zone 8" } ], - "toTimeFrame" : [ ], "to_area_id" : "area_commuter_rail_zone_8", + "to_time_frame" : [ ], "to_timeframe_group_id" : null }, { - "fareProducts" : [ { + "fare_product_id" : "prod_cape_buzzards_hyannis_fare", + "fare_products" : [ { "amount" : "5.0", "currency" : "USD", "fare_media_id" : "cash", @@ -183,13 +184,12 @@ "fare_product_id" : "prod_cape_buzzards_hyannis_fare", "fare_product_name" : "CapeFLYER Middleborough/Lakeville one-way fare" } ], - "fare_product_id" : "prod_cape_buzzards_hyannis_fare", - "fromArea" : [ { + "from_area" : [ { "area_id" : "area_commuter_rail_zone_8", "area_name" : "Commuter Rail Zone 8" } ], - "fromTimeFrame" : [ ], "from_area_id" : "area_commuter_rail_zone_8", + "from_time_frame" : [ ], "from_timeframe_group_id" : null, "id" : 6, "leg_group_id" : "leg_cape_buzzards_hyannis_cash", @@ -197,15 +197,16 @@ "networks" : [ ], "routes" : [ ], "rule_priority" : null, - "toArea" : [ { + "to_area" : [ { "area_id" : "area_cf_zone_hyannis", "area_name" : "CapeFLYER - Hyannis" } ], - "toTimeFrame" : [ ], "to_area_id" : "area_cf_zone_hyannis", + "to_time_frame" : [ ], "to_timeframe_group_id" : null }, { - "fareProducts" : [ { + "fare_product_id" : "prod_cape_sbb_buzzards_fare", + "fare_products" : [ { "amount" : "20.0", "currency" : "USD", "fare_media_id" : "cash", @@ -224,13 +225,12 @@ "fare_product_id" : "prod_cape_sbb_buzzards_fare", "fare_product_name" : "CapeFLYER Bourne one-way fare" } ], - "fare_product_id" : "prod_cape_sbb_buzzards_fare", - "fromArea" : [ { + "from_area" : [ { "area_id" : "area_cf_zone_buzzards", "area_name" : "CapeFLYER - Wareham/Buzzards Bay/Bourne" } ], - "fromTimeFrame" : [ ], "from_area_id" : "area_cf_zone_buzzards", + "from_time_frame" : [ ], "from_timeframe_group_id" : null, "id" : 7, "leg_group_id" : "leg_cape_sbb_buzzards_cash", @@ -238,15 +238,16 @@ "networks" : [ ], "routes" : [ ], "rule_priority" : null, - "toArea" : [ { + "to_area" : [ { "area_id" : "area_commuter_rail_zone_1a", "area_name" : "Commuter Rail Zone 1A" } ], - "toTimeFrame" : [ ], "to_area_id" : "area_commuter_rail_zone_1a", + "to_time_frame" : [ ], "to_timeframe_group_id" : null }, { - "fareProducts" : [ { + "fare_product_id" : "prod_cape_sbb_buzzards_fare", + "fare_products" : [ { "amount" : "20.0", "currency" : "USD", "fare_media_id" : "cash", @@ -265,13 +266,12 @@ "fare_product_id" : "prod_cape_sbb_buzzards_fare", "fare_product_name" : "CapeFLYER Bourne one-way fare" } ], - "fare_product_id" : "prod_cape_sbb_buzzards_fare", - "fromArea" : [ { + "from_area" : [ { "area_id" : "area_cf_zone_buzzards", "area_name" : "CapeFLYER - Wareham/Buzzards Bay/Bourne" } ], - "fromTimeFrame" : [ ], "from_area_id" : "area_cf_zone_buzzards", + "from_time_frame" : [ ], "from_timeframe_group_id" : null, "id" : 8, "leg_group_id" : "leg_cape_sbb_buzzards_cash", @@ -279,15 +279,16 @@ "networks" : [ ], "routes" : [ ], "rule_priority" : null, - "toArea" : [ { + "to_area" : [ { "area_id" : "area_commuter_rail_zone_2", "area_name" : "Commuter Rail Zone 2" } ], - "toTimeFrame" : [ ], "to_area_id" : "area_commuter_rail_zone_2", + "to_time_frame" : [ ], "to_timeframe_group_id" : null }, { - "fareProducts" : [ { + "fare_product_id" : "prod_cape_sbb_buzzards_fare", + "fare_products" : [ { "amount" : "20.0", "currency" : "USD", "fare_media_id" : "cash", @@ -306,13 +307,12 @@ "fare_product_id" : "prod_cape_sbb_buzzards_fare", "fare_product_name" : "CapeFLYER Bourne one-way fare" } ], - "fare_product_id" : "prod_cape_sbb_buzzards_fare", - "fromArea" : [ { + "from_area" : [ { "area_id" : "area_cf_zone_buzzards", "area_name" : "CapeFLYER - Wareham/Buzzards Bay/Bourne" } ], - "fromTimeFrame" : [ ], "from_area_id" : "area_cf_zone_buzzards", + "from_time_frame" : [ ], "from_timeframe_group_id" : null, "id" : 9, "leg_group_id" : "leg_cape_sbb_buzzards_cash", @@ -320,15 +320,16 @@ "networks" : [ ], "routes" : [ ], "rule_priority" : null, - "toArea" : [ { + "to_area" : [ { "area_id" : "area_commuter_rail_zone_4", "area_name" : "Commuter Rail Zone 4" } ], - "toTimeFrame" : [ ], "to_area_id" : "area_commuter_rail_zone_4", + "to_time_frame" : [ ], "to_timeframe_group_id" : null }, { - "fareProducts" : [ { + "fare_product_id" : "prod_cape_sbb_buzzards_fare", + "fare_products" : [ { "amount" : "20.0", "currency" : "USD", "fare_media_id" : "cash", @@ -347,13 +348,12 @@ "fare_product_id" : "prod_cape_sbb_buzzards_fare", "fare_product_name" : "CapeFLYER Bourne one-way fare" } ], - "fare_product_id" : "prod_cape_sbb_buzzards_fare", - "fromArea" : [ { + "from_area" : [ { "area_id" : "area_commuter_rail_zone_1a", "area_name" : "Commuter Rail Zone 1A" } ], - "fromTimeFrame" : [ ], "from_area_id" : "area_commuter_rail_zone_1a", + "from_time_frame" : [ ], "from_timeframe_group_id" : null, "id" : 10, "leg_group_id" : "leg_cape_sbb_buzzards_cash", @@ -361,15 +361,16 @@ "networks" : [ ], "routes" : [ ], "rule_priority" : null, - "toArea" : [ { + "to_area" : [ { "area_id" : "area_cf_zone_buzzards", "area_name" : "CapeFLYER - Wareham/Buzzards Bay/Bourne" } ], - "toTimeFrame" : [ ], "to_area_id" : "area_cf_zone_buzzards", + "to_time_frame" : [ ], "to_timeframe_group_id" : null }, { - "fareProducts" : [ { + "fare_product_id" : "prod_cape_sbb_buzzards_fare", + "fare_products" : [ { "amount" : "20.0", "currency" : "USD", "fare_media_id" : "cash", @@ -388,13 +389,12 @@ "fare_product_id" : "prod_cape_sbb_buzzards_fare", "fare_product_name" : "CapeFLYER Bourne one-way fare" } ], - "fare_product_id" : "prod_cape_sbb_buzzards_fare", - "fromArea" : [ { + "from_area" : [ { "area_id" : "area_commuter_rail_zone_2", "area_name" : "Commuter Rail Zone 2" } ], - "fromTimeFrame" : [ ], "from_area_id" : "area_commuter_rail_zone_2", + "from_time_frame" : [ ], "from_timeframe_group_id" : null, "id" : 11, "leg_group_id" : "leg_cape_sbb_buzzards_cash", @@ -402,12 +402,12 @@ "networks" : [ ], "routes" : [ ], "rule_priority" : null, - "toArea" : [ { + "to_area" : [ { "area_id" : "area_cf_zone_buzzards", "area_name" : "CapeFLYER - Wareham/Buzzards Bay/Bourne" } ], - "toTimeFrame" : [ ], "to_area_id" : "area_cf_zone_buzzards", + "to_time_frame" : [ ], "to_timeframe_group_id" : null } ], "feed_version" : "1.0" diff --git a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareMedias-0.json b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareMedias-0.json index 86d7c8d3..9995d7f8 100644 --- a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareMedias-0.json +++ b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareMedias-0.json @@ -1,7 +1,7 @@ { "data" : { "feed" : { - "fareMedia" : [ { + "fare_media" : [ { "fare_media_id" : "cash", "fare_media_name" : "Cash", "fare_media_type" : "0", diff --git a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareProducts-0.json b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareProducts-0.json index aeb5b0f9..c9607e34 100644 --- a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareProducts-0.json +++ b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareProducts-0.json @@ -1,10 +1,10 @@ { "data" : { "feed" : { - "fareProduct" : [ { + "fare_product" : [ { "amount" : "6.5", "currency" : "USD", - "fareMedia" : [ { + "fare_media" : [ { "fare_media_id" : "cash", "fare_media_name" : "Cash", "fare_media_type" : "0", @@ -16,7 +16,7 @@ }, { "amount" : "6.5", "currency" : "USD", - "fareMedia" : [ { + "fare_media" : [ { "fare_media_id" : "credit_debit", "fare_media_name" : "Credit/debit card", "fare_media_type" : "0", @@ -28,7 +28,7 @@ }, { "amount" : "6.5", "currency" : "USD", - "fareMedia" : [ { + "fare_media" : [ { "fare_media_id" : "mticket", "fare_media_name" : "mTicket app", "fare_media_type" : "4", @@ -40,7 +40,7 @@ }, { "amount" : "2.4", "currency" : "USD", - "fareMedia" : [ { + "fare_media" : [ { "fare_media_id" : "cash", "fare_media_name" : "Cash", "fare_media_type" : "0", @@ -52,7 +52,7 @@ }, { "amount" : "2.4", "currency" : "USD", - "fareMedia" : [ { + "fare_media" : [ { "fare_media_id" : "credit_debit", "fare_media_name" : "Credit/debit card", "fare_media_type" : "0", @@ -64,7 +64,7 @@ }, { "amount" : "2.4", "currency" : "USD", - "fareMedia" : [ { + "fare_media" : [ { "fare_media_id" : "mticket", "fare_media_name" : "mTicket app", "fare_media_type" : "4", @@ -76,7 +76,7 @@ }, { "amount" : "7.0", "currency" : "USD", - "fareMedia" : [ { + "fare_media" : [ { "fare_media_id" : "cash", "fare_media_name" : "Cash", "fare_media_type" : "0", @@ -88,7 +88,7 @@ }, { "amount" : "7.0", "currency" : "USD", - "fareMedia" : [ { + "fare_media" : [ { "fare_media_id" : "credit_debit", "fare_media_name" : "Credit/debit card", "fare_media_type" : "0", @@ -100,7 +100,7 @@ }, { "amount" : "7.0", "currency" : "USD", - "fareMedia" : [ { + "fare_media" : [ { "fare_media_id" : "mticket", "fare_media_name" : "mTicket app", "fare_media_type" : "4", @@ -112,7 +112,7 @@ }, { "amount" : "5.0", "currency" : "USD", - "fareMedia" : [ { + "fare_media" : [ { "fare_media_id" : "cash", "fare_media_name" : "Cash", "fare_media_type" : "0", diff --git a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareTransferRules-0.json b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareTransferRules-0.json index 964d368c..d7bd4d3b 100644 --- a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareTransferRules-0.json +++ b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchFareTransferRules-0.json @@ -1,13 +1,14 @@ { "data" : { "feed" : { - "fareTransferRule" : [ { + "fare_transfer_rule" : [ { "duration_limit" : "7200", "duration_limit_type" : "1", - "fareProducts" : [ { + "fare_product_id" : "prod_rapid_transit_quick_subway", + "fare_products" : [ { "amount" : "2.4", "currency" : "USD", - "fareMedia" : [ { + "fare_media" : [ { "fare_media_id" : "charlieticket", "fare_media_name" : "CharlieTicket", "fare_media_type" : "1", @@ -17,8 +18,7 @@ "fare_product_id" : "prod_rapid_transit_quick_subway", "fare_product_name" : "Subway Quick Ticket" } ], - "fare_product_id" : "prod_rapid_transit_quick_subway", - "fromFareLegRule" : [ { + "from_fare_leg_rule" : [ { "fare_product_id" : "prod_rapid_transit_quick_subway", "from_area_id" : "area_bl_airport", "from_timeframe_group_id" : "timeframe_regular", @@ -30,7 +30,7 @@ "to_timeframe_group_id" : null } ], "from_leg_group_id" : "leg_airport_rapid_transit_quick_subway", - "toFareLegRule" : [ { + "to_fare_leg_rule" : [ { "fare_product_id" : "prod_rapid_transit_quick_subway", "from_area_id" : "area_route_354_downtown", "from_timeframe_group_id" : null, @@ -586,10 +586,11 @@ }, { "duration_limit" : null, "duration_limit_type" : null, - "fareProducts" : [ { + "fare_product_id" : "prod_rapid_transit_quick_subway", + "fare_products" : [ { "amount" : "2.4", "currency" : "USD", - "fareMedia" : [ { + "fare_media" : [ { "fare_media_id" : "charlieticket", "fare_media_name" : "CharlieTicket", "fare_media_type" : "1", @@ -599,8 +600,7 @@ "fare_product_id" : "prod_rapid_transit_quick_subway", "fare_product_name" : "Subway Quick Ticket" } ], - "fare_product_id" : "prod_rapid_transit_quick_subway", - "fromFareLegRule" : [ { + "from_fare_leg_rule" : [ { "fare_product_id" : "prod_rapid_transit_quick_subway", "from_area_id" : "area_bl_airport", "from_timeframe_group_id" : "timeframe_regular", @@ -612,7 +612,7 @@ "to_timeframe_group_id" : null } ], "from_leg_group_id" : "leg_airport_rapid_transit_quick_subway", - "toFareLegRule" : [ { + "to_fare_leg_rule" : [ { "fare_product_id" : "prod_rapid_transit_quick_subway", "from_area_id" : "area_bl", "from_timeframe_group_id" : "timeframe_regular", diff --git a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchRouteNetworks-0.json b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchRouteNetworks-0.json index 1a234d07..a444e1ba 100644 --- a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchRouteNetworks-0.json +++ b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchRouteNetworks-0.json @@ -2,7 +2,7 @@ "data" : { "feed" : { "feed_version" : "1.0", - "routeNetwork" : [ { + "route_network" : [ { "network_id" : "1", "route_id" : "1" } ] diff --git a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchStopAreas-0.json b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchStopAreas-0.json index a9fab419..1b2454ee 100644 --- a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchStopAreas-0.json +++ b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchStopAreas-0.json @@ -2,7 +2,7 @@ "data" : { "feed" : { "feed_version" : "1.0", - "stopArea" : [ { + "stop_area" : [ { "area_id" : "area_route_426_downtown", "id" : 2, "stop_id" : "4u6g", diff --git a/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchTimeFrames-0.json b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchTimeFrames-0.json new file mode 100644 index 00000000..ee6ae00b --- /dev/null +++ b/src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchTimeFrames-0.json @@ -0,0 +1,50 @@ +{ + "data" : { + "feed" : { + "feed_version" : "1.0", + "time_frame" : [ { + "end_time" : null, + "id" : 2, + "service_id" : "04100312-8fe1-46a5-a9f2-556f39478f57", + "start_time" : null, + "timeframe_group_id" : "timeframe_regular" + }, { + "end_time" : null, + "id" : 3, + "service_id" : "04100312-8fe1-46a5-a9f2-556f39478f57", + "start_time" : null, + "timeframe_group_id" : "timeframe_systemwide_free" + }, { + "end_time" : null, + "id" : 4, + "service_id" : "04100312-8fe1-46a5-a9f2-556f39478f57", + "start_time" : null, + "timeframe_group_id" : "timeframe_sumner_tunnel_closure" + }, { + "end_time" : "9000", + "id" : 5, + "service_id" : "04100312-8fe1-46a5-a9f2-556f39478f57", + "start_time" : "0", + "timeframe_group_id" : "timeframe_sumner_tunnel_closure" + }, { + "end_time" : "86400", + "id" : 6, + "service_id" : "04100312-8fe1-46a5-a9f2-556f39478f57", + "start_time" : "9000", + "timeframe_group_id" : "timeframe_regular" + }, { + "end_time" : null, + "id" : 7, + "service_id" : "04100312-8fe1-46a5-a9f2-556f39478f57", + "start_time" : null, + "timeframe_group_id" : "timeframe_alewife_kendall_surge" + }, { + "end_time" : "9000", + "id" : 8, + "service_id" : "04100312-8fe1-46a5-a9f2-556f39478f57", + "start_time" : "0", + "timeframe_group_id" : "timeframe_alewife_kendall_surge" + } ] + } + } +} \ No newline at end of file