diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-08-11 22:52:06 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2021-08-11 22:52:06 +0200 |
| commit | 62a480d81d5e4bdb66594b0aef2b82b0e8ee11a3 (patch) | |
| tree | 22527acd45ff5b49c05d1b13e19e8c29550fabfd | |
| parent | f918c9cbd0ae6e523f8f4e0956a61b3f083f2b91 (diff) | |
http: Bind v2 path without trailing slash
| -rw-r--r-- | http/http.go | 1 | ||||
| -rw-r--r-- | http/http_test.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/http/http.go b/http/http.go index b47d755..0af0146 100644 --- a/http/http.go +++ b/http/http.go @@ -321,6 +321,7 @@ func (s *Server) Handler() http.Handler { mux.Handle("/api/v1/busstops/", appHandler(s.BusStopHandler)) mux.Handle("/api/v1/departures", appHandler(s.DeparturesHandler)) mux.Handle("/api/v1/departures/", appHandler(s.DepartureHandler)) + mux.Handle("/api/v2/departures", appHandler(s.DepartureHandlerV2)) mux.Handle("/api/v2/departures/", appHandler(s.DepartureHandlerV2)) mux.Handle("/", appHandler(s.DefaultHandler)) return requestFilter(mux, s.CORS) diff --git a/http/http_test.go b/http/http_test.go index 7df36ea..ed7486b 100644 --- a/http/http_test.go +++ b/http/http_test.go @@ -94,6 +94,7 @@ func TestAPI(t *testing.T) { {"/api/v1/departures/42", `{"status":404,"message":"Unknown bus stop"}`, 404}, {"/api/v1/departures/16011376", fmt.Sprintf(`{"url":"%s/api/v1/departures/16011376","isGoingTowardsCentrum":true,"departures":[{"line":"6","registeredDepartureTime":"2015-02-26T18:38:00.000","scheduledDepartureTime":"2015-02-26T18:01:00.000","destination":"Munkegata M5","isRealtimeData":true}]}`, httpSrv.URL), 200}, // Show specific departure (v2) + {"/api/v2/departures", `{"status":400,"message":"Invalid stop ID. Use https://stoppested.entur.org/ to find stop IDs."}`, 400}, {"/api/v2/departures/", `{"status":400,"message":"Invalid stop ID. Use https://stoppested.entur.org/ to find stop IDs."}`, 400}, {"/api/v2/departures/42098", fmt.Sprintf(`{"url":"%s/api/v2/departures/42098","isGoingTowardsCentrum":false,"departures":[{"line":"21","scheduledDepartureTime":"2021-08-11T21:19:00.000","destination":"Pirbadet via sentrum","isRealtimeData":false}]}`, httpSrv.URL), 200}, } |