Fix metadata not showing issue

apache · Oct 19, 2021 · 17c2ea87dbca1409d696f0c238a4f91d8069133e · 17c2ea8
1 parent 1d3fbe7
commit 17c2ea87dbca1409d696f0c238a4f91d8069133e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.../drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java b/.../drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
@@ -999,7 +999,8 @@ private boolean hasAccessForResource(String username, String tenantId, String re
 
         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 @@ private boolean hasAccessForResource(String username, String tenantId, String re
 
         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";