From f9292ee839cda1f6432719fa0771469f125b4548 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Wed, 19 Jun 2019 17:16:05 +0300
Subject: [PATCH] Adds "Canceled" Status on Datasets and fixes bug with Dataset
 isPublic leftovers.

---
 .../data/src/main/java/eu/eudat/data/entities/Dataset.java    | 4 +++-
 .../eu/eudat/logic/managers/DataManagementPlanManager.java    | 3 +--
 .../src/main/java/eu/eudat/logic/managers/DatasetManager.java | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java
index dcb138903..c9638ee6d 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java
@@ -47,7 +47,7 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 	private static final Set<String> hints = new HashSet<>(Arrays.asList("datasetListingModel"));
 
 	public enum Status {
-		SAVED((short) 0), FINALISED((short) 1), DELETED((short) 99);
+		SAVED((short) 0), FINALISED((short) 1), CANCELED((short) 2), DELETED((short) 99),;
 
 		private short value;
 
@@ -65,6 +65,8 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 					return SAVED;
 				case 1:
 					return FINALISED;
+				case 2:
+					return CANCELED;
 				case 99:
 					return DELETED;
 				default:
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 f8e252804..b031a2662 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
@@ -100,9 +100,8 @@ 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.getStatus().equals(Dataset.Status.DELETED.getValue()) && !dataset.getStatus().equals(Dataset.Status.CANCELED.getValue())).collect(Collectors.toList()).stream()
                                         .filter(dataset -> dataset.getDmp().getUsers().stream().filter(userDMP -> userDMP.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())).findFirst().get().getUser().getId().equals(principalID)
-                                        || dataset.isPublic()
                                         || dataset.getDmp().getUsers().stream()
                                         .filter(x -> x.getUser().getId().equals(principalID))
                                         .collect(Collectors.toList()).size() > 0)
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 b6f522f84..02e4f6123 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
@@ -501,7 +501,6 @@ public class DatasetManager {
         dmp.setId(UUID.fromString(dmpId));
         entity.setDmp(dmp);
         entity.setStatus((short) 0);
-        entity.setPublic(false);
         entity.setCreated(new Date());
         entity.setModified(new Date());
         DatasetProfile profile = new DatasetProfile();