update

formkiq · Jul 9, 2024 · 58f8fbc · 58f8fbc
1 parent 99ed1bd
commit 58f8fbc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/lambda-api/src/main/java/com/formkiq/stacks/api/handler/GroupsUsersRequestHandler.java b/lambda-api/src/main/java/com/formkiq/stacks/api/handler/GroupsUsersRequestHandler.java
@@ -69,8 +69,8 @@ public ApiRequestHandlerResponse get(final LambdaLogger logger,
 
     ListUsersInGroupResponse response = service.listUsersInGroup(groupName, token, limit);
 
-    List<Map<String, Object>> users = response.users().stream().sorted(new UserTypeComparator())
-        .map(new UsersResponseToMap()).toList();
+    List<Map<String, Object>> users = response.users().stream().map(new UsersResponseToMap())
+        .sorted(new UserTypeComparator()).toList();
 
     Map<String, Object> map = new HashMap<>();
     map.put("users", users);

diff --git a/lambda-api/src/main/java/com/formkiq/stacks/api/handler/UserRequestHandler.java b/lambda-api/src/main/java/com/formkiq/stacks/api/handler/UserRequestHandler.java
@@ -65,8 +65,8 @@ public ApiRequestHandlerResponse get(final LambdaLogger logger,
     Map<String, Object> map = new HashMap<>();
 
     if (!response.users().isEmpty()) {
-      List<Map<String, Object>> users = response.users().stream().sorted(new UserTypeComparator())
-          .map(new UsersResponseToMap()).toList();
+      List<Map<String, Object>> users = response.users().stream().map(new UsersResponseToMap())
+          .sorted(new UserTypeComparator()).toList();
 
       map.put("user", users.get(0));
     }

diff --git a/lambda-api/src/main/java/com/formkiq/stacks/api/handler/UsersRequestHandler.java b/lambda-api/src/main/java/com/formkiq/stacks/api/handler/UsersRequestHandler.java
@@ -67,8 +67,8 @@ public ApiRequestHandlerResponse get(final LambdaLogger logger,
 
     ListUsersResponse response = service.listUsers(token, limit);
 
-    List<Map<String, Object>> users = response.users().stream().sorted(new UserTypeComparator())
-        .map(new UsersResponseToMap()).toList();
+    List<Map<String, Object>> users = response.users().stream().map(new UsersResponseToMap())
+        .sorted(new UserTypeComparator()).toList();
 
     Map<String, Object> map = new HashMap<>();
     map.put("users", users);

diff --git a/lambda-api/src/main/java/com/formkiq/stacks/api/transformers/UserTypeComparator.java b/lambda-api/src/main/java/com/formkiq/stacks/api/transformers/UserTypeComparator.java
@@ -27,20 +27,22 @@
 
 import java.io.Serializable;
 import java.util.Comparator;
+import java.util.Map;
 
 /**
  * {@link Comparator} for {@link UserType}.
  */
-public class UserTypeComparator implements Comparator<UserType>, Serializable {
+public class UserTypeComparator implements Comparator<Map<String, Object>>, Serializable {
   @Override
-  public int compare(final UserType o1, final UserType o2) {
+  public int compare(final Map<String, Object> o1, final Map<String, Object> o2) {
     String u1 = getUserName(o1);
     String u2 = getUserName(o2);
     return u1.compareTo(u2);
   }
 
-  private String getUserName(final UserType ut) {
-    int pos = ut.username().indexOf("@");
-    return pos > -1 ? ut.username().substring(0, pos) : ut.username();
+  private String getUserName(final Map<String, Object> ut) {
+    String username = (String) ut.get("email");
+    int pos = username.indexOf("@");
+    return pos > -1 ? username.substring(0, pos) : username;
   }
 }