[airavata-data-lake] branch master updated: validate entity existence

[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 da38e56  validate entity existence
     new f73d23d  Merge pull request #187 from isururanawaka/mysql_conversion
da38e56 is described below

commit da38e5676da753cc11fe53dd2d40a2ed52833d31
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Tue Oct 11 21:18:53 2022 -0400

    validate entity existence
---
 .../apache/airavata/drms/api/handlers/ResourceServiceHandler.java  | 7 +++++--
 1 file changed, 5 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 7619464..e73b6b4 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
@@ -203,8 +203,11 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
                     resources.forEach(resource -> {
                         String id = resource.getId();
                         Entity entity = Entity.newBuilder().setId(id).build();
-                        Entity exEntity = 
sharingManagementClient.getEntity(callUser.getTenantId(), entity);
-                        genericResources.add(ResourceMapper.map(resource, 
exEntity));
+                        
if(sharingManagementClient.isEntityExists(callUser.getTenantId(),entity).getStatus())
 {
+                            Entity exEntity = 
sharingManagementClient.getEntity(callUser.getTenantId(), entity);
+                            genericResources.add(ResourceMapper.map(resource, 
exEntity));
+                        }
+
 
                     });