From 590d85b355cef7fcb004378e2f17bc8b3ea79926 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Fri, 21 Jun 2019 13:58:20 +0300
Subject: [PATCH] Fixes DMP models to not expose Datasets with "Canceled"
 status.

---
 .../models/data/dmp/DataManagementPlan.java      |  2 +-
 .../DataManagementPlanOverviewModel.java         | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java
index 699ad88af..aa749aa85 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java
@@ -221,7 +221,7 @@ public class DataManagementPlan implements DataModel<DMP, DataManagementPlan> {
                 this.profiles.add(associatedProfile);
             }
         }
-        this.datasets = entity.getDataset().stream().filter(dataset -> !dataset.getStatus().equals(Dataset.Status.DELETED.getValue())).map(x-> new DatasetListingModel().fromDataModel(x)).collect(Collectors.toList());
+        this.datasets = entity.getDataset().stream().filter(dataset -> !dataset.getStatus().equals(Dataset.Status.DELETED.getValue()) && !dataset.getStatus().equals(Dataset.Status.CANCELED.getValue())).map(x-> new DatasetListingModel().fromDataModel(x)).collect(Collectors.toList());
         this.modified = entity.getModified();
         this.created = entity.getCreated();
         this.description = entity.getDescription();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java
index 0d1da5a85..c79d353bf 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java
@@ -162,7 +162,7 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
         this.creationTime = entity.getCreated();
         this.modifiedTime = entity.getModified();
         this.organisations = entity.getOrganisations().stream().map(item -> new Organisation().fromDataModel(item)).collect(Collectors.toList());
-        this.datasets = entity.getDataset().stream().filter(dataset -> !dataset.getStatus().equals(Dataset.Status.DELETED.getValue())).map(x-> new DatasetOverviewModel().fromDataModel(x)).collect(Collectors.toList());
+        this.datasets = entity.getDataset().stream().filter(dataset -> !dataset.getStatus().equals(Dataset.Status.DELETED.getValue()) && !dataset.getStatus().equals(Dataset.Status.CANCELED.getValue())).map(x-> new DatasetOverviewModel().fromDataModel(x)).collect(Collectors.toList());
         this.users = entity.getUsers().stream().map(x -> new UserInfoListingModel().fromDataModel(x)).collect(Collectors.toList());
         this.description = entity.getDescription();
         this.researchers = entity.getResearchers().stream().map(item -> new Researcher().fromDataModel(item)).collect(Collectors.toList());
@@ -174,20 +174,6 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
                 this.associatedProfiles.add(associatedProfile);
             }
         }
-        /*if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
-            Document viewStyleDoc = XmlBuilder.fromXml(entity.getAssociatedDmps());
-            Element item = (Element) viewStyleDoc.getElementsByTagName("profiles").item(0);
-            this.associatedProfiles = new LinkedList<>();
-            if (item != null) {
-                NodeList associatedProfilesElement = item.getChildNodes();
-                for (int temp = 0; temp < associatedProfilesElement.getLength(); temp++) {
-                    Node associatedProfileElement = associatedProfilesElement.item(temp);
-                    if (associatedProfileElement.getNodeType() == Node.ELEMENT_NODE) {
-                        this.associatedProfiles.add(new AssociatedProfile().fromXml((Element) associatedProfileElement));
-                    }
-                }
-            }
-        }*/
 
         return this;
     }