Merge branch 'develop' into release/1.27.0

README.md

@@ -90,4 +90,4 @@ See [CONTRIBUTING](CONTRIBUTING.md) for details.
 
 Copyright © 2016-2021, Office for National Statistics (https://www.ons.gov.uk)
 
-Released under MIT license, see [LICENSE](LICENSE.md) for details
+Released under MIT license, see [LICENSE](LICENSE.md) for details.

api/api.go

@@ -51,46 +51,44 @@ type AuthHandler interface {
 
 // DatasetAPI manages importing filters against a dataset
 type DatasetAPI struct {
-	Router                    *mux.Router
-	dataStore                 store.DataStore
-	urlBuilder                *url.Builder
-	host                      string
-	downloadServiceToken      string
-	EnablePrePublishView      bool
-	downloadGenerator         DownloadsGenerator
-	enablePrivateEndpoints    bool
-	enableDetachDataset       bool
-	enableObservationEndpoint bool
-	datasetPermissions        AuthHandler
-	permissions               AuthHandler
-	instancePublishedChecker  *instance.PublishCheck
-	versionPublishedChecker   *PublishCheck
-	defaultLimit              int
-	defaultOffset             int
-	maxLimit                  int
+	Router                   *mux.Router
+	dataStore                store.DataStore
+	urlBuilder               *url.Builder
+	host                     string
+	downloadServiceToken     string
+	EnablePrePublishView     bool
+	downloadGenerator        DownloadsGenerator
+	enablePrivateEndpoints   bool
+	enableDetachDataset      bool
+	datasetPermissions       AuthHandler
+	permissions              AuthHandler
+	instancePublishedChecker *instance.PublishCheck
+	versionPublishedChecker  *PublishCheck
+	defaultLimit             int
+	defaultOffset            int
+	maxLimit                 int
 }
 
 // Setup creates a new Dataset API instance and register the API routes based on the application configuration.
 func Setup(ctx context.Context, cfg *config.Configuration, router *mux.Router, dataStore store.DataStore, urlBuilder *url.Builder, downloadGenerator DownloadsGenerator, datasetPermissions AuthHandler, permissions AuthHandler) *DatasetAPI {
 
 	api := &DatasetAPI{
-		dataStore:                 dataStore,
-		host:                      cfg.DatasetAPIURL,
-		downloadServiceToken:      cfg.DownloadServiceSecretKey,
-		EnablePrePublishView:      cfg.EnablePrivateEndpoints,
-		Router:                    router,
-		urlBuilder:                urlBuilder,
-		downloadGenerator:         downloadGenerator,
-		enablePrivateEndpoints:    cfg.EnablePrivateEndpoints,
-		enableDetachDataset:       cfg.EnableDetachDataset,
-		enableObservationEndpoint: cfg.EnableObservationEndpoint,
-		datasetPermissions:        datasetPermissions,
-		permissions:               permissions,
-		versionPublishedChecker:   nil,
-		instancePublishedChecker:  nil,
-		defaultLimit:              cfg.DefaultLimit,
-		defaultOffset:             cfg.DefaultOffset,
-		maxLimit:                  cfg.DefaultMaxLimit,
+		dataStore:                dataStore,
+		host:                     cfg.DatasetAPIURL,
+		downloadServiceToken:     cfg.DownloadServiceSecretKey,
+		EnablePrePublishView:     cfg.EnablePrivateEndpoints,
+		Router:                   router,
+		urlBuilder:               urlBuilder,
+		downloadGenerator:        downloadGenerator,
+		enablePrivateEndpoints:   cfg.EnablePrivateEndpoints,
+		enableDetachDataset:      cfg.EnableDetachDataset,
+		datasetPermissions:       datasetPermissions,
+		permissions:              permissions,
+		versionPublishedChecker:  nil,
+		instancePublishedChecker: nil,
+		defaultLimit:             cfg.DefaultLimit,
+		defaultOffset:            cfg.DefaultOffset,
+		maxLimit:                 cfg.DefaultMaxLimit,
 	}
 
 	if api.enablePrivateEndpoints {
@@ -138,10 +136,6 @@ func (api *DatasetAPI) enablePublicEndpoints(ctx context.Context) {
 	api.get("/datasets/{dataset_id}/editions/{edition}/versions/{version}/dimensions", api.getDimensions)
 	api.get("/datasets/{dataset_id}/editions/{edition}/versions/{version}/dimensions/{dimension}/options", api.getDimensionOptions)
 
-	if api.enableObservationEndpoint {
-		log.Event(ctx, "enabling observations endpoint", log.INFO)
-		api.get("/datasets/{dataset_id}/editions/{edition}/versions/{version}/observations", api.getObservations)
-	}
 }
 
 // enablePrivateDatasetEndpoints register the datasets endpoints with the appropriate authentication and authorisation
@@ -187,15 +181,6 @@ func (api *DatasetAPI) enablePrivateDatasetEndpoints(ctx context.Context) {
 			api.getMetadata),
 	)
 
-	if api.enableObservationEndpoint {
-		log.Event(ctx, "enabling observations endpoint", log.INFO)
-		api.get(
-			"/datasets/{dataset_id}/editions/{edition}/versions/{version}/observations",
-			api.isAuthorisedForDatasets(readPermission,
-				api.getObservations),
-		)
-	}
-
 	api.get(
 		"/datasets/{dataset_id}/editions/{edition}/versions/{version}/dimensions",
 		api.isAuthorisedForDatasets(readPermission,

api/dataset.go

@@ -327,6 +327,14 @@ func (api *DatasetAPI) putDataset(w http.ResponseWriter, r *http.Request) {
 				return err
 			}
 		} else {
+			if err := models.CleanDataset(dataset); err != nil {
+				log.Event(ctx, "could not clean dataset", log.ERROR, log.Error(err))
+				return nil
+			}
+			if err := models.ValidateDataset(dataset); err != nil {
+				log.Event(ctx, "failed validation check to update dataset", log.ERROR, log.Error(err))
+				return nil
+			}
 			if err := api.dataStore.Backend.UpdateDataset(ctx, datasetID, dataset, currentDataset.Next.State); err != nil {
 				log.Event(ctx, "putDataset endpoint: failed to update dataset resource", log.ERROR, log.Error(err), data)
 				return err