[airavata-data-lake] branch master updated: add drms

[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 165a4f6  add drms
     new 235ef31  Merge pull request #204 from isururanawaka/mysql_conversion
165a4f6 is described below

commit 165a4f69a741276088cbe31f26e80dafe1e14922
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Mon Jan 30 17:15:22 2023 -0500

    add drms
---
 .../airavata/drms/api/handlers/ResourceServiceHandler.java  |  5 +++--
 .../drms/api/persistance/mapper/ResourceMapper.java         | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 3 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 296267f..b3d24a0 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
@@ -148,7 +148,7 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
                     callUser.getUsername());
 
             if (exEntity.isPresent()) {
-                Resource resource = ResourceMapper.map(request.getResource(), 
exEntity.get(), callUser);
+                Resource resource = 
ResourceMapper.map(request.getResource(),null, exEntity.get(), callUser);
                 resource.setResourceType(type);
                 resource.setParentResourceId(parentId);
                 resourceRepository.save(resource);
@@ -265,9 +265,10 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
                            resourceProperties.get(0).getPropertyValue());
 
                    if (exEntity.isPresent()) {
-                       Resource resource = 
ResourceMapper.map(request.getResource(), exEntity.get(), callUser);
+                       Resource resource = 
ResourceMapper.map(request.getResource(), exResource.get(),exEntity.get(), 
callUser);
                        resource.setResourceType(type);
                        resource.setParentResourceId(parentId);
+
                        resourceRepository.save(resource);
 
                        GenericResource genericResource = 
ResourceMapper.map(resource, exEntity.get());
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 c23db9f..e756475 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
@@ -91,7 +91,8 @@ public class ResourceMapper {
 
     }
 
-    public static Resource map(GenericResource resource, Entity entity, 
AuthenticatedUser authenticatedUser) {
+    public static Resource map(GenericResource resource, Resource exResource, 
Entity entity,
+                               AuthenticatedUser authenticatedUser) {
 
         Map<Descriptors.FieldDescriptor, Object> allFields = 
resource.getAllFields();
 
@@ -117,6 +118,16 @@ public class ResourceMapper {
         resourcePropertySet.add(new ResourceProperty("firstName", 
authenticatedUser.getFirstName(), prResource));
         resourcePropertySet.add(new ResourceProperty("lastName", 
authenticatedUser.getLastName(), prResource));
 
+        if(exResource != null){
+          Set<ResourceProperty> properties =  exResource.getResourceProperty();
+          for(ResourceProperty property: properties){
+              if (property.getPropertyKey().equals("metadata")||
+                      property.getPropertyKey().equals("firstName")||
+                      property.getPropertyKey().equals("lastName")){
+                  resourcePropertySet.add(property);
+              }
+          }
+        }
 
         prResource.setId(entity.getId());
         prResource.setResourceProperty(resourcePropertySet);