Merge pull request #112 from OneBusAway/trips-for-route

Feat: Add Trips for Route EndPoint

Author: aaronbrethorst

gtfsdb/db.go

@@ -595,9 +595,13 @@ SELECT
     r.long_name as route_long_name
 FROM
     stop_times st
-    JOIN trips t ON st.trip_id = t.id
-    JOIN routes r ON t.route_id = r.id
+        JOIN trips t ON st.trip_id = t.id
+        JOIN routes r ON t.route_id = r.id
 WHERE
     st.stop_id = ?
 ORDER BY
-    st.arrival_time LIMIT 50
+    st.arrival_time LIMIT 50;
+-- name: GetTripsByServiceID :many
+SELECT *
+FROM trips
+WHERE service_id IN (sqlc.slice('service_ids'));

gtfsdb/query.sql

@@ -39,3 +39,11 @@ func NewTripReference(id, routeID, serviceID, headSign, shortName string, direct
 		TripShortName:  shortName,
 	}
 }
+
+type TripsSchedule struct {
+	Frequency      *int64     `json:"frequency"`
+	NextTripId     string     `json:"nextTripId"`
+	PreviousTripId string     `json:"previousTripId"`
+	StopTimes      []StopTime `json:"stopTimes"`
+	TimeZone       string     `json:"timeZone"`
+}

gtfsdb/query.sql.go

@@ -12,17 +12,11 @@ type TripsForLocationData struct {
 }
 
 type TripsForLocationListEntry struct {
-	Frequency    *int64                    `json:"frequency"`
-	Schedule     *TripsForLocationSchedule `json:"schedule,omitempty"`
-	ServiceDate  int64                     `json:"serviceDate"`
-	SituationIds []string                  `json:"situationIds"`
-	TripId       string                    `json:"tripId"`
+	Frequency    *int64         `json:"frequency"`
+	Schedule     *TripsSchedule `json:"schedule,omitempty"`
+	ServiceDate  int64          `json:"serviceDate"`
+	SituationIds []string       `json:"situationIds"`
+	TripId       string         `json:"tripId"`
 }
 
-type TripsForLocationSchedule struct {
-	Frequency      *int64     `json:"frequency"`
-	NextTripId     string     `json:"nextTripId"`
-	PreviousTripId string     `json:"previousTripId"`
-	StopTimes      []StopTime `json:"stopTimes"`
-	TimeZone       string     `json:"timeZone"`
-}
+func (e TripsForLocationListEntry) GetTripId() string { return e.TripId }

internal/models/trip.go

@@ -0,0 +1,23 @@
+package models
+
+type TripsForRouteResponse struct {
+	Code        int64             `json:"code"`
+	CurrentTime int64             `json:"currentTime"`
+	Data        TripsForRouteData `json:"data"`
+}
+
+type TripsForRouteData struct {
+	LimitExceeded bool                     `json:"limitExceeded"`
+	List          []TripsForRouteListEntry `json:"list"`
+}
+
+type TripsForRouteListEntry struct {
+	Frequency    *int64                    `json:"frequency"`
+	Schedule     *TripsSchedule            `json:"schedule,omitempty"`
+	Status       *TripStatusForTripDetails `json:"status,omitempty"`
+	ServiceDate  int64                     `json:"serviceDate"`
+	SituationIds []string                  `json:"situationIds"`
+	TripId       string                    `json:"tripId"`
+}
+
+func (e TripsForRouteListEntry) GetTripId() string { return e.TripId }

internal/models/trips_for_location.go

@@ -71,6 +71,7 @@ func (api *RestAPI) SetRoutes(mux *http.ServeMux) {
 	mux.Handle("GET /api/where/trip-for-vehicle/{id}", rateLimitAndValidateAPIKey(api, api.tripForVehicleHandler))
 	mux.Handle("GET /api/where/trips-for-location.json", rateLimitAndValidateAPIKey(api, api.tripsForLocationHandler))
 	mux.Handle("GET /api/where/arrival-and-departure-for-stop/{id}", rateLimitAndValidateAPIKey(api, api.arrivalAndDepartureForStopHandler))
+	mux.Handle("GET /api/where/trips-for-route/{id}", rateLimitAndValidateAPIKey(api, api.tripsForRouteHandler))
 }
 
 // SetupAPIRoutes creates and configures the API router with all middleware applied globally