From 0d74177d6b3ed9a9f82d506f2bb6564d14a0bb50 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Mon, 26 Aug 2019 16:16:50 +0300
Subject: [PATCH] Adds filter on Funder, Grant and Project to expose only the
 entities created for on application and not the ones saved by external
 sources.

---
 .../main/java/eu/eudat/data/dao/entities/ProjectDaoImpl.java    | 2 +-
 .../src/main/java/eu/eudat/logic/managers/FunderManager.java    | 1 +
 .../web/src/main/java/eu/eudat/logic/managers/GrantManager.java | 1 +
 .../src/main/java/eu/eudat/logic/managers/ProjectManager.java   | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDaoImpl.java
index 9beea78c6..eac00713a 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDaoImpl.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDaoImpl.java
@@ -27,7 +27,7 @@ public class ProjectDaoImpl extends DatabaseAccess<Project> implements ProjectDa
 					builder.or(builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"),
 							builder.or(builder.like(builder.upper(root.get("description")), "%" + criteria.getLike().toUpperCase() + "%"))));
 		if (criteria.getReference() != null)
-			query.where((builder, root) -> builder.equal(root.get("reference"), criteria.getReference()));
+			query.where((builder, root) -> builder.like(root.get("reference"), "%" + criteria.getReference() + "%"));
 		query.where((builder, root) -> builder.notEqual(root.get("status"), Project.Status.DELETED.getValue()));
 		return query;
 	}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java
index e923ea34b..fde3f1b11 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java
@@ -31,6 +31,7 @@ public class FunderManager {
 	public List<Funder> getCriteriaWithExternal(FunderCriteriaRequest funderCriteria, Principal principal) throws HugeResultSet, NoURLFound {
 		eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo();
 		userInfo.setId(principal.getId());
+		funderCriteria.getCriteria().setReference("dmp:");
 		QueryableList<eu.eudat.data.entities.Funder> items = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getWithCritetia(funderCriteria.getCriteria());
 		//QueryableList<eu.eudat.data.entities.Funder> authItems = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getAuthenticated(items, userInfo);
 		List<Funder> funders = items.select(item -> new eu.eudat.models.data.funder.Funder().fromDataModel(item));
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 d4d987b6c..ed20f5aab 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
@@ -116,6 +116,7 @@ public class GrantManager {
             Funder funder = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getWithCritetia(funderCriteria).getSingleOrDefault();
             grantCriteria.getCriteria().setFunderId(funder.getId().toString());
         }
+        grantCriteria.getCriteria().setReference("dmp:");
         QueryableList<eu.eudat.data.entities.Grant> items = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().getWithCriteria(grantCriteria.getCriteria());
         QueryableList<eu.eudat.data.entities.Grant> authItems = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().getAuthenticated(items, userInfo);
         List<eu.eudat.models.data.grant.Grant> grants = authItems.select(item -> new Grant().fromDataModel(item));
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java
index 77b099031..5e9b99a03 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java
@@ -31,6 +31,7 @@ public class ProjectManager {
 	public List<Project> getCriteriaWithExternal(ProjectCriteriaRequest projectCriteria, Principal principal) throws HugeResultSet, NoURLFound {
 		eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo();
 		userInfo.setId(principal.getId());
+		projectCriteria.getCriteria().setReference("dmp:");
 		QueryableList<eu.eudat.data.entities.Project> items = apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().getWithCritetia(projectCriteria.getCriteria());
 		QueryableList<eu.eudat.data.entities.Project> authItems = apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().getAuthenticated(items, userInfo);
 		List<Project> projects = authItems.select(item -> new Project().fromDataModel(item));