From fe8a0ff10977e52bce6e6fcfbdf6a645279c7530 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Fri, 30 Apr 2021 14:45:00 +0300
Subject: [PATCH] Fix vaious issues with organizations

---
 .../java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java    | 2 +-
 .../src/main/java/eu/eudat/models/data/dmp/Organisation.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java
index 4240840f4..75e167e6e 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java
@@ -64,7 +64,7 @@ public class OrganisationDaoImpl extends DatabaseAccess<Organisation> implements
     }
 
     public QueryableList<Organisation> getAuthenticated(QueryableList<Organisation> query, UserInfo principal) {
-        query.where((builder, root) -> builder.equal(root.join("dmps").get("creator"), principal));
+        query.where((builder, root) -> builder.equal(root.join("dmps").join("users").get("user"), principal));
         return query;
     }
 
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 0d48f4672..b7b12e2f6 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
@@ -81,7 +81,7 @@ public class Organisation implements DataModel<eu.eudat.data.entities.Organisati
     public eu.eudat.data.entities.Organisation toDataModel() {
         eu.eudat.data.entities.Organisation organisationEntity = new eu.eudat.data.entities.Organisation();
         if (this.key != null && this.reference != null) {
-            if ((this.key + ":").equals(this.reference.substring(0, this.key.length() + 1))) {
+            if (this.reference.startsWith(this.key + ":")) {
                 organisationEntity.setReference(this.reference);
             } else {
                 organisationEntity.setReference(this.key + ":" + this.reference);