From db0cee542cb32a8c806eaf6c09ec69d126fbcbb6 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Tue, 8 Sep 2020 10:53:10 +0300 Subject: [PATCH] When creating or updating a DMP with datasets, check the datasets template validity from the datasets of the request and not from the ones in DB --- .../eu/eudat/logic/managers/DataManagementPlanManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java index 254d941e9..5ae417d25 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java @@ -473,8 +473,7 @@ public class DataManagementPlanManager { if (dmp1.getModified().getTime() != dataManagementPlan.getModified().getTime()) { throw new Exception("Another user have already edit that DMP."); } - List datasetList = new ArrayList<>(dmp1.getDataset()); - for (Dataset dataset : datasetList) { + for (DatasetWizardModel dataset : dataManagementPlan.getDatasets()) { if (dataManagementPlan.getProfiles().stream().filter(associatedProfile -> dataset.getProfile().getId().equals(associatedProfile.getId())).findAny().orElse(null) == null) throw new Exception("Dataset Template for Dataset Description is missing from the DMP."); }