From cdae5ae574e4d14d4cbfa6b0fde660a32bf2704e Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Fri, 30 Apr 2021 11:08:06 +0300
Subject: [PATCH] Fix minor issues when creating a researcher

---
 .../web/src/main/java/eu/eudat/models/data/dmp/Researcher.java  | 2 +-
 .../main/java/eu/eudat/models/data/researcher/Researcher.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Researcher.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Researcher.java
index eff13c6b7..88bd56401 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Researcher.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Researcher.java
@@ -94,7 +94,7 @@ public class Researcher implements DataModel<eu.eudat.data.entities.Researcher,
         researcher.setId(UUID.fromString(this.id));
         if (this.key != null) {
             if (this.key.toLowerCase().equals("internal")) {
-                if (this.reference != null && "dmp".equals(this.reference.substring(0, 3))) {
+                if (this.reference != null) {
                     researcher.setReference(this.reference);
                 } else {
                     researcher.setReference("dmp:" + this.id);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/researcher/Researcher.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/researcher/Researcher.java
index 8ecc23211..f84c204bf 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/researcher/Researcher.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/researcher/Researcher.java
@@ -40,7 +40,7 @@ public class Researcher implements DataModel<eu.eudat.data.entities.Researcher,
         researcher.setCreated(new Date());
         researcher.setLabel(this.firstName + " " + this.lastName);
         researcher.setModified(new Date());
-        researcher.setReference("dmp:" + researcher.getLabel());
+        researcher.setReference("dmp:" + researcher.getReference());
         researcher.setStatus((short) 0);
         return researcher;
     }