[airavata-data-lake] branch master updated: permisison error

[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 1c60833  permisison error
     new 068d7d9  Merge pull request #193 from isururanawaka/mysql_conversion
1c60833 is described below

commit 1c60833b6f6ac0a7a878fa62c394376b7fa0281d
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Fri Oct 14 08:17:55 2022 -0400

    permisison error
---
 .../drms/api/handlers/ResourceServiceHandler.java  | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 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 f1e9ade..58d66ad 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
@@ -204,19 +204,19 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
 
                     resources.forEach(resource -> {
                         String id = resource.getId();
-                        Entity entity = Entity.newBuilder().setId(id).build();
-                        if 
(sharingManagementClient.isEntityExists(callUser.getTenantId(), 
entity).getStatus()) {
-                            Entity exEntity = 
sharingManagementClient.getEntity(callUser.getTenantId(), entity);
-                            try {
-                                List<String> allAccess = 
CustosUtils.getAllAccess(custosClientProvider, callUser.getTenantId(),
-                                        callUser.getUsername(), resourceId, 
new String[]{SharingConstants.PERMISSION_TYPE_VIEWER,
-                                                
SharingConstants.PERMISSION_TYPE_EDITOR, 
SharingConstants.PERMISSION_TYPE_OWNER});
-                                
genericResources.add(ResourceMapper.map(resource, exEntity, allAccess));
-                            } catch (IOException e) {
-                                logger.error("Permission fetching error for 
entity {}", exEntity.getId());
-                                
responseObserver.onError(Status.PERMISSION_DENIED.asRuntimeException());
-                            }
+                        SearchRequest searchRequest = 
SearchRequest.newBuilder().setOwnerId(callUser
+                                .getUsername())
+                                .setClientId(callUser.getTenantId())
+                                .addSearchCriteria(SearchCriteria.newBuilder()
+                                        .setSearchField(EntitySearchField.ID)
+                                        .setCondition(SearchCondition.EQUAL)
+                                        .setValue(id))
+                                .build();
+                        Entities entities =   
sharingManagementClient.searchEntities(callUser.getTenantId(), searchRequest);
+
 
+                        if (entities != null && 
!entities.getEntityArrayList().isEmpty()) {
+                                
genericResources.add(ResourceMapper.map(resource, entities.getEntityArray(0)));
 
                         }