[airavata-data-lake] branch master updated: delete child membership

[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 bd1672a  delete child membership
     new 8731899  Merge pull request #199 from isururanawaka/mysql_conversion
bd1672a is described below

commit bd1672a05e72862058f925463110d803b89e7c38
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Tue Dec 20 13:02:48 2022 -0500

    delete child membership
---
 .../drms/api/handlers/ResourceServiceHandler.java  | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 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 a200ebd..0d740db 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
@@ -398,12 +398,17 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
             List<GenericResource> childResources = 
request.getChildResourcesList();
             List<GenericResource> allResources = new ArrayList<>();
                 childResources.forEach(childResource-> {
-                    try {
-                        CustosUtils.mergeResourceEntity(custosClientProvider, 
callUser.getTenantId(),
+
+                      List<ResourceProperty> resourceProperties =  
resourcePropertyRepository.
+                              
findByPropertyKeyAndResourceId("resourceName",childResource.getResourceId());
+                   try{
+                      if(!resourceProperties.isEmpty()) {
+                          
CustosUtils.mergeResourceEntity(custosClientProvider, callUser.getTenantId(),
                                   resource.getResourceId(), 
childResource.getType(), childResource.getResourceId(),
-                                  childResource.getResourceName(), 
childResource.getResourceName(),
+                                  
resourceProperties.get(0).getPropertyValue(), 
resourceProperties.get(0).getPropertyValue(),
                                   callUser.getUsername());
-                        allResources.add(childResource);
+                          allResources.add(childResource);
+                      }
                     } catch (IOException e) {
                         String msg = " Error occurred while adding  child 
memberships " + e.getMessage();
                         logger.error(" Error occurred while adding  child 
memberships: Messages {} ", e.getMessage(), e);
@@ -434,12 +439,15 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
             List<GenericResource> childResources = 
request.getChildResourcesList();
             List<GenericResource> allResources = new ArrayList<>();
             childResources.forEach(childResource-> {
+                List<ResourceProperty> resourceProperties =  
resourcePropertyRepository.findByPropertyKeyAndResourceId("resourceName",childResource.getResourceId());
                 try {
-                    CustosUtils.mergeResourceEntity(custosClientProvider, 
callUser.getTenantId(),
-                            "", childResource.getType(), 
childResource.getResourceId(),
-                            childResource.getResourceName(), 
childResource.getResourceName(),
-                            callUser.getUsername());
-                    allResources.add(childResource);
+                    if(!resourceProperties.isEmpty()) {
+                        CustosUtils.mergeResourceEntity(custosClientProvider, 
callUser.getTenantId(),
+                                "", childResource.getType(), 
childResource.getResourceId(),
+                                resourceProperties.get(0).getPropertyValue(), 
resourceProperties.get(0).getPropertyValue(),
+                                callUser.getUsername());
+                        allResources.add(childResource);
+                    }
                 } catch (IOException e) {
                     String msg = " Error occurred while adding  child 
memberships " + e.getMessage();
                     logger.error(" Error occurred while adding  child 
memberships: Messages {} ", e.getMessage(), e);