[airavata-data-lake] branch master updated: Fixing shared_by

[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 47f5248  Fixing shared_by
     new 39dfbbd  Merge pull request #166 from isururanawaka/mysql_conversion
47f5248 is described below

commit 47f52480672f27598c65f74b8de527836af469dc
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Mon Sep 12 10:37:35 2022 -0400

    Fixing shared_by
---
 .../drms/api/handlers/ResourceServiceHandler.java        | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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 d9be5bc..ef3b1e4 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
@@ -284,16 +284,18 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
 
         for (ResourceSearchQuery searchQuery : resourceSearchQueries) {
 
-            SearchCriteria searchCriteria = SearchCriteria.newBuilder()
-                    
.setSearchField(EntitySearchField.valueOf(searchQuery.getField()))
-                    
.setCondition(SearchCondition.valueOf(searchQuery.getOptions()))
-                    .setValue(searchQuery.getValue()).build();
+            if(!searchQuery.getField().equals("shared_with")) {
+                SearchCriteria searchCriteria = SearchCriteria.newBuilder()
+                        
.setSearchField(EntitySearchField.valueOf(searchQuery.getField()))
+                        
.setCondition(SearchCondition.valueOf(searchQuery.getOptions()))
+                        .setValue(searchQuery.getValue()).build();
 
-            searchRequestBuilder = 
searchRequestBuilder.addSearchCriteria(searchCriteria);
+                searchRequestBuilder = 
searchRequestBuilder.addSearchCriteria(searchCriteria);
+            }
 
         }
 
-        if (resourceSearchQueries.isEmpty()) {
+//        if (resourceSearchQueries.isEmpty()) {
 
             String type = request.getType();
 
@@ -314,7 +316,7 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
                         .setCondition(SearchCondition.EQUAL)
                         .setValue(type).build());
             }
-        }
+//        }
 
         SearchRequest searchRequest = searchRequestBuilder.setOwnerId(callUser
                 .getUsername())