Fix stop time fetching in added or replacement trips #6245
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
miklcct
force-pushed
the
fix-departureArrivalStopTime-npe
branch
from
36ef65d to
ed3bb9b
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev-2.x #6245 +/- ##
=============================================
+ Coverage 69.85% 69.94% +0.09%
- Complexity 17920 17949 +29
=============================================
Files 2035 2034 -1
Lines 76495 76493 -2
Branches 7824 7826 +2
=============================================
+ Hits 53433 53505 +72
+ Misses 20325 20239 -86
- Partials 2737 2749 +12 ☔ View full report in Codecov by Sentry. |
miklcct
force-pushed
the
fix-departureArrivalStopTime-npe
branch
3 times, most recently
from
428a549 to
df345c2
Compare
miklcct
force-pushed
the
fix-departureArrivalStopTime-npe
branch
from
df345c2 to
38c3a5a
Compare
It has nothing to do with routing and belongs to the wrong package
better to let error propagate
it can be empty if the trip doesn't run at all
miklcct
force-pushed
the
fix-departureArrivalStopTime-npe
branch
from
39ca3c3 to
d3d283f
Compare
t2gran
reviewed
Nov 19, 2024
application/src/main/java/org/opentripplanner/transit/service/TransitService.java
Show resolved
Hide resolved
t2gran
reviewed
Nov 19, 2024
application/src/main/java/org/opentripplanner/transit/service/TransitService.java
Show resolved
Hide resolved
t2gran
reviewed
Nov 19, 2024
application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
Show resolved
Hide resolved
application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
Outdated
Show resolved
Hide resolved
Comment on lines
+292
to
+302
| public boolean equals(Object o) { | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| TripTimeOnDate that = (TripTimeOnDate) o; | ||
| return ( | ||
| stopIndex == that.stopIndex && | ||
| midnight == that.midnight && | ||
| Objects.equals(tripTimes, that.tripTimes) && | ||
| Objects.equals(tripPattern, that.tripPattern) && | ||
| Objects.equals(serviceDate, that.serviceDate) | ||
| ); | ||
| } |
There was a problem hiding this comment.
What is this used for?
There was a problem hiding this comment.
For testing if they are equal
There was a problem hiding this comment.
In a test or in main code?
|
I am going to wait for #5393 first. |
# Conflicts: # application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java
t2gran
reviewed
Nov 29, 2024
# Conflicts: # application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java # application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/ServiceJourneyType.java # application/src/main/java/org/opentripplanner/routing/TripTimeOnDateHelper.java # application/src/main/java/org/opentripplanner/transit/service/TransitService.java
application/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
Outdated
Show resolved
Hide resolved
application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
Show resolved
Hide resolved
application/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java
Outdated
Show resolved
Hide resolved
|
Please resolve the conflicts. |
# Conflicts: # application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java # application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java # application/src/test/resources/org/opentripplanner/apis/gtfs/expectations/patterns.json
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This fixes problems when reading stop times for added or replacement trips.
The logic of fetching trip times is moved into
TransitService. The list is optional because it can be empty if the trip doesn't run at all on a specified date (in contrast, an empty list would theoretically mean that the trip does run on the date, but it doesn't make any call for the whole journey).Also, the behaviour of invalid date is changed to produce an error instead of returning
nullsilently in the GTFS GraphQL API, sincenullis a valid return value meaning the trip doesn't run.Issue
Fixes #6088
Fixes #6242
Unit tests
Unit tests are added into
TransitServicefor the new methods, for both existing and added trips.GraphQL Integration tests are added for one added trip and one replacement trip. This is the first time real-time updates can be integration tested.
Documentation
None needed