Skip to content

Add a null-check to the ids argument in the quays Transmodel API endpoint. #6557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: dev-2.x
Choose a base branch
from
Draft

Add a null-check to the ids argument in the quays Transmodel API endpoint. #6557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f89c0de
Adds a null-check to the ids argument in the quays Transmodel API end…
eibakke Mar 19, 2025
e1a967c
Adds a null-check to the ids argument in the quays Transmodel API end…
eibakke Mar 19, 2025
f38b638
Merge branch 'quays_api_fix' of github.com:entur/OpenTripPlanner into…
eibakke Mar 19, 2025
a6bdf4f
Removes unused import.
eibakke Mar 19, 2025
a9a6bff
Removes all from the description of the quays endpoint in the Transmo…
eibakke Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ private GraphQLSchema create() {
.field(
GraphQLFieldDefinition.newFieldDefinition()
.name("quays")
.description("Get all quays")
.description("Get quays. Either ids or name must be set.")
.withDirective(TransmodelDirectives.TIMING_DATA)
.type(new GraphQLNonNull(new GraphQLList(quayType)))
.argument(
Expand All @@ -583,18 +583,25 @@ private GraphQLSchema create() {
.argument(GraphQLArgument.newArgument().name("name").type(Scalars.GraphQLString).build())
.dataFetcher(environment -> {
if (environment.containsArgument("ids")) {
var ids = mapIDsToDomainNullSafe(environment.getArgument("ids"));

if (environment.getArgument("ids") == null) {
throw new IllegalArgumentException("ids argument must be set to a non-null value.");
}
if (environment.getArgument("name") != null) {
throw new IllegalArgumentException("Unable to combine other filters with ids");
}

var ids = mapIDsToDomainNullSafe(environment.getArgument("ids"));

TransitService transitService = GqlUtil.getTransitService(environment);
return ids.stream().map(transitService::getStopLocation).toList();
}

if (environment.getArgument("name") == null) {
throw new IllegalArgumentException("At least one of ids or name must be set.");
}

FindStopLocationsRequest request = FindStopLocationsRequest.of()
.withName(environment.getArgument("name"))
.withName(Objects.requireNonNull(environment.getArgument("name")))
.build();

return GqlUtil.getTransitService(environment).findStopLocations(request);
Expand Down
2 changes: 1 addition & 1 deletion application/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ type QueryType {
operators: [Operator]! @timingData
"Get a single quay based on its id)"
quay(id: String!): Quay @timingData
"Get all quays"
"Get quays. Either ids or name must be set."
quays(ids: [String], name: String): [Quay]! @timingData
"Get all quays within the specified bounding box"
quaysByBbox(
Expand Down
Loading