[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 bfb05ee  Bug fix in create storage
     new 357e3c8  Merge pull request #133 from isururanawaka/mysql_conversion
bfb05ee is described below

commit bfb05ee92b531403ab6bce22825b978b52735484
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Tue Aug 16 14:59:41 2022 -0400

    Bug fix in create storage
---
 .../org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java | 4 ++--
 .../airavata/drms/api/persistance/repository/ResourceRepository.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 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 67f08a8..8cf1f81 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
@@ -169,10 +169,10 @@ public class ResourceServiceHandler extends 
ResourceServiceGrpc.ResourceServiceI
                     List<GenericResource> genericResources = new ArrayList<>();
                     List<Resource> resources;
                     if (limit > 0) {
-                        resources = 
resourceRepository.findAllByParentResourceIdAndTenantIdAndTypeWithPagination(resourceId
+                        resources = 
resourceRepository.findAllByParentResourceIdAndTenantIdAndResourceTypeWithPagination(resourceId
                                 , callUser.getTenantId(), type, limit, offset);
                     } else {
-                        resources = 
resourceRepository.findAllByParentResourceIdAndTenantIdAndType(resourceId,
+                        resources = 
resourceRepository.findAllByParentResourceIdAndTenantIdAndResourceType(resourceId,
                                 callUser.getTenantId(), type);
                     }
 
diff --git 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/ResourceRepository.java
 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/ResourceRepository.java
index e908ae2..355a9bd 100644
--- 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/ResourceRepository.java
+++ 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/repository/ResourceRepository.java
@@ -12,9 +12,9 @@ public interface ResourceRepository extends 
JpaRepository<Resource, String> {
 
     @Query(value = "select * from RESOURCE t where t.parent_resource_id =?1 
and  t.tenant_id = ?2 and  t.type = ?3 " +
             "order by t.id limit ?3 offset ?4", nativeQuery = true)
-    List<Resource> 
findAllByParentResourceIdAndTenantIdAndTypeWithPagination(String 
parentResourdeId, String tenantId, String type,
+    List<Resource> 
findAllByParentResourceIdAndTenantIdAndResourceTypeWithPagination(String 
parentResourdeId, String tenantId, String type,
                                                                              
int limit, int offset);
 
 
-    List<Resource> findAllByParentResourceIdAndTenantIdAndType(String 
parentResourdeId, String tenantId, String type);
+    List<Resource> findAllByParentResourceIdAndTenantIdAndResourceType(String 
parentResourdeId, String tenantId, String type);
 }