From 1747e62a58aef2a20391f677fc585c2ebdd4ee0a Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Mon, 13 May 2019 12:20:59 +0300 Subject: [PATCH] Fixes bug on DMP listing backend logic that exposes deleted Datasets. --- .../eudat/logic/managers/DataManagementPlanManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 1bb6677fc..ff2f20ab2 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 @@ -96,10 +96,13 @@ public class DataManagementPlanManager { .selectAsync(item -> { item.setDataset( item.getDataset().stream() + .filter(ds -> !ds.getStatus().equals(Dataset.Status.DELETED.getValue())).collect(Collectors.toList()).stream() .filter(dataset -> dataset.getDmp().getCreator().getId().equals(principalID) - || dataset.isPublic() - || dataset.getDmp().getUsers().stream() - .filter(x -> x.getUser().getId().equals(principalID)).collect(Collectors.toList()).size() > 0).collect(Collectors.toSet())); + || dataset.isPublic() + || dataset.getDmp().getUsers().stream() + .filter(x -> x.getUser().getId().equals(principalID)) + .collect(Collectors.toList()).size() > 0) + .collect(Collectors.toSet())); return new DataManagementPlanListingModel().fromDataModelDatasets(item); }) .whenComplete((resultList, throwable) -> dataTable.setData(resultList));