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 33b9c03 Bug fix in sharedWith
new c6b57fb Merge pull request #35 from isururanawaka/sharing_service_impl
33b9c03 is described below
commit 33b9c037acabbeca1ecdb65d1e7f9d17b5c5a64a
Author: Isuru Ranawaka <[email protected]>
AuthorDate: Wed Aug 11 09:12:42 2021 -0400
Bug fix in sharedWith
---
.../drms/api/handlers/ResourceServiceHandler.java | 16 +++++++---------
data-resource-management-service/drms-stubs/pom.xml | 1 +
.../src/main/proto/sharing/SharingService.proto | 0
3 files changed, 8 insertions(+), 9 deletions(-)
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 625ba8b..a57c6e7 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
@@ -419,13 +419,11 @@ public class ResourceServiceHandler extends
ResourceServiceGrpc.ResourceServiceI
String val = qry.getValue();
String query = "MATCH (u:User) where u.username =
$username AND u.tenantId = $tenantId " +
" OPTIONAL MATCH (g:Group)<-[:MEMBER_OF]-(u)
" +
- " OPTIONAL MATCH
(u)<-[relRM:SHARED_WITH]-(m)<-[:CHILD_OF*]-(rm:" + value + ") , " +
- "(r:" + value + ")-[rel:SHARED_WITH]->(u)
where NOT r.owner = '" + val + "'" +
- " AND NOT rm.owner='" + val + "' " +
- " OPTIONAL MATCH
(g)<-[relRMG:SHARED_WITH]-(mg)<-[:CHILD_OF*]-(rmg:" + value + ")," +
- " (rg:" + value + ")-[relRG:SHARED_WITH]->(g)
where NOT rg.owner = '" + val + "'" +
- " AND NOT rmg.owner='" + val + "' " +
- " return distinct r,rel, rm,relRM,
rmg,relRMG, rg,relRG ";
+// " OPTIONAL MATCH
(u)<-[relRM:SHARED_WITH]-(m)<-[:CHILD_OF*]-(rm:" + value + ") where NOT
rm.owner='" + val + "'" +
+ " OPTIONAL MATCH (r:" + value +
")-[rel:SHARED_WITH]->(u) where NOT r.owner = '" + val + "'" +
+// " OPTIONAL MATCH
(g)<-[relRMG:SHARED_WITH]-(mg)<-[:CHILD_OF*]-(rmg:" + value + ") where NOT
rmg.owner='" + val + "' " +
+ " OPTIONAL MATCH (rg:" + value +
")-[relRG:SHARED_WITH]->(g) where NOT rg.owner = '" + val + "'" +
+ " return distinct r,rel, rg,relRG ";
Map<String, Object> objectMap = new HashMap<>();
objectMap.put("username", val);
objectMap.put("tenantId", callUser.getTenantId());
@@ -435,7 +433,7 @@ public class ResourceServiceHandler extends
ResourceServiceGrpc.ResourceServiceI
keyList.add("rm:relRM");
keyList.add("rmg:relRMG");
keyList.add("rg:relRG");
- List<GenericResource> genericResourceList =
GenericResourceDeserializer.deserializeList(records,keyList);
+ List<GenericResource> genericResourceList =
GenericResourceDeserializer.deserializeList(records, keyList);
ResourceSearchResponse.Builder builder =
ResourceSearchResponse.newBuilder();
builder.addAllResources(genericResourceList);
responseObserver.onNext(builder.build());
@@ -551,7 +549,7 @@ public class ResourceServiceHandler extends
ResourceServiceGrpc.ResourceServiceI
List<Record> records =
this.neo4JConnector.searchNodes(userProps, query);
- List<GenericResource> genericResourceList =
GenericResourceDeserializer.deserializeList(records,keyList);
+ List<GenericResource> genericResourceList =
GenericResourceDeserializer.deserializeList(records, keyList);
ResourceSearchResponse.Builder builder =
ResourceSearchResponse.newBuilder();
builder.addAllResources(genericResourceList);
responseObserver.onNext(builder.build());
diff --git a/data-resource-management-service/drms-stubs/pom.xml
b/data-resource-management-service/drms-stubs/pom.xml
index e0d5ebe..639d09f 100644
--- a/data-resource-management-service/drms-stubs/pom.xml
+++ b/data-resource-management-service/drms-stubs/pom.xml
@@ -54,6 +54,7 @@
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation.version}</version>
</dependency>
+
</dependencies>
<build>
<extensions>
diff --git
a/data-resource-management-service/drms-stubs/src/main/proto/sharing/SharingService.proto
b/data-resource-management-service/drms-stubs/src/main/proto/sharing/SharingService.proto
new file mode 100644
index 0000000..e69de29
