-
Notifications
You must be signed in to change notification settings - Fork 1k
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.
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
Add currentFuelPercent and currentRangeMeters to RentalVehichle in the GTFS GraphQL API #6272
base: dev-2.x
Are you sure you want to change the base?
Add currentFuelPercent and currentRangeMeters to RentalVehichle in the GTFS GraphQL API #6272
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev-2.x #6272 +/- ##
=============================================
- Coverage 69.85% 69.84% -0.01%
- Complexity 17921 17940 +19
=============================================
Files 2035 2037 +2
Lines 76495 76542 +47
Branches 7824 7831 +7
=============================================
+ Hits 53434 53463 +29
- Misses 20324 20341 +17
- Partials 2737 2738 +1 ☔ View full report in Codecov by Sentry. |
application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
Outdated
Show resolved
Hide resolved
2eef86c
to
00a1e4b
Compare
application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
Outdated
Show resolved
Hide resolved
application/src/test/java/org/opentripplanner/routing/core/DistanceTest.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/transit/model/basic/Distance.java
Outdated
Show resolved
Hide resolved
...tion/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java
Outdated
Show resolved
Hide resolved
...tion/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java
Outdated
Show resolved
Hide resolved
...tion/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java
Outdated
Show resolved
Hide resolved
application/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql
Outdated
Show resolved
Hide resolved
Does the library we use validate that the fuel percent is between 0 and 1 or should we do it? |
The library validate if the value is between 0 and 1 in output (when generating the graphql response). {
"errors": [
{
"message": "Can't serialize value (/rentalVehicles[0]/currentFuelPercent) : Value is under 0 or greater than 1.",
"path": [
"rentalVehicles",
0,
"currentFuelPercent"
],
"extensions": {
"classification": "DataFetchingException"
}
}
],
"data": {
"rentalVehicles": [
{
"name": "Ninebot A200",
"lat": 43.772581,
"lon": 13.132542,
"currentFuelPercent": null
}
]
}
} The value is not checked when received in the gbfs mapper, do we need to check it also there? I saw that in the var ratio = (Double) GraphQLScalars.RATIO_SCALAR.getCoercing().parseValue(HALF); to parse a value. |
I would prefer to log some warning and ignore the value in the mapper instead of letting it be cause issues in the APIs. |
@testower do you know if there is some general policy in the GBFS java library for validating values (such as not allowing over 100% fuel percent or negative range meters)? |
The java model used in otp does not have validation annotations, so anything that can be deserialized is accepted. |
Is there an option to use validation annotations? I'm just wondering should we discuss the possibility in tomorrow's dev meeting, for example? |
Not with the current library. It is left out with intention. I don't think validation should be handled in the deserialization step anyway. This is runtime code / hot code path, so I think OTP should validate the data it needs to in the business layer. |
I should probably add some reasoning: I don't think it's desirable to reject the deserialization of a whole file update, because some particular piece of data in that update doesn't validate according to the validation annotations. The data may still be perfectly usable by OTP. |
...java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java
Outdated
Show resolved
Hide resolved
You need to resolve merge conflicts. |
376dae0
to
086effd
Compare
b52ebca
to
284133a
Compare
// if the propulsion type has an engine current_range_meters is required | ||
if ( | ||
vehicle.getVehicleTypeId() != null && | ||
vehicleTypes.get(vehicle.getVehicleTypeId()) != null && |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added this check, can you double check if it's right?
I'm not sure but vehicle_type_id
is REQUIRED if the vehicle_types.json file is defined, that file is REQUIRED for systems with free_bike_status.json
and if this file is not included then all vehicles are non motorized bicycles.
Therefore if the vehicleTypeId is not present in the vehicleTypes map I can assume that the file vehicle_types.json
is not present and all vehicles are not motorized, so the propulsion type is human and range is not needed.
Summary
Add currentFuelPercent and currentRangeMeters fields to RentalVehicle in the graphql GTFS API
Issue
issue
I added currentRangeMeters on top of the issue because it is related
Unit tests
Write a few words on how the new code is tested.
graphiql
frontendpass the continuous integration service
? Yes
Documentation