Skip to content

Fix/schedule for route trip ref ids #758

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

Open
ashnaaseth2325-oss wants to merge 6 commits into
base: main
Choose a base branch
from
+11 −8
Open

Fix/schedule for route trip ref ids #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
90136b9
fix: guard map lookup in buildTripReferences
ashnaaseth2325-oss Mar 18, 2026
ba1dbff
Merge branch 'main' into fix/safe-route-lookup-trip-refs
ashnaaseth2325-oss Mar 20, 2026
d45c792
fix: return stopSequence on block trips DB error
ashnaaseth2325-oss Mar 20, 2026
bde7cb8
fix: use combined IDs for routeId and serviceId in schedule-for-route…
ashnaaseth2325-oss Mar 20, 2026
4c40078
test: clear service-IDs cache before inserting test calendar in Vehic…
ashnaaseth2325-oss Mar 20, 2026
f2b7805
Merge branch 'main' into fix/schedule-for-route-trip-ref-ids
ashnaaseth2325-oss Mar 28, 2026
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
13 changes: 8 additions & 5 deletions internal/restapi/arrivals_and_departures_for_stop_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,12 +1235,11 @@ func TestArrivalsAndDeparturesForStop_VehicleWithNilID(t *testing.T) {
api := createTestApiWithClock(t, mockClock)
defer api.Shutdown()
t.Cleanup(api.GtfsManager.MockResetRealTimeData)
// Clear the service-IDs cache so that the calendar inserted below is visible,
// even if a previous test already cached the result for this date.
api.GtfsManager.MockClearServiceIDsCache()
// Ensure cache is cleared before test runs
api.GtfsManager.MockClearServiceIDsCache()

// Clear the service-IDs cache so the request sees the newly inserted calendar entry
api.GtfsManager.MockClearServiceIDsCache()
// Also clean up after test
t.Cleanup(api.GtfsManager.MockClearServiceIDsCache)

ctx := context.Background()
queries := api.GtfsManager.GtfsDB.Queries
Expand Down Expand Up @@ -1289,6 +1288,10 @@ func TestArrivalsAndDeparturesForStop_VehicleWithNilID(t *testing.T) {
})
require.NoError(t, err)

// Clear the service-IDs cache so the upcoming request sees the newly inserted
// calendar entry rather than a result cached by an earlier test in this package.
api.GtfsManager.MockClearServiceIDsCache()

_, err = queries.CreateTrip(ctx, gtfsdb.CreateTripParams{
ID: tripID,
RouteID: routeID,
Expand Down
2 changes: 1 addition & 1 deletion internal/restapi/block_sequence_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func (api *RestAPI) getBlockSequenceForStopSequence(ctx context.Context, tripID

blockTrips, err := api.GtfsManager.GtfsDB.Queries.GetTripsByBlockID(ctx, blockID)
if err != nil {
return 0
return stopSequence
}

type TripWithDetails struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/restapi/schedule_for_route_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ func (api *RestAPI) scheduleForRouteHandler(w http.ResponseWriter, r *http.Reque
combinedTripID := utils.FormCombinedID(agencyID, t.ID)
tripRef := models.NewTripReference(
combinedTripID,
t.RouteID,
t.ServiceID,
utils.FormCombinedID(agencyID, t.RouteID),
utils.FormCombinedID(agencyID, t.ServiceID),
t.TripHeadsign.String,
t.TripShortName.String,
strconv.FormatInt(t.DirectionID.Int64, 10),
Expand Down
Loading