Fix/arrival-and-departure-for-stop endpoint

gtfsdb/block_layover_test.go

@@ -48,7 +48,7 @@ func TestBuildBlockLayoverIndex_PopulatesTable(t *testing.T) {
 		SELECT block_id, route_id, service_id, layover_stop_id, next_trip_id
 		FROM block_layover`)
 	require.NoError(t, err)
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 
 	checked := 0
 	for rows.Next() {

gtfsdb/query.sql

@@ -1229,7 +1229,8 @@ FROM (
 -- Optimized queries using SQLite window functions
 
 -- name: GetTargetStopTimeWithTotalStops :one
--- Fetches a specific stop time for a trip+stop, along with the total stop count,
+-- Fetches a specific stop time for a trip+stop, along with the total stop count
+-- and a 0-based trip-relative ordinal (stop_ordinal) that is safe for sparse GTFS stop_sequences.
 SELECT
     st.trip_id,
     st.arrival_time,
@@ -1241,14 +1242,17 @@ SELECT
     st.drop_off_type,
     st.shape_dist_traveled,
     st.timepoint,
+    (SELECT COUNT(*) FROM stop_times st3 WHERE st3.trip_id = @trip_id AND st3.stop_sequence < st.stop_sequence) AS stop_ordinal,
     (SELECT COUNT(*) FROM stop_times st2 WHERE st2.trip_id = @trip_id) AS total_stops
 FROM stop_times st
-WHERE st.trip_id = @trip_id AND st.stop_id = @stop_id
-ORDER BY st.stop_sequence
+WHERE st.trip_id = @trip_id AND st.stop_id = @stop_id AND CAST(@current_time AS INTEGER) IS NOT NULL
+ORDER BY ABS(st.arrival_time - CAST(?3 AS INTEGER)), st.stop_sequence
 LIMIT 1;
 
 -- name: GetTargetStopTimeWithTotalStopsBySequence :one
--- Fetches a specific stop time for a trip+stop+sequence, along with the total stop count,
+-- Fetches a specific stop time for a trip+stop+ordinal, along with the total stop count.
+-- Uses a 0-based trip-relative ordinal (stop_ordinal) for matching instead of raw GTFS stop_sequence.
+-- The ordinal equals the count of stops whose stop_sequence is strictly less than this row's.
 SELECT
     st.trip_id,
     st.arrival_time,
@@ -1260,9 +1264,12 @@ SELECT
     st.drop_off_type,
     st.shape_dist_traveled,
     st.timepoint,
+    (SELECT COUNT(*) FROM stop_times st3 WHERE st3.trip_id = @trip_id AND st3.stop_sequence < st.stop_sequence) AS stop_ordinal,
     (SELECT COUNT(*) FROM stop_times st2 WHERE st2.trip_id = @trip_id) AS total_stops
 FROM stop_times st
-WHERE st.trip_id = @trip_id AND st.stop_id = @stop_id AND st.stop_sequence = @stop_sequence
+WHERE st.trip_id = @trip_id
+  AND st.stop_id = @stop_id
+  AND (SELECT COUNT(*) FROM stop_times st4 WHERE st4.trip_id = @trip_id AND st4.stop_sequence < st.stop_sequence) = CAST(@stop_sequence AS INTEGER)
 LIMIT 1;
 
 -- name: GetBlockTripSequence :one

gtfsdb/stops_rtree.go

@@ -42,7 +42,7 @@ func (q *Queries) GetActiveStopsWithinBounds(ctx context.Context, arg GetActiveS
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 
 	var items []Stop
 	for rows.Next() {
@@ -95,7 +95,7 @@ func (q *Queries) GetStopIDsWithinBounds(ctx context.Context, arg GetStopIDsWith
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 
 	var ids []string
 	for rows.Next() {
@@ -178,7 +178,7 @@ func (q *Queries) GetActiveRoutesWithinBounds(ctx context.Context, arg GetActive
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+	defer func() { _ = rows.Close() }()
 	var items []Route
 	for rows.Next() {
 		var i Route

internal/models/arrival_and_departure.go

@@ -12,7 +12,7 @@ type ArrivalAndDeparture struct {
 	DistanceFromStop           float64     `json:"distanceFromStop"`
 	Frequency                  *Frequency  `json:"frequency"`
 	HistoricalOccupancy        string      `json:"historicalOccupancy"`
-	LastUpdateTime             ModelTime   `json:"lastUpdateTime,omitzero"`
+	LastUpdateTime             ModelTime   `json:"lastUpdateTime"`
 	NumberOfStopsAway          int         `json:"numberOfStopsAway"`
 	OccupancyStatus            string      `json:"occupancyStatus"`
 	Predicted                  bool        `json:"predicted"`

internal/models/current_time_test.go

@@ -35,7 +35,7 @@ func TestCurrentTimeModel(t *testing.T) {
 			timeModel.ReadableTime, unmarshaledModel.ReadableTime)
 	}
 
-	if !unmarshaledModel.Time.Time.Equal(timeModel.Time.Time) {
+	if !unmarshaledModel.Time.Equal(timeModel.Time.Time) {
 		t.Errorf("Expected Time %v, got %v",
 			timeModel.Time, unmarshaledModel.Time)
 	}
@@ -74,7 +74,7 @@ func TestCurrentTimeData(t *testing.T) {
 			timeData.Entry.ReadableTime, unmarshaledData.Entry.ReadableTime)
 	}
 
-	if !unmarshaledData.Entry.Time.Time.Equal(timeData.Entry.Time.Time) {
+	if !unmarshaledData.Entry.Time.Equal(timeData.Entry.Time.Time) {
 		t.Errorf("Expected Entry.Time %v, got %v",
 			timeData.Entry.Time, unmarshaledData.Entry.Time)
 	}

internal/models/trip_details.go

@@ -74,6 +74,7 @@ func (ts *TripStatus) SetPredicted(predicted bool) {
 // SituationIDs and VehicleFeatures default to empty slices (never null in JSON).
 func NewTripStatus() *TripStatus {
 	status := &TripStatus{
+		BlockTripSequence: -1,
 		OccupancyCapacity: -1,
 		OccupancyCount:    -1,
 		SituationIDs:      []string{},

internal/models/trip_details_test.go

@@ -55,7 +55,7 @@ func TestNewEmptyTripDetails(t *testing.T) {
 	tripDetails := NewEmptyTripDetails()
 
 	assert.Equal(t, "", tripDetails.TripID)
-	assert.True(t, tripDetails.ServiceDate.Time.IsZero())
+	assert.True(t, tripDetails.ServiceDate.IsZero())
 	assert.Nil(t, tripDetails.Frequency)
 	assert.Nil(t, tripDetails.Status)
 	assert.Nil(t, tripDetails.Schedule)