Release/1.118.0

api/api.go

@@ -80,7 +80,6 @@ type DatasetAPI struct {
 	instancePublishedChecker  *instance.PublishCheck
 	versionPublishedChecker   *PublishCheck
 	MaxRequestOptions         int
-	defaultLimit              int
 	smDatasetAPI              *application.StateMachineDatasetAPI
 	auditService              application.AuditService
 	staticDatasetService      application.StaticDatasetService
@@ -108,7 +107,6 @@ func Setup(ctx context.Context, cfg *config.Configuration, router *mux.Router, d
 		versionPublishedChecker:   nil,
 		instancePublishedChecker:  nil,
 		MaxRequestOptions:         cfg.MaxRequestOptions,
-		defaultLimit:              cfg.DefaultLimit,
 		smDatasetAPI:              smDatasetAPI,
 		permissionsChecker:        permissionsChecker,
 		auditService:              auditService,

api/dataset.go

@@ -44,10 +44,11 @@ var (
 
 	// errors that should return a 409 status
 	datasetsConflict = map[error]bool{
-		errs.ErrCannotChangeIDForPublishedDataset: true,
-		errs.ErrAddDatasetAlreadyExists:           true,
-		errs.ErrAddDatasetTitleAlreadyExists:      true,
-		errs.ErrPublishedDatasetTopicChange:       true,
+		errs.ErrCannotChangeIDForPublishedDataset:       true,
+		errs.ErrCannotChangeDatasetIDForMigratedDataset: true,
+		errs.ErrAddDatasetAlreadyExists:                 true,
+		errs.ErrAddDatasetTitleAlreadyExists:            true,
+		errs.ErrPublishedDatasetTopicChange:             true,
 	}
 )
 
@@ -225,6 +226,7 @@ func (api *DatasetAPI) getDataset(w http.ResponseWriter, r *http.Request) {
 				log.Info(ctx, "getDataset endpoint: get dataset with auth", logData)
 			} else {
 				dataset.Current.PreviousSeriesId = nil
+				dataset.Current.IsMigration = nil
 				datasetResponse, err = utils.RewriteDatasetWithoutAuth(ctx, dataset, datasetLinksBuilder)
 				if err != nil {
 					log.Error(ctx, "getDataset endpoint: failed to rewrite dataset without authorisation", err, logData)
@@ -248,6 +250,7 @@ func (api *DatasetAPI) getDataset(w http.ResponseWriter, r *http.Request) {
 				}
 
 				dataset.Current.PreviousSeriesId = nil
+				dataset.Current.IsMigration = nil
 
 				datasetResponse = dataset.Current
 			} else {
@@ -612,6 +615,11 @@ func (api *DatasetAPI) putDataset(w http.ResponseWriter, r *http.Request) {
 				return nil, errs.ErrCannotChangeIDForPublishedDataset
 			}
 
+			if isIDChanged && currentDataset.Next.IsMigration != nil && *currentDataset.Next.IsMigration {
+				log.Error(ctx, "putDataset endpoint: cannot change dataset ID for migrated dataset", errs.ErrCannotChangeDatasetIDForMigratedDataset, data)
+				return nil, errs.ErrCannotChangeDatasetIDForMigratedDataset
+			}
+
 			if !isPublished && isIDChanged {
 				err := api.dataStore.Backend.CheckDatasetExists(ctx, dataset.ID, "")
 				if err == nil {
@@ -690,6 +698,11 @@ func (api *DatasetAPI) putDataset(w http.ResponseWriter, r *http.Request) {
 		} else if dataset.Type == models.Static.String() && dataset.ID != currentDataset.ID {
 			dataset.PreviousSeriesId = append([]string{}, currentDataset.Next.PreviousSeriesId...)
 			dataset.PreviousSeriesId = append(dataset.PreviousSeriesId, currentDataset.ID)
+
+			if dataset.IsMigration == nil {
+				dataset.IsMigration = currentDataset.Next.IsMigration
+			}
+
 			renamedDatasetUpdate := &models.DatasetUpdate{
 				ID:   dataset.ID,
 				Next: dataset,
@@ -820,10 +833,7 @@ func (api *DatasetAPI) deleteDataset(w http.ResponseWriter, r *http.Request) {
 
 		// Find any editions/versions associated with the dataset based on the type
 		if currentDataset.Next.Type == models.Static.String() {
-			// Limit is set to DEFAULT_LIMIT (20) to prevent unbounded queries.
-			// If a dataset has more than DEFAULT_LIMIT unpublished editions/versions, only the first DEFAULT_LIMIT will be deleted.
-			// Refactoring is required if more than DEFAULT_LIMIT editions/versions per dataset is a possibility.
-			versionDocs, _, err := api.dataStore.Backend.GetAllStaticVersions(ctx, currentDataset.ID, "", 0, api.defaultLimit)
+			versions, _, err := api.dataStore.Backend.GetVersionsStaticNoLimit(ctx, currentDataset.ID, "")
 			if err != nil {
 				if err == errs.ErrVersionsNotFound {
 					log.Info(ctx, "deleteDataset endpoint: dataset didn't contain any versions, continuing to delete dataset", logData)
@@ -833,9 +843,9 @@ func (api *DatasetAPI) deleteDataset(w http.ResponseWriter, r *http.Request) {
 				}
 			}
 
-			for i := range versionDocs {
-				if versionDocs[i].Distributions != nil {
-					for _, distribution := range *versionDocs[i].Distributions {
+			for i := range versions {
+				if versions[i].Distributions != nil {
+					for _, distribution := range *versions[i].Distributions {
 						logData["distribution_title"] = distribution.Title
 						logData["distribution_download_url"] = distribution.DownloadURL
 
@@ -848,7 +858,7 @@ func (api *DatasetAPI) deleteDataset(w http.ResponseWriter, r *http.Request) {
 					}
 				}
 
-				err := api.dataStore.Backend.DeleteStaticDatasetVersion(ctx, currentDataset.ID, versionDocs[i].Edition, versionDocs[i].Version)
+				err := api.dataStore.Backend.DeleteStaticDatasetVersion(ctx, currentDataset.ID, versions[i].Edition, versions[i].Version)
 				if err != nil {
 					log.Error(ctx, "deleteDataset endpoint: failed to delete version", err, logData)
 					return err
@@ -915,6 +925,7 @@ func mapResults(results []*models.DatasetUpdate) []*models.Dataset {
 		}
 		item.Current.ID = item.ID
 		item.Current.PreviousSeriesId = nil
+		item.Current.IsMigration = nil
 		items = append(items, item.Current)
 	}
 	return items