[airavata-custos] branch baremetal updated: adding sharing metadata

[isjarana]

This is an automated email from the ASF dual-hosted git repository.

isjarana pushed a commit to branch baremetal
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git


The following commit(s) were added to refs/heads/baremetal by this push:
     new d365b3965 adding sharing metadata
     new ff878fc76 Merge pull request #310 from isururanawaka/baremetal
d365b3965 is described below

commit d365b396576e4478dba03bca70ade26853006fa0
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Fri Oct 14 07:20:01 2022 -0400

    adding sharing metadata
---
 .../src/main/java/org/apache/custos/sharing/mapper/SharingMapper.java | 4 ++--
 .../main/java/org/apache/custos/sharing/service/SharingService.java   | 2 +-
 .../sharing-core-service/src/main/proto/SharingService.proto          | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/mapper/SharingMapper.java
 
b/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/mapper/SharingMapper.java
index 4e2e4fead..8cd68887d 100644
--- 
a/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/mapper/SharingMapper.java
+++ 
b/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/mapper/SharingMapper.java
@@ -112,7 +112,7 @@ public class SharingMapper {
                 .setOwnerId(sharing.getAssociatingId())
                 .setOwnerType(type)
                 
.setSharedBy(sharing.getSharedBy()!=null?sharing.getSharedBy():"")
-                
.setPermission(org.apache.custos.sharing.service.PermissionType.newBuilder()
+                
.addPermissions(org.apache.custos.sharing.service.PermissionType.newBuilder()
                         
.setId(permissionType.getExternalId()).build()).build();
 
     }
@@ -124,7 +124,7 @@ public class SharingMapper {
                     map(shr -> {
                         try {
                             SharingMetadata metadata = 
SharingMetadata.newBuilder()
-                                    
.setPermission(org.apache.custos.sharing.service.PermissionType.newBuilder().
+                                    
.addPermissions(org.apache.custos.sharing.service.PermissionType.newBuilder().
                                             
setId(shr.getPermissionType().getExternalId())
                                             
.setName(shr.getPermissionType().getName()
                                             
).setDescription(shr.getPermissionType().getDescription() == null ?
diff --git 
a/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/service/SharingService.java
 
b/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/service/SharingService.java
index 31eca9ee4..e0b74f31c 100644
--- 
a/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/service/SharingService.java
+++ 
b/custos-core-services/sharing-core-service/src/main/java/org/apache/custos/sharing/service/SharingService.java
@@ -1287,7 +1287,7 @@ public class SharingService extends 
org.apache.custos.sharing.service.SharingSer
                     new ArrayList<>(selectedList).forEach(selVar -> {
                         if 
((shr.getEntity().getId().equals(selVar.getEntity().getId())
                                 && 
shr.getOwnerId().equals(selVar.getOwnerId()) &&
-                                
shr.getPermission().getId().equals(selVar.getPermission().getId()))) {
+                                
shr.getPermissions(0).getId().equals(selVar.getPermissions(0).getId()))) {
                             matched.set(true);
                         }
                     });
diff --git 
a/custos-core-services/sharing-core-service/src/main/proto/SharingService.proto 
b/custos-core-services/sharing-core-service/src/main/proto/SharingService.proto
index 09b8dfc3c..d28e8a073 100644
--- 
a/custos-core-services/sharing-core-service/src/main/proto/SharingService.proto
+++ 
b/custos-core-services/sharing-core-service/src/main/proto/SharingService.proto
@@ -77,6 +77,7 @@ message Entity {
     int64 created_at = 10;
     int64 updated_at = 11;
     int32 shared_count = 12;
+    SharingMetadata sharing_metadata = 13;
 }
 
 message EntityRequest {
@@ -179,7 +180,7 @@ message SharingMetadata {
     Entity entity = 1;
     string owner_id = 2;
     string owner_type = 3;
-    PermissionType permission = 4;
+    repeated PermissionType permissions = 4;
     string shared_by = 5;
 }