Skip to content
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

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

Conversation

JustCris654
Copy link
Contributor

@JustCris654 JustCris654 commented Nov 22, 2024

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.

  • Graphql integration test have been modified to test this fields
  • I tested the query with the graphiql frontend
  • Do all tests
    pass the continuous integration service
    ? Yes

Documentation

  • I wrote the proper doc comments in the graphql schema

@JustCris654 JustCris654 changed the title Rental vehicle new gbfs fields Add currentFuelPercent and currentRangeMeters to RentalVehichle in the GTFS GraphQL API Nov 22, 2024
Copy link

codecov bot commented Nov 22, 2024

Codecov Report

Attention: Patch coverage is 57.69231% with 22 lines in your changes missing coverage. Please review.

Project coverage is 69.84%. Comparing base (5f9b448) to head (284133a).

Files with missing lines Patch % Lines
...ental/datasources/GbfsFreeVehicleStatusMapper.java 52.17% 10 Missing and 1 partial ⚠️
.../opentripplanner/transit/model/basic/Distance.java 40.00% 3 Missing and 3 partials ⚠️
...org/opentripplanner/transit/model/basic/Ratio.java 60.00% 4 Missing ⚠️
.../apis/transmodel/model/stop/RentalVehicleType.java 0.00% 1 Missing ⚠️
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.
📢 Have feedback on the report? Share it here.

@JustCris654 JustCris654 marked this pull request as ready for review November 22, 2024 16:40
@JustCris654 JustCris654 requested a review from a team as a code owner November 22, 2024 16:40
@JustCris654 JustCris654 marked this pull request as draft November 26, 2024 06:40
@JustCris654 JustCris654 force-pushed the rentalVehicle_new_gbfs_fields branch from 2eef86c to 00a1e4b Compare November 27, 2024 11:54
@JustCris654 JustCris654 marked this pull request as ready for review December 2, 2024 11:13
@optionsome
Copy link
Member

Does the library we use validate that the fuel percent is between 0 and 1 or should we do it?

@JustCris654
Copy link
Contributor Author

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).
It returns an error like this:

{
  "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 RatioScalarTest.java has this

    var ratio = (Double) GraphQLScalars.RATIO_SCALAR.getCoercing().parseValue(HALF);

to parse a value.

@optionsome
Copy link
Member

The value is not checked when received in the gbfs mapper, do we need to check it also there?

I would prefer to log some warning and ignore the value in the mapper instead of letting it be cause issues in the APIs.

@optionsome
Copy link
Member

@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)?

@testower
Copy link
Contributor

testower commented Dec 9, 2024

@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.

@optionsome
Copy link
Member

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?

@testower
Copy link
Contributor

testower commented Dec 9, 2024

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.

@testower
Copy link
Contributor

testower commented Dec 9, 2024

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.

@leonardehrenfried
Copy link
Member

You need to resolve merge conflicts.

@JustCris654 JustCris654 force-pushed the rentalVehicle_new_gbfs_fields branch from 376dae0 to 086effd Compare December 17, 2024 13:22
@JustCris654 JustCris654 force-pushed the rentalVehicle_new_gbfs_fields branch from b52ebca to 284133a Compare December 17, 2024 13:48
// if the propulsion type has an engine current_range_meters is required
if (
vehicle.getVehicleTypeId() != null &&
vehicleTypes.get(vehicle.getVehicleTypeId()) != null &&
Copy link
Contributor Author

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants