-
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
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.73% 69.77% +0.03%
- Complexity 18023 18081 +58
=============================================
Files 2057 2063 +6
Lines 76978 77206 +228
Branches 7845 7860 +15
=============================================
+ Hits 53678 53867 +189
- Misses 20550 20584 +34
- Partials 2750 2755 +5 ☔ 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. |
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.
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 think this is correct, but this is in an area where a lot of feeds get things wrong so this validation might cause issues but I'm not sure if I'm against this or not.
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 spoke to @hbruch about this and he said that there are a number of feeds that don't include it where they should but he is in favour of enforcing the spec anyway. If we are not strict with data producers, they will never learn.
...ication/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java
Outdated
Show resolved
Hide resolved
...ication/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/transit/model/basic/Ratio.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/transit/model/basic/Distance.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/transit/model/basic/Distance.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/transit/model/basic/Ratio.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/transit/model/basic/Ratio.java
Outdated
Show resolved
Hide resolved
...java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java
Outdated
Show resolved
Hide resolved
// 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 think this is correct, but this is in an area where a lot of feeds get things wrong so this validation might cause issues but I'm not sure if I'm against this or not.
...java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java
Show resolved
Hide resolved
...va/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java
Show resolved
Hide resolved
Thank you very much @t2gran for your help, now the Ratio class is more clean and I like it. |
...ication/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java
Outdated
Show resolved
Hide resolved
...ication/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/transit/model/basic/Distance.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/transit/model/basic/Distance.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/transit/model/basic/Distance.java
Outdated
Show resolved
Hide resolved
...ication/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java
Outdated
Show resolved
Hide resolved
...ication/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java
Outdated
Show resolved
Hide resolved
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.
Just a few naming conventions and visibility. This is very close to being merged.
Co-authored-by: Leonard Ehrenfried <[email protected]>
application/src/main/java/org/opentripplanner/transit/model/basic/Distance.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/transit/model/basic/Distance.java
Outdated
Show resolved
Hide resolved
@optionsome @t2gran Did we decide that we will live with the consequences of GBFS feeds ignoring the spec by not setting ranged_meters? |
Are you talking about current_range_meters? I left the check there, so now if a vehicle is not compliant by not having the range set when it's required it will be ignored. I understood that we want to enforce this from this message. |
I would like to enforce it but @t2gran said he wants to find out if that is ok for Entur. |
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