Merge pull request #110 from OneBusAway/test/shape-endpoint-verification-102

refactor: add explicit check for agency existence before processing shape requests

Author: aaronbrethorst

internal/restapi/shapes_handler.go

@@ -1,23 +1,32 @@
 package restapi
 
 import (
+	"net/http"
+	"strings"
+
 	"github.com/twpayne/go-polyline"
 	"maglev.onebusaway.org/gtfsdb"
 	"maglev.onebusaway.org/internal/models"
 	"maglev.onebusaway.org/internal/utils"
-	"net/http"
-	"strings"
 )
 
 func (api *RestAPI) shapesHandler(w http.ResponseWriter, r *http.Request) {
-	_, shapeID, err := utils.ExtractAgencyIDAndCodeID(utils.ExtractIDFromParams(r))
+	agencyID, shapeID, err := utils.ExtractAgencyIDAndCodeID(utils.ExtractIDFromParams(r))
 
 	if err != nil {
 		api.serverErrorResponse(w, r, err)
 		return
 	}
 
 	ctx := r.Context()
+
+	_, err = api.GtfsManager.GtfsDB.Queries.GetAgency(ctx, agencyID)
+
+	if err != nil {
+		api.sendNotFound(w, r)
+		return
+	}
+
 	shapes, err := api.GtfsManager.GtfsDB.Queries.GetShapeByID(ctx, shapeID)
 
 	if err != nil {

internal/restapi/shapes_handler_test.go

@@ -18,7 +18,8 @@ func TestShapesHandlerReturnsShapeWhenItExists(t *testing.T) {
 	require.NotEmpty(t, shapes)
 
 	shapeID := shapes[0].ShapeID
-	resp, model := serveApiAndRetrieveEndpoint(t, api, "/api/where/shape/raba_"+shapeID+".json?key=TEST")
+	agencyID := api.GtfsManager.GetAgencies()[0].Id
+	resp, model := serveApiAndRetrieveEndpoint(t, api, "/api/where/shape/"+agencyID+"_"+shapeID+".json?key=TEST")
 
 	assert.Equal(t, http.StatusOK, resp.StatusCode)
 	assert.Equal(t, http.StatusOK, model.Code)