From 744942032e5eecbaaddc7af7e2b77895b5af3f50 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Mon, 24 Jun 2019 17:06:54 +0300
Subject: [PATCH] Adds finalizedAt and publicAt dates on DMP models.

---
 .../DataManagementPlanListingModel.java       | 29 +++++++++++++++----
 .../listingmodels/DatasetListingModel.java    | 12 ++++----
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java
index bf50c1ca7..aa64d2b6c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java
@@ -37,7 +37,9 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
     private String description;
     private String projectAbbreviation;
     private String projectId;
-    private Date finalizedDat;
+    private Date finalizedAt;
+    private Boolean isPublic;
+    private Date publishedAt;
 
 
     public String getId() {
@@ -152,13 +154,26 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
         this.projectId = projectId;
     }
 
-    public Date getFinalizedDat() {
-        return finalizedDat;
+    public Date getFinalizedAt() {
+        return finalizedAt;
     }
-    public void setFinalizedDat(Date finalizedDat) {
-        this.finalizedDat = finalizedDat;
+    public void setFinalizedAt(Date finalizedAt) {
+        this.finalizedAt = finalizedAt;
     }
 
+    public Boolean getPublic() {
+        return isPublic;
+    }
+    public void setPublic(Boolean aPublic) {
+        isPublic = aPublic;
+    }
+
+    public Date getPublishedAt() {
+        return publishedAt;
+    }
+    public void setPublishedAt(Date publishedAt) {
+        this.publishedAt = publishedAt;
+    }
 
     @Override
     public DataManagementPlanListingModel fromDataModel(DMP entity) {
@@ -182,7 +197,9 @@ public class DataManagementPlanListingModel implements DataModel<DMP, DataManage
         this.description = entity.getDescription();
         this.projectAbbreviation = entity.getProject().getAbbreviation();
         this.projectId = entity.getProject().getId().toString();
-        this.finalizedDat = entity.getFinalizedDat();
+        this.finalizedAt = entity.getFinalizedAt();
+        this.isPublic = entity.isPublic();
+        this.publishedAt = entity.getPublishedAt();
 
         if (entity.getAssociatedDmps() != null && !entity.getAssociatedDmps().isEmpty()) {
             this.associatedProfiles = new LinkedList<>();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java
index 717c7940e..cbf97251a 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DatasetListingModel.java
@@ -26,7 +26,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
     private String description;
     private String projectAbbreviation;
     private String projectId;
-    private Date finalizedDat;
+    private Date finalizedAt;
 
     public String getId() {
         return id;
@@ -133,11 +133,11 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
         this.projectId = projectId;
     }
 
-    public Date getFinalizedDat() {
-        return finalizedDat;
+    public Date getFinalizedAt() {
+        return finalizedAt;
     }
-    public void setFinalizedDat(Date finalizedDat) {
-        this.finalizedDat = finalizedDat;
+    public void setFinalizedAt(Date finalizedAt) {
+        this.finalizedAt = finalizedAt;
     }
 
     @Override
@@ -157,7 +157,7 @@ public class DatasetListingModel implements DataModel<Dataset, DatasetListingMod
         this.registries = LabelBuilder.getLabel(entity.getRegistries().stream().map(item -> new eu.eudat.models.data.dataset.Registry().fromDataModel(item)).collect(Collectors.toList()));
         this.dataRepositories = LabelBuilder.getLabel(entity.getDatasetDataRepositories().stream().map(item -> new DataRepository().fromDataModel(item.getDataRepository())).collect(Collectors.toList()));
         this.services = LabelBuilder.getLabel(entity.getServices().stream().map(item -> new Service().fromDataModel(item.getService())).collect(Collectors.toList()));
-        this.finalizedDat = entity.getFinalizedDat();
+        this.finalizedAt = entity.getFinalizedAt();
         return this;
     }