[airavata-data-lake] branch master updated: Fix metadata not showing issue

[isjarana]

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 17c2ea8  Fix metadata not showing issue
     new 62254f5  Merge pull request #80 from isururanawaka/master
17c2ea8 is described below

commit 17c2ea87dbca1409d696f0c238a4f91d8069133e
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Mon Oct 18 21:05:05 2021 -0400

    Fix metadata not showing issue
---
 .../apache/airavata/drms/api/handlers/ResourceServiceHandler.java   | 6 ++++--
 1 file changed, 4 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 fa21b2f..e59f8d5 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
@@ -999,7 +999,8 @@ 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)" +
+                " OPTIONAL MATCH (g:Group)<-[:MEMBER_OF]-(u)" +
+                " OPTIONAL MATCH (cg:Group)-[:CHILD_OF*]->(g)" +
                 " 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";
@@ -1023,7 +1024,8 @@ 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)" +
+                " OPTIONAL MATCH (g:Group)<-[:MEMBER_OF]-(u)" +
+                " OPTIONAL MATCH (cg:Group)-[:CHILD_OF*]->(g)" +
                 " OPTIONAL MATCH (l:" + parentType + ")<-[: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";