You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2022/10/14 03:47:30 UTC
[airavata-data-lake] branch master updated: permissions
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 00dbd0c permissions
new c19d27e Merge pull request #190 from isururanawaka/mysql_conversion
00dbd0c is described below
commit 00dbd0c3589e2a09c91423ceacfa39ef31b99344
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Thu Oct 13 23:46:45 2022 -0400
permissions
---
.../drms/api/handlers/ResourceServiceHandler.java | 2 +-
.../drms/api/persistance/mapper/ResourceMapper.java | 16 +++++++++++++++-
2 files changed, 16 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 5f46078..5c1e6a4 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
@@ -355,7 +355,7 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
}
});
-
+
ResourceSearchResponse resourceSearchResponse = ResourceSearchResponse
.newBuilder()
.addAllResources(metadataList)
diff --git a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
index 1491410..9bdb79d 100644
--- a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
+++ b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/ResourceMapper.java
@@ -6,11 +6,14 @@ import org.apache.airavata.datalake.drms.resource.GenericResource;
import org.apache.airavata.drms.api.persistance.model.Resource;
import org.apache.airavata.drms.api.persistance.model.ResourceProperty;
import org.apache.custos.sharing.service.Entity;
+import org.apache.custos.sharing.service.PermissionType;
+import org.apache.custos.sharing.service.SharingMetadata;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
public class ResourceMapper {
@@ -30,6 +33,17 @@ public class ResourceMapper {
genericResourceBuilder.putProperties("lastModifiedTime", String.valueOf(entity.getUpdatedAt()));
Set<ResourceProperty> resourcePropertySet = resource.getResourceProperty();
+
+ SharingMetadata sharingMetadata = entity.getSharingMetadata();
+ if(sharingMetadata != null && !sharingMetadata.getPermissionsList().isEmpty()) {
+ String permission="";
+ for(PermissionType permissionType: sharingMetadata.getPermissionsList()){
+ permission = permission +" "+permissionType.getId();
+ }
+ genericResourceBuilder.putProperties("permission",permission);
+ }
+
+
Iterator<ResourceProperty> iterator = resourcePropertySet.iterator();
while (iterator.hasNext()) {
@@ -37,7 +51,7 @@ public class ResourceMapper {
if (resourceProperty.getPropertyKey().equals("resourcePath")) {
genericResourceBuilder.setResourcePath(resourceProperty.getPropertyValue());
}
- if (resourceProperty.getPropertyKey().equals("note") || resourceProperty.getPropertyKey().equals("permission")){
+ if (resourceProperty.getPropertyKey().equals("note")){
genericResourceBuilder.putProperties(resourceProperty.getPropertyKey(),resourceProperty.getPropertyValue());
}