You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2021/09/01 02:14:30 UTC
[airavata-data-lake] branch master updated: Fixing permisison issue
in metadata seearch
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git
The following commit(s) were added to refs/heads/master by this push:
new 0f1e9c7 Fixing permisison issue in metadata seearch
new 7e2f3c0 Merge pull request #46 from isururanawaka/sharing_service_impl
0f1e9c7 is described below
commit 0f1e9c76a47569c20a181595e24549d444701900
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Tue Aug 31 22:13:36 2021 -0400
Fixing permisison issue in metadata seearch
---
.../apache/airavata/drms/api/handlers/ResourceServiceHandler.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
index 0b47f99..d1bb7aa 100644
--- a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
+++ b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
@@ -839,8 +839,9 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
String query = " MATCH (u:User), (r) where u.username = $username AND u.tenantId = $tenantId AND " +
" r.entityId = $entityId AND r.tenantId = $tenantId" +
" OPTIONAL MATCH (cg:Group)-[:CHILD_OF*]->(g:Group)<-[:MEMBER_OF]-(u)" +
- " return case when exists((u)<-[:SHARED_WITH]-(r)) OR exists((g)<-[:SHARED_WITH]-(r)) OR " +
- "exists((cg)<-[:SHARED_WITH]-(r)) then r else NULL end as value";
+ " OPTIONAL MATCH (l)<-[:CHILD_OF*]-(r)"+
+ " return case when exists((u)<-[:SHARED_WITH]-(r)) OR exists((u)<-[:SHARED_WITH]-(l)) OR exists((g)<-[:SHARED_WITH]-(r)) OR " +
+ " exists((g)<-[:SHARED_WITH]-(l)) OR exists((cg)<-[:SHARED_WITH]-(r) OR exists((cg)<-[:SHARED_WITH]-(l)) then r else NULL end as value";
List<Record> records = this.neo4JConnector.searchNodes(userProps, query);