From 8cb993433c80b321cfc33d80f11a7ff5339c8822 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Thu, 21 Nov 2019 18:25:43 +0200
Subject: [PATCH] Refactors the prefix saved as reference from external sources
 to always be in lower case letters.

---
 .../main/java/eu/eudat/data/dao/entities/FunderDaoImpl.java  | 2 +-
 .../src/main/java/eu/eudat/logic/managers/GrantManager.java  | 2 +-
 .../java/eu/eudat/models/data/dataset/DataRepository.java    | 5 +----
 .../src/main/java/eu/eudat/models/data/dataset/Registry.java | 5 +----
 .../src/main/java/eu/eudat/models/data/dataset/Service.java  | 5 +----
 .../data/externaldataset/ExternalDatasetListingModel.java    | 5 +----
 .../src/main/java/eu/eudat/models/data/funder/Funder.java    | 2 +-
 .../web/src/main/java/eu/eudat/models/data/grant/Grant.java  | 2 +-
 .../src/main/java/eu/eudat/models/data/project/Project.java  | 2 +-
 9 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDaoImpl.java
index f6712094a..40262d743 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDaoImpl.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDaoImpl.java
@@ -28,7 +28,7 @@ public class FunderDaoImpl extends DatabaseAccess<Funder> implements FunderDao {
 					builder.or(builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"),
 							builder.or(builder.like(builder.upper(root.get("definition")), "%" + criteria.getLike().toUpperCase() + "%"))));
 		if (criteria.getReference() != null)
-			query.where((builder, root) -> builder.like(root.get("reference"), "%" + criteria.getReference() + "%"));
+			query.where((builder, root) -> builder.like(builder.upper(root.get("reference")), "%" + criteria.getReference().toUpperCase() + "%"));
 		query.where((builder, root) -> builder.notEqual(root.get("status"), Funder.Status.DELETED.getValue()));
 		return query;
 	}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java
index 61e16e675..03213aa87 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java
@@ -106,7 +106,7 @@ public class GrantManager {
         return grant;
     }*/
 
-    public List<eu.eudat.models.data.grant.Grant> getCriteriaWithExternal(GrantCriteriaRequest grantCriteria, Principal principal) throws IllegalAccessException, InstantiationException, HugeResultSet, NoURLFound {
+    public List<eu.eudat.models.data.grant.Grant> getCriteriaWithExternal(GrantCriteriaRequest grantCriteria, Principal principal) throws HugeResultSet, NoURLFound {
         eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo();
         userInfo.setId(principal.getId());
         if (grantCriteria.getCriteria().getFunderReference() != null && !grantCriteria.getCriteria().getFunderReference().trim().isEmpty()) {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DataRepository.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DataRepository.java
index 9c1a84201..d33d38dbf 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DataRepository.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DataRepository.java
@@ -91,12 +91,9 @@ public class DataRepository implements DataModel<eu.eudat.data.entities.DataRepo
             if (this.source.equals(this.reference.substring(0, this.source.length()))) {
                 entity.setReference(this.reference);
             } else {
-                entity.setReference(this.source + ":" + this.reference);
+                entity.setReference(this.source.toLowerCase() + ":" + this.reference);
             }
         }
-        if (this.reference == null) {
-            entity.setReference(this.source + ":" + this.label);
-        }
         return entity;
     }
 
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/Registry.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/Registry.java
index 3710ac6cf..1c035e6a3 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/Registry.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/Registry.java
@@ -95,12 +95,9 @@ public class Registry implements DataModel<eu.eudat.data.entities.Registry, Regi
             if (this.source.equals(this.reference.substring(0, this.source.length()))) {
                 entity.setReference(this.reference);
             } else {
-                entity.setReference(this.source + ":" + this.reference);
+                entity.setReference(this.source.toLowerCase() + ":" + this.reference);
             }
         }
-        if (this.reference == null) {
-            entity.setReference(this.source + ":" + this.label);
-        }
         entity.setUri(this.uri);
         entity.setModified(new Date());
         entity.setStatus((short)0);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/Service.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/Service.java
index b72c6d2a1..a76f066fb 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/Service.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/Service.java
@@ -92,12 +92,9 @@ public class Service implements DataModel<eu.eudat.data.entities.Service, Servic
             if (this.source.equals(this.reference.substring(0, this.source.length()))) {
                 entity.setReference(this.reference);
             } else {
-                entity.setReference(this.source + ":" + this.reference);
+                entity.setReference(this.source.toLowerCase() + ":" + this.reference);
             }
         }
-        if (this.reference == null) {
-            entity.setReference(this.source + ":" + this.label);
-        }
         entity.setUri(this.uri);
         entity.setModified(new Date());
         entity.setStatus((short)0);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/externaldataset/ExternalDatasetListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/externaldataset/ExternalDatasetListingModel.java
index 8b258a292..2ffc2c525 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/externaldataset/ExternalDatasetListingModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/externaldataset/ExternalDatasetListingModel.java
@@ -137,12 +137,9 @@ public class ExternalDatasetListingModel implements DataModel<ExternalDataset, E
             if (this.source.equals(this.reference.substring(0, this.source.length()))) {
                 externalDataset.setReference(this.reference);
             } else {
-                externalDataset.setReference(this.source + ":" + this.reference);
+                externalDataset.setReference(this.source.toLowerCase() + ":" + this.reference);
             }
         }
-        if (this.reference == null) {
-            externalDataset.setReference(this.source + ":" + this.name);
-        }
         externalDataset.setModified(new Date());
         return externalDataset;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/Funder.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/Funder.java
index d42444e6c..baa830ddd 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/Funder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/Funder.java
@@ -100,7 +100,7 @@ public class Funder implements DataModel<eu.eudat.data.entities.Funder, Funder>
 		entity.setId(this.id);
 		entity.setLabel(this.label);
 		entity.setType(this.type);
-		entity.setReference(this.reference == null ? "dmp:" + this.label : this.source + ":" + this.reference);
+		entity.setReference(this.reference == null ? "dmp:" + this.label : this.source.toLowerCase() + ":" + this.reference);
 		entity.setDefinition(this.definition);
 		entity.setCreated(this.created == null ? new Date() : this.created);
 		entity.setStatus(this.status != null ? this.getStatus() : eu.eudat.data.entities.Grant.Status.ACTIVE.getValue());
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java
index 884a84e31..f8cde3ca3 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java
@@ -189,7 +189,7 @@ public class Grant implements DataModel<eu.eudat.data.entities.Grant, Grant> {
         entity.setAbbreviation(this.abbreviation);
         entity.setLabel(this.label);
         entity.setType(this.type);
-        entity.setReference(this.reference == null ? "dmp:" + this.label : this.source + ":" + this.reference);
+        entity.setReference(this.reference == null ? "dmp:" + this.label : this.source.toLowerCase() + ":" + this.reference);
         entity.setUri(this.uri);
         entity.setDefinition(this.definition);
         entity.setStartdate(this.startDate);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java
index 9f799c96b..fe9da0885 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java
@@ -176,7 +176,7 @@ public class Project implements DataModel<eu.eudat.data.entities.Project, Projec
 		entity.setAbbreviation(this.abbreviation);
 		entity.setLabel(this.label);
 		entity.setType(this.type);
-		entity.setReference(this.reference == null ? "dmp:" + this.label : this.source + ":" + this.reference);
+		entity.setReference(this.reference == null ? "dmp:" + this.label : this.source.toLowerCase() + ":" + this.reference);
 		entity.setUri(this.uri);
 		entity.setDefinition(this.definition);
 		entity.setStartdate(this.startDate);