[airavata-data-lake] branch master updated: Fixing the storage preference serch query

[dimuthuupe]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe 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 49b9add  Fixing the storage preference serch query
49b9add is described below

commit 49b9add1523399fd78c5eeb8be7e81cf2bb8bd41
Author: Dimuthu Wannipurage <dimuthu.upeks...@gmail.com>
AuthorDate: Tue Aug 10 05:33:40 2021 -0400

    Fixing the storage preference serch query
---
 .../airavata/drms/api/handlers/StoragePreferenceServiceHandler.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
 
b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
index 7692b2c..816837b 100644
--- 
a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
+++ 
b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
@@ -225,13 +225,11 @@ public class StoragePreferenceServiceHandler extends 
StoragePreferenceServiceGrp
 
             String query = " MATCH (u:User) where u.username = $username AND 
u.tenantId = $tenantId" +
                     " OPTIONAL MATCH 
(u)<-[:SHARED_WITH]-(s1:Storage)<-[:CHILD_OF]->(sp1:StoragePreference)" +
-                    " OPTIONAL MATCH 
(cg:Group)-[:CHILD_OF*]->(g:Group)<-[:MEMBER_OF]-(u)" +
+                    " OPTIONAL MATCH (cg:Group)-[:CHILD_OF 
*0..]->(g:Group)<-[:MEMBER_OF]-(u)" +
                     " OPTIONAL MATCH 
(sp2:StoragePreference)-[:CHILD_OF]->(s2:Storage)-[:SHARED_WITH]->(cg) " +
-                    " OPTIONAL MATCH 
(sp3:StoragePreference)-[:CHILD_OF]->(s3:Storage)-[:SHARED_WITH]->(g)" +
                     " OPTIONAL MATCH 
(s4:Storage)<-[:CHILD_OF]->(sp4:StoragePreference)-[:SHARED_WITH]->(u)" +
                     " OPTIONAL MATCH 
(s5:Storage)<-[:CHILD_OF]->(sp5:StoragePreference)-[:SHARED_WITH]->(cg)" +
-                    " OPTIONAL MATCH 
(s6:Storage)<-[:CHILD_OF]->(sp6:StoragePreference)-[:SHARED_WITH]->(g)" +
-                    " return distinct s1, sp1, s2, sp2, s3, sp3, s4,sp4, 
s5,sp5, s6,sp6";
+                    " return distinct s1, sp1, s2, sp2, s4,sp4, s5,sp5";
 
 
             String storageId = null;