Skip to content

Commit

Permalink
refactor(Replaced camel case with snake case for GrpahQL objs):
Browse files Browse the repository at this point in the history
  • Loading branch information
@br648
br648 committed Jan 28, 2025
1 parent 3faaa1e commit fbf5282
Show file tree
Hide file tree
Showing 17 changed files with 196 additions and 136 deletions.
68 changes: 39 additions & 29 deletions src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsFaresV2Schema.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,35 @@

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))
.field(MapFetcher.field(StopArea.STOP_ID_NAME))
.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))
Expand All @@ -50,41 +60,41 @@ 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))
.field(MapFetcher.field(RouteNetwork.ROUTE_ID_NAME))
.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))
.field(MapFetcher.field(FareMedia.FARE_MEDIA_NAME_NAME))
.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))
.field(MapFetcher.field(FareProduct.FARE_PRODUCT_NAME_NAME))
.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))
Expand All @@ -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))
Expand All @@ -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,
Expand All @@ -147,15 +157,15 @@ private GraphQLGtfsFaresV2Schema() {}

public static List<GraphQLFieldDefinition> 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)
);
}
}
2 changes: 1 addition & 1 deletion src/test/resources/graphql/feedAreas.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ query ($namespace: String) {
area_id
area_name
id
stopAreas {
stop_areas {
area_id
stop_id
id
Expand Down
12 changes: 6 additions & 6 deletions src/test/resources/graphql/feedFareLegRules.txt
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/graphql/feedFareMedias.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
query ($namespace: String) {
feed(namespace: $namespace) {
feed_version
fareMedia {
fare_media {
fare_media_id
fare_media_name
fare_media_type
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/graphql/feedFareProducts.txt
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/test/resources/graphql/feedFareTransferRules.txt
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -32,7 +32,7 @@ query ($namespace: String) {
rule_priority
id
}
toFareLegRule {
to_fare_leg_rule {
leg_group_id
network_id
from_area_id
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/graphql/feedRouteNetworks.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
query ($namespace: String) {
feed(namespace: $namespace) {
feed_version
routeNetwork {
route_network {
network_id
route_id
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/graphql/feedStopAreas.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
query ($namespace: String) {
feed(namespace: $namespace) {
feed_version
stopArea {
stop_area {
area_id
stop_id
id
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/graphql/feedTimeFrames.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
query ($namespace: String) {
feed(namespace: $namespace) {
feed_version
timeFrame {
time_frame {
timeframe_group_id
start_time
end_time
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/snapshots/com/conveyal/gtfs/graphql/GTFSGraphQLTest/canFetchAreas-0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Loading

0 comments on commit fbf5282

Please sign in to comment.