From df5281eeaab7cf4502f61d3bbf1001a54b68948b Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Thu, 29 Apr 2021 11:28:46 +0300
Subject: [PATCH] Allow to manually add reference

---
 .../eudat/logic/managers/DataManagementPlanManager.java  | 4 +++-
 .../models/data/dmp/DataManagementPlanEditorModel.java   | 6 +++---
 .../data/dmp/DataManagementPlanNewVersionModel.java      | 6 +++---
 .../eudat/models/data/funder/FunderDMPEditorModel.java   | 9 +++++++++
 .../eu/eudat/models/data/grant/GrantDMPEditorModel.java  | 9 +++++++++
 .../eudat/models/data/project/ProjectDMPEditorModel.java | 9 +++++++++
 6 files changed, 36 insertions(+), 7 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 ec76a42cc..a53facf81 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
@@ -700,7 +700,9 @@ public class DataManagementPlanManager {
                 }
 
                 if (createNew) {
-                    organisation.setReference("Internal:" + UUID.randomUUID().toString());
+                    if (organisation.getReference() == null) {
+                        organisation.setReference("Internal:" + UUID.randomUUID().toString());
+                    }
                     organisationRepository.createOrUpdate(organisation);
                 }
             }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
index 9072842ee..1eca8b81c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
@@ -295,7 +295,7 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
                 grant.setAbbreviation("");
                 grant.setLabel(this.grant.getLabel());
                 grant.setType(Grant.GrantType.INTERNAL.getValue());
-                grant.setReference("dmp:" + grant.getId());
+                grant.setReference("dmp:" + (this.grant.getReference() != null ? this.grant.getReference() : grant.getId()));
                 grant.setUri("");
                 grant.setDefinition("");
                 grant.setCreated(new Date());
@@ -319,7 +319,7 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
                 funder.setId(UUID.randomUUID());
                 funder.setLabel(this.funder.getLabel());
                 funder.setType(Funder.FunderType.INTERNAL.getValue());
-                funder.setReference("dmp:" + funder.getId());
+                funder.setReference("dmp:" + (this.funder.getReference() != null ? this.funder.getReference() : funder.getId()));
                 funder.setDefinition("");
                 funder.setCreated(new Date());
                 funder.setStatus(Funder.Status.ACTIVE.getValue());
@@ -341,7 +341,7 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
                 project.setAbbreviation("");
                 project.setLabel(this.project.getLabel());
                 project.setType(Project.ProjectType.INTERNAL.getValue());
-                project.setReference("dmp:" + project.getId());
+                project.setReference("dmp:" + (this.project.getReference() != null ? this.project.getReference() : project.getId()));
                 project.setUri("");
                 project.setDefinition("");
                 project.setCreated(new Date());
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanNewVersionModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanNewVersionModel.java
index c3ec5855f..46c193154 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanNewVersionModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanNewVersionModel.java
@@ -196,7 +196,7 @@ public class DataManagementPlanNewVersionModel implements DataModel<DMP, DataMan
                 grant.setAbbreviation("");
                 grant.setLabel(this.grant.getLabel());
                 grant.setType(eu.eudat.data.entities.Grant.GrantType.INTERNAL.getValue());
-                grant.setReference("dmp:" + grant.getId());
+                grant.setReference("dmp:" + (this.grant.getReference() != null ? this.grant.getReference() : grant.getId()));
                 grant.setUri("");
                 grant.setDefinition("");
                 grant.setCreated(new Date());
@@ -220,7 +220,7 @@ public class DataManagementPlanNewVersionModel implements DataModel<DMP, DataMan
                 funder.setId(UUID.randomUUID());
                 funder.setLabel(this.funder.getLabel());
                 funder.setType(Funder.FunderType.INTERNAL.getValue());
-                funder.setReference("dmp:" + funder.getId());
+                funder.setReference("dmp:" + (this.funder.getReference() != null ? this.funder.getReference() : funder.getId()));
                 funder.setDefinition("");
                 funder.setCreated(new Date());
                 funder.setStatus(Funder.Status.ACTIVE.getValue());
@@ -242,7 +242,7 @@ public class DataManagementPlanNewVersionModel implements DataModel<DMP, DataMan
                 project.setAbbreviation("");
                 project.setLabel(this.project.getLabel());
                 project.setType(Project.ProjectType.INTERNAL.getValue());
-                project.setReference("dmp:" + project.getId());
+                project.setReference("dmp:" + (this.project.getReference() != null ? this.project.getReference() : project.getId()));
                 project.setUri("");
                 project.setDefinition("");
                 project.setCreated(new Date());
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/FunderDMPEditorModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/FunderDMPEditorModel.java
index 28738ed61..043cdb53b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/FunderDMPEditorModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/FunderDMPEditorModel.java
@@ -3,6 +3,7 @@ package eu.eudat.models.data.funder;
 public class FunderDMPEditorModel {
 	private Funder existFunder;
 	private String label;
+	private String reference;
 
 	public Funder getExistFunder() {
 		return existFunder;
@@ -17,4 +18,12 @@ public class FunderDMPEditorModel {
 	public void setLabel(String label) {
 		this.label = label;
 	}
+
+	public String getReference() {
+		return reference;
+	}
+
+	public void setReference(String reference) {
+		this.reference = reference;
+	}
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantDMPEditorModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantDMPEditorModel.java
index c8cb623d7..1a165d61e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantDMPEditorModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantDMPEditorModel.java
@@ -4,6 +4,7 @@ public class GrantDMPEditorModel {
     private Grant existGrant;
     private String label;
     private String description;
+    private String reference;
 
     public Grant getExistGrant() {
         return existGrant;
@@ -25,4 +26,12 @@ public class GrantDMPEditorModel {
     public void setDescription(String description) {
         this.description = description;
     }
+
+    public String getReference() {
+        return reference;
+    }
+
+    public void setReference(String reference) {
+        this.reference = reference;
+    }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/ProjectDMPEditorModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/ProjectDMPEditorModel.java
index d36b73594..c7ffbac35 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/ProjectDMPEditorModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/ProjectDMPEditorModel.java
@@ -4,6 +4,7 @@ public class ProjectDMPEditorModel {
 	private Project existProject;
 	private String label;
 	private String description;
+	private String reference;
 
 	public Project getExistProject() {
 		return existProject;
@@ -25,4 +26,12 @@ public class ProjectDMPEditorModel {
 	public void setDescription(String description) {
 		this.description = description;
 	}
+
+	public String getReference() {
+		return reference;
+	}
+
+	public void setReference(String reference) {
+		this.reference = reference;
+	}
 }