[airavata-data-lake] branch master updated: make global storage avaialble for storage search requests

[is...@apache.org]

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 466e313  make global storage avaialble for storage search requests
     new 82b23b5  Merge pull request #43 from isururanawaka/sharing_service_impl
466e313 is described below

commit 466e3130f3682949ef4250b0cfbea71a4ecd5e36
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Tue Aug 31 15:04:42 2021 -0400

    make global storage avaialble for storage search requests
---
 .../org/apache/airavata/drms/api/handlers/StorageServiceHandler.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java
index de821e5..3b96903 100644
--- a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java
+++ b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java
@@ -171,12 +171,14 @@ public class StorageServiceHandler extends StorageServiceGrpc.StorageServiceImpl
         Map<String, Object> userProps = new HashMap<>();
         userProps.put("username", callUser.getUsername());
         userProps.put("tenantId", callUser.getTenantId());
+        userProps.put("scope",  TransferScope.GLOBAL.name());
         List<Record> records = this.neo4JConnector.searchNodes(userProps,
                 " MATCH (u:User) where u.username = $username = $username AND u.tenantId = $tenantId" +
                         " OPTIONAL MATCH (u)<-[r2:SHARED_WITH]-(s:Storage)" +
                         " OPTIONAL MATCH (ch:Group)-[CHILD_OF *0..]->(g:Group)<-[r3:MEMBER_OF]-(u)" +
                         " OPTIONAL MATCH (cs:Storage)-[SHARED_WITH]->(ch) " +
-                        " return distinct s, cs");
+                        " OPTIONAL Match (srcStr:Storage)-[:TRANSFER_OUT]->(t:TransferMapping{scope:$scope, tenantId:$tenantId})-[:TRANSFER_IN]->(dstStr:Storage)" +
+                        " return distinct srcStr,dstStr, s, cs");
         try {
             List<AnyStorage> storageList = AnyStorageDeserializer.deserializeList(records);
             StorageSearchResponse.Builder builder = StorageSearchResponse.newBuilder();