Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 13 additions & 4 deletions internal/gtfs/gtfs_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"fmt"
"log/slog"
"os"
"sort"
"strings"
"sync"
Expand Down Expand Up @@ -346,17 +345,27 @@ func (manager *Manager) GetVehicleForTrip(tripID string) *gtfs.Vehicle {
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel()

logger := slog.Default().With(slog.String("component", "gtfs_manager"))

requestedTrip, err := manager.GtfsDB.Queries.GetTrip(ctx, tripID)
if err != nil || !requestedTrip.BlockID.Valid {
fmt.Fprintf(os.Stderr, "Could not get block ID for trip %s: %v\n", tripID, err)
if err != nil {
logging.LogError(logger, "could not get trip", err,
slog.String("trip_id", tripID))
return nil
}

if !requestedTrip.BlockID.Valid {
logger.Debug("trip has no block ID, cannot find vehicle by block",
slog.String("trip_id", tripID))
return nil
}

requestedBlockID := requestedTrip.BlockID.String

blockTrips, err := manager.GtfsDB.Queries.GetTripsByBlockID(ctx, requestedTrip.BlockID)
if err != nil {
fmt.Fprintf(os.Stderr, "Could not get trips for block %s: %v\n", requestedBlockID, err)
logging.LogError(logger, "could not get trips for block", err,
slog.String("block_id", requestedBlockID))
return nil
}

Expand Down
Loading