airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] branch group-based-auth updated: AIRAVATA-2685 Allow loading all user profiles, without paging
Date Thu, 22 Feb 2018 15:31:42 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/group-based-auth by this push:
     new 7fe25f1  AIRAVATA-2685 Allow loading all user profiles, without paging
7fe25f1 is described below

commit 7fe25f18b1aa97a2b8ff1674b98afec05ca09ab0
Author: Marcus Christie <machristie@apache.org>
AuthorDate: Thu Feb 22 10:31:18 2018 -0500

    AIRAVATA-2685 Allow loading all user profiles, without paging
---
 .../user/core/repositories/UserProfileRepository.java       | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java
b/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java
index 953c114..bb3e217 100644
--- a/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java
+++ b/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java
@@ -63,10 +63,15 @@ public class UserProfileRepository extends AbstractRepository<UserProfile,
UserP
 
     public List<UserProfile> getAllUserProfilesInGateway(String gatewayId, int offset,
int limit)  {
 
-        Map<String, Object> queryParam = new HashMap<String, Object>();
-        queryParam.put(UserProfile._Fields.GATEWAY_ID.getFieldName(), gatewayId);
-
-        List<UserProfile> resultList = select(QueryConstants.FIND_ALL_USER_PROFILES_BY_GATEWAY_ID,
limit, offset, queryParam);
+        Map<String, Object> queryParams = new HashMap<String, Object>();
+        queryParams.put(UserProfile._Fields.GATEWAY_ID.getFieldName(), gatewayId);
+
+        List<UserProfile> resultList = null;
+        if (limit > 0) {
+            resultList = select(QueryConstants.FIND_ALL_USER_PROFILES_BY_GATEWAY_ID, limit,
offset, queryParams);
+        } else {
+            resultList = select(QueryConstants.FIND_ALL_USER_PROFILES_BY_GATEWAY_ID, queryParams);
+        }
 
         return  resultList;
     }

-- 
To stop receiving notification emails like this one, please contact
machristie@apache.org.

Mime
View raw message