[airavata-data-lake] branch master updated: fix data search

[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 cef6d88  fix data search
     new 325e99d  Merge pull request #183 from isururanawaka/mysql_conversion
cef6d88 is described below

commit cef6d8849467fed4c12f7171563040c19987dbd3
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Tue Sep 20 22:17:50 2022 -0400

    fix data search
---
 .../org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java | 4 ++--
 1 file changed, 2 insertions(+), 2 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 d65e84a..d911820 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
@@ -291,7 +291,7 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
                         .setValue(searchQuery.getValue()).build();
 
                 searchRequestBuilder = 
searchRequestBuilder.addSearchCriteria(searchCriteria);
-            } else {
+            } else if(!searchQuery.getField().equalsIgnoreCase("sharedWith")){
                 searchMap.put(searchQuery.getField(), searchQuery.getValue());
             }
 
@@ -304,7 +304,7 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
         Optional<TransferMapping> transferMappingOptional = 
transferMappingRepository.
                 findTransferMappingByScope(TransferScope.GLOBAL.name());
 
-        if (transferMappingOptional.isPresent()) {
+        if (transferMappingOptional.isPresent() && searchMap.isEmpty()) {
             TransferMapping transferMapping = transferMappingOptional.get();
             String sourceId = transferMapping.getSource().getId();