From 8d9a82c7f273ff5efa1868582e91660d64935e98 Mon Sep 17 00:00:00 2001
From: Isuru Ranawaka <irjanith@gmail.com>
Date: Wed, 8 Sep 2021 21:49:11 -0400
Subject: [PATCH] Bug fix in resource fetching

---
 .../airavata/drms/api/handlers/ResourceServiceHandler.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 a7ae76c..028ad6d 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
@@ -83,7 +83,8 @@ public void fetchResource(ResourceFetchRequest request, StreamObserver<ResourceF
 
             String query = " MATCH (u:User),  (r" + type + ") 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)" +
                     " 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";