fix dataset routes

src/api/main.go

@@ -179,8 +179,12 @@ func main() {
 		gam.ValidatePotentialGenotypeQueryParameter)
 
 	// --- Dataset
-	e.GET("/datasets/:dataset/summary", variantsMvc.GetDatasetSummary)
-	e.GET("/datasets/:dataset/data-types", variantsMvc.GetDatasetDataTypes)
+	e.GET("/datasets/:dataset/summary", variantsMvc.GetDatasetSummary,
+		// middleware
+		gam.MandateDatasetPathParam)
+	e.GET("/datasets/:dataset/data-types", variantsMvc.GetDatasetDataTypes,
+		// middleware
+		gam.MandateDatasetPathParam)
 
 	// TODO: refactor (deduplicate) --
 	e.GET("/variants/ingestion/run", variantsMvc.VariantsIngest,

src/api/middleware/datasetMiddleware.go

@@ -40,6 +40,22 @@ func MandateDatasetAttribute(next echo.HandlerFunc) echo.HandlerFunc {
 	}
 }
 
+func MandateDatasetPathParam(next echo.HandlerFunc) echo.HandlerFunc {
+	return func(c echo.Context) error {
+		dataset := c.Param("dataset")
+		if !utils.IsValidUUID(dataset) {
+			fmt.Printf("Invalid dataset %s\n", dataset)
+
+			return c.JSON(http.StatusBadRequest, errors.CreateSimpleBadRequest(fmt.Sprintf("invalid dataset %s - please provide a valid uuid", dataset)))
+		}
+
+		gc := c.(*contexts.GohanContext)
+		gc.Dataset = uuid.MustParse(dataset)
+
+		return next(gc)
+	}
+}
+
 /*
 Echo middleware to ensure a `dataset` HTTP query parameter is valid if provided
 */

src/api/mvc/variants/main.go

@@ -453,13 +453,13 @@ func GetAllVariantIngestionRequests(c echo.Context) error {
 }
 
 func GetDatasetSummary(c echo.Context) error {
-	fmt.Printf("[%s] - GetDatasetSummary hit!\n", time.Now())
 
 	gc := c.(*contexts.GohanContext)
 	cfg := gc.Config
 	es := gc.Es7Client
 
 	dataset := gc.Dataset
+	fmt.Printf("[%s] - GetDatasetSummary hit: [%s]!\n", time.Now(), dataset.String())
 
 	// parallelize these two es queries