From 6a4602a45eff499c3d3640ba2aaa37c17cce4a2d Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Tue, 17 Sep 2019 14:04:41 +0300
Subject: [PATCH] Fixes bug on updating Tags on Dataset Description.

---
 .../main/java/eu/eudat/logic/managers/DatasetManager.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
index 09845b06a..b361cb96a 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
@@ -334,12 +334,15 @@ public class DatasetManager {
             checkDatasetValidation(dataset);
         UserInfo userInfo = apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserInfoBuilder.class).id(principal.getId()).build();
         dataset.setCreator(userInfo);
-        updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel);
+
         createRegistriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao(), dataset);
         createDataRepositoriesIfTheyDontExist(apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao(), dataset);
         createServicesIfTheyDontExist(dataset);
         createExternalDatasetsIfTheyDontExist(dataset);
-        return apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset);
+        Dataset dataset1 = apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(dataset);
+        datasetWizardModel.setId(dataset1.getId());
+        updateTags(apiContext.getOperationsContext().getDatasetRepository(), datasetWizardModel);
+        return dataset1;
     }
 
     private void checkDatasetValidation(Dataset dataset) throws Exception {