[airavata-data-lake] branch master updated: Bug fix in create storage

[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 09e5000  Bug fix in create storage
     new d09bdfc  Merge pull request #130 from isururanawaka/mysql_conversion
09e5000 is described below

commit 09e50003d53f838b3d156da729a5146260167d5f
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Tue Aug 16 14:19:37 2022 -0400

    Bug fix in create storage
---
 .../airavata/drms/api/handlers/StorageServiceHandler.java     | 11 +++--------
 .../airavata/drms/api/persistance/mapper/StorageMapper.java   |  6 ++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java
 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java
index df6df13..d3de3e2 100644
--- 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java
+++ 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/StorageServiceHandler.java
@@ -123,11 +123,8 @@ public class StorageServiceHandler extends 
StorageServiceGrpc.StorageServiceImpl
 
             Resource resource = StorageMapper.map(storage, callUser);
 
-            Map<String, Object> serializedMap = 
AnyStorageSerializer.serializeToMap(storage);
-            String storageId = (String) serializedMap.get("storageId");
-
             CustosUtils.
-                    mergeStorageEntity(custosClientProvider, 
callUser.getTenantId(), storageId, callUser.getUsername());
+                    mergeStorageEntity(custosClientProvider, 
callUser.getTenantId(), resource.getId(), callUser.getUsername());
 
             resourceRepository.save(resource);
 
@@ -156,15 +153,13 @@ public class StorageServiceHandler extends 
StorageServiceGrpc.StorageServiceImpl
 
             Resource resource = StorageMapper.map(storage, callUser);
 
-            Map<String, Object> serializedMap = 
AnyStorageSerializer.serializeToMap(storage);
-            String storageId = (String) serializedMap.get("storageId");
 
             boolean access = CustosUtils.userHasAccess(custosClientProvider, 
callUser.getTenantId(),
-                    callUser.getUsername(), storageId,
+                    callUser.getUsername(), resource.getId(),
                     SharingConstants.PERMISSION_TYPE_VIEWER);
 
             if (access) {
-                Optional<Resource> optionalResource = 
resourceRepository.findById(storageId);
+                Optional<Resource> optionalResource = 
resourceRepository.findById(resource.getId());
 
 
                 if (optionalResource.isPresent()) {
diff --git 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StorageMapper.java
 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StorageMapper.java
index 5fe8bd4..cf62336 100644
--- 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StorageMapper.java
+++ 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StorageMapper.java
@@ -61,12 +61,16 @@ public class StorageMapper {
                 allFields = sshStorage.getAllFields();
                 resourcePropertySet.add(new 
ResourceProperty(StorageConstants.STORAGE_TYPE_LABEL,
                         StorageConstants.SSH_STORAGE_TYPE_LABEL, prResource));
+                prResource.setType(StorageConstants.SSH_STORAGE_TYPE_LABEL);
+                prResource.setId(sshStorage.getStorageId());
                 break;
             case S3_STORAGE:
                 S3Storage s3Storage = anyStorage.getS3Storage();
                 allFields = s3Storage.getAllFields();
                 resourcePropertySet.add(new 
ResourceProperty(StorageConstants.STORAGE_TYPE_LABEL,
                         StorageConstants.S3_STORAGE_TYPE_LABEL, prResource));
+                prResource.setType(StorageConstants.S3_STORAGE_TYPE_LABEL);
+                prResource.setId(s3Storage.getStorageId());
                 break;
             case STORAGE_NOT_SET:
                 break;
@@ -80,6 +84,8 @@ public class StorageMapper {
         }
 
         resourcePropertySet.add(new ResourceProperty("tenantId", 
authenticatedUser.getTenantId(), prResource));
+        prResource.setResourceProperty(resourcePropertySet);
+
         return prResource;
     }