[airavata-data-lake] branch master updated: Bug fix on sharedBy

[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 d4a5efe  Bug fix on sharedBy
     new e358aab  Merge pull request #39 from isururanawaka/sharing_service_impl
d4a5efe is described below

commit d4a5efedecbb8d617fae51e2a3454394b5342ad1
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Thu Aug 12 13:13:47 2021 -0400

    Bug fix on sharedBy
---
 .../org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java   | 2 +-
 1 file changed, 1 insertion(+), 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 91ad3f6..17ffca3 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
@@ -407,7 +407,7 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
                     if (qry.getField().equals("sharedBy")) {
                         String val = qry.getValue();
                         String query = " Match (m:" + value + 
")-[r:SHARED_WITH]->(l) " +
-                                "where r.sharedBy=$sharedBy AND 
m.tenantId=$tenantId and l.tenantId=$tenantId " +
+                                "where r.sharedBy=$sharedBy AND 
m.tenantId=$tenantId AND  l.tenantId=$tenantId  AND NOT l.username=$sharedBy " +
                                 "return m, r ";
                         Map<String, Object> objectMap = new HashMap<>();
                         objectMap.put("sharedBy", val);