From 39a81e1d28e53b8fa99cb4af1212c90b802d9047 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Mon, 4 Nov 2019 13:22:58 +0200
Subject: [PATCH] Enriches Oragnisation and Researcher references with source
 prefix. (Issue #187)

---
 .../eudat/models/data/dmp/Organisation.java   | 19 ++++++++++++++++++-
 .../eu/eudat/models/data/dmp/Researcher.java  | 17 +++++++++++++++--
 .../core/model/organisation/organization.ts   |  1 +
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Organisation.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Organisation.java
index 734954831..ff4d002f5 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Organisation.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/Organisation.java
@@ -10,6 +10,7 @@ public class Organisation implements DataModel<eu.eudat.data.entities.Organisati
     private String name;
     private String id;
     private int status;
+    private String tag;
 
     public String getLabel() {
         return label;
@@ -39,18 +40,34 @@ public class Organisation implements DataModel<eu.eudat.data.entities.Organisati
         this.status = status;
     }
 
+    public String getTag() {
+        return tag;
+    }
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
     @Override
     public Organisation fromDataModel(eu.eudat.data.entities.Organisation entity) {
         this.id = entity.getReference();
         this.name = entity.getLabel();
         this.label = entity.getUri();
+        if (entity.getReference().contains(":cristin")) {
+            this.tag = "Cristin";
+        } else {
+            this.tag = entity.getReference().substring(0, entity.getReference().indexOf(":"));
+        }
         return this;
     }
 
     @Override
     public eu.eudat.data.entities.Organisation toDataModel() {
         eu.eudat.data.entities.Organisation organisationEntity = new eu.eudat.data.entities.Organisation();
-        organisationEntity.setReference(this.id);
+        if (this.tag.equals(this.id.substring(0, this.tag.length()))) {
+            organisationEntity.setReference(this.id);
+        } else {
+            organisationEntity.setReference(this.tag + ":" + this.id);
+        }
         organisationEntity.setLabel(this.name);
         organisationEntity.setUri(this.label);
         organisationEntity.setCreated(new Date());
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 722d55dac..4da987f44 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
@@ -58,14 +58,27 @@ public class Researcher implements DataModel<eu.eudat.data.entities.Researcher,
         this.label = entity.getUri();
         this.name = entity.getLabel();
         this.status = entity.getStatus();
-        this.tag = "Internal";
+
+        if (entity.getReference().contains(":cristin")) {
+            this.tag = "Cristin";
+        } else {
+            String source = entity.getReference().substring(0, entity.getReference().indexOf(":"));
+            if (source.equals("dmp"))
+                this.tag = "Internal";
+            else
+                this.tag = source;
+        }
         return this;
     }
 
     @Override
     public eu.eudat.data.entities.Researcher toDataModel() {
         eu.eudat.data.entities.Researcher researcher = new eu.eudat.data.entities.Researcher();
-        researcher.setReference(this.id);
+        if (this.tag.equals("Internal") || this.tag.equals(this.id.substring(0, this.tag.length()))) {
+            researcher.setReference(this.id);
+        } else {
+            researcher.setReference(this.tag + ":" + this.id);
+        }
         researcher.setLabel(this.name);
         researcher.setUri(this.label);
         researcher.setCreated(new Date());
diff --git a/dmp-frontend/src/app/core/model/organisation/organization.ts b/dmp-frontend/src/app/core/model/organisation/organization.ts
index 58e807273..5fd54c7ab 100644
--- a/dmp-frontend/src/app/core/model/organisation/organization.ts
+++ b/dmp-frontend/src/app/core/model/organisation/organization.ts
@@ -5,4 +5,5 @@ export interface OrganizationModel {
 	name: string;
 	label: string;
 	status: Status;
+	tag: string;
 }