From 326757f2c3b8f23938ea6f5b838c3dad2b746e39 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Fri, 28 Jun 2019 11:25:27 +0300
Subject: [PATCH] Adds "isPublic", "publishedAt" and "finalizedAt" properties
 on DMP overview model.

---
 .../DataManagementPlanOverviewModel.java      | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

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 c79d353bf..2c27b785f 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
@@ -29,6 +29,7 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
     private ProjectOverviewModel project;
     private Date creationTime;
     private Date modifiedTime;
+    private Date finalizedAt;
     private List<Organisation> organisations;
     private int version;
     private int status;
@@ -38,6 +39,8 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
     private List<Researcher> researchers;
     private List<UserInfoListingModel> users;
     private String description;
+    private boolean isPublic;
+    private Date publishedAt;
 
 
     public String getId() {
@@ -82,6 +85,13 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
         this.modifiedTime = modifiedTime;
     }
 
+    public Date getFinalizedAt() {
+        return finalizedAt;
+    }
+    public void setFinalizedAt(Date finalizedAt) {
+        this.finalizedAt = finalizedAt;
+    }
+
     public List<Organisation> getOrganisations() {
         return organisations;
     }
@@ -145,6 +155,20 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
         this.researchers = researchers;
     }
 
+    public boolean getIsPublic() {
+        return isPublic;
+    }
+    public void setIsPublic(boolean aPublic) {
+        isPublic = aPublic;
+    }
+
+    public Date getPublishedAt() {
+        return publishedAt;
+    }
+    public void setPublishedAt(Date publishedAt) {
+        this.publishedAt = publishedAt;
+    }
+
     @Override
     public DataManagementPlanOverviewModel fromDataModel(DMP entity) {
         this.id = entity.getId().toString();
@@ -161,6 +185,7 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
         if (entity.getProfile() != null) this.profile = entity.getProfile().getLabel();
         this.creationTime = entity.getCreated();
         this.modifiedTime = entity.getModified();
+        this.finalizedAt = entity.getFinalizedAt();
         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()) && !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());
@@ -174,6 +199,8 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
                 this.associatedProfiles.add(associatedProfile);
             }
         }
+        this.isPublic = entity.isPublic();
+        this.publishedAt = entity.getPublishedAt();
 
         return this;
     }