From 7d68f93ecd460480782218c1c4e916bf6dfebd17 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Fri, 5 Jul 2019 14:08:24 +0300
Subject: [PATCH] Adds DOI variable to DMP models.

---
 .../src/main/java/eu/eudat/data/entities/DMP.java   | 13 ++++++++++++-
 .../eudat/models/data/dmp/DataManagementPlan.java   |  9 +++++++++
 .../DataManagementPlanOverviewModel.java            |  9 +++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java
index 091e87205..b50e53f48 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java
@@ -167,6 +167,9 @@ public class DMP implements DataEntity<DMP, UUID> {
     @Convert(converter = DateToUTCConverter.class)
     private Date publishedAt;
 
+    @Column(name = "\"DOI\"")
+    private String doi;
+
 
     public String getDescription() {
         return description;
@@ -315,7 +318,14 @@ public class DMP implements DataEntity<DMP, UUID> {
         this.publishedAt = publishedAt;
     }
 
-    @Override
+	public String getDoi() {
+		return doi;
+	}
+	public void setDoi(String doi) {
+		this.doi = doi;
+	}
+
+	@Override
     public void update(DMP entity) {
         this.associatedDmps = entity.associatedDmps;
         this.label = entity.getLabel();
@@ -333,6 +343,7 @@ public class DMP implements DataEntity<DMP, UUID> {
         if (entity.getStatus().equals(DMPStatus.FINALISED.getValue())) this.setFinalizedAt(new Date());
         if (entity.isPublic) this.setPublishedAt(new Date());
         if (entity.getUsers() != null) this.users = entity.getUsers();
+        if (entity.getDoi() != null && entity.getDoi().trim().isEmpty()) this.doi = entity.doi;
     }
 
     @Override
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 aa749aa85..144133fdf 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
@@ -41,6 +41,7 @@ public class DataManagementPlan implements DataModel<DMP, DataManagementPlan> {
     private List<DynamicFieldWithValue> dynamicFields;
     private Map<String, Object> properties;
     private List<UserInfoListingModel> users;
+    private String doi;
 
     public UUID getId() {
         return id;
@@ -189,6 +190,13 @@ public class DataManagementPlan implements DataModel<DMP, DataManagementPlan> {
         this.users = users;
     }
 
+    public String getDoi() {
+        return doi;
+    }
+    public void setDoi(String doi) {
+        this.doi = doi;
+    }
+
     @Override
     public DataManagementPlan fromDataModel(DMP entity) {
         this.id = entity.getId();
@@ -228,6 +236,7 @@ public class DataManagementPlan implements DataModel<DMP, DataManagementPlan> {
         this.status = entity.getStatus();
         this.associatedUsers = entity.getUsers().stream().map(item -> new UserListingModel().fromDataModel(item.getUser())).collect(Collectors.toList());
         this.users = entity.getUsers().stream().map(item -> new UserInfoListingModel().fromDataModel(item)).collect(Collectors.toList());
+        this.doi = entity.getDoi();
         return this;
     }
 
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 2c27b785f..2bde51cd6 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
@@ -41,6 +41,7 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
     private String description;
     private boolean isPublic;
     private Date publishedAt;
+    private String doi;
 
 
     public String getId() {
@@ -169,6 +170,13 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
         this.publishedAt = publishedAt;
     }
 
+    public String getDoi() {
+        return doi;
+    }
+    public void setDoi(String doi) {
+        this.doi = doi;
+    }
+
     @Override
     public DataManagementPlanOverviewModel fromDataModel(DMP entity) {
         this.id = entity.getId().toString();
@@ -201,6 +209,7 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
         }
         this.isPublic = entity.isPublic();
         this.publishedAt = entity.getPublishedAt();
+        this.doi = entity.getDoi();
 
         return this;
     }