[airavata-data-lake] branch master updated: Fix shared with me to remove self owned artifacts in shared with me

[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 5c2e1cc  Fix shared with me to remove self owned artifacts in shared 
with me
     new faaa8a5  Merge pull request #195 from isururanawaka/mysql_conversion
5c2e1cc is described below

commit 5c2e1ccfafc648c8efdc56ff0d8042b5a32806bf
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Tue Dec 20 09:48:35 2022 -0500

    Fix shared with me to remove self owned artifacts in shared with me
---
 .../airavata/drms/api/handlers/ResourceServiceHandler.java       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
index 58d66ad..091795f 100644
--- 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
+++ 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
@@ -307,6 +307,12 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
 
                 searchRequestBuilder = 
searchRequestBuilder.addSearchCriteria(searchCriteria);
             } else if (!searchQuery.getField().equalsIgnoreCase("sharedWith")) 
{
+                SearchCriteria searchCriteria = SearchCriteria.newBuilder()
+                        .setSearchField(EntitySearchField.SHARED_WITH)
+                        .setCondition(SearchCondition.EQUAL)
+                        .setValue(searchQuery.getValue()).build();
+                searchRequestBuilder = 
searchRequestBuilder.addSearchCriteria(searchCriteria);
+            } else {
                 searchMap.put(searchQuery.getField(), searchQuery.getValue());
             }
 
@@ -449,7 +455,8 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
                 String parentId = optionalResource.get().getParentResourceId();
 
                 List<String> allAccess = 
CustosUtils.getAllAccess(custosClientProvider, callUser.getTenantId(),
-                        callUser.getUsername(), parentId, new 
String[]{SharingConstants.PERMISSION_TYPE_VIEWER, 
SharingConstants.PERMISSION_TYPE_EDITOR, 
SharingConstants.PERMISSION_TYPE_OWNER});
+                        callUser.getUsername(), parentId, new 
String[]{SharingConstants.PERMISSION_TYPE_VIEWER,
+                                SharingConstants.PERMISSION_TYPE_EDITOR, 
SharingConstants.PERMISSION_TYPE_OWNER});
 
                 if (!allAccess.isEmpty()) {
                     try (SharingManagementClient sharingManagementClient = 
custosClientProvider.getSharingManagementClient()) {