update

formkiq · Jul 6, 2024 · 159ee10 · 159ee10
1 parent 73c644a
commit 159ee10
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 29 deletions.
diff --git a/lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/CognitoRequestTest.java b/lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/CognitoRequestTest.java
@@ -54,7 +54,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 /**
@@ -126,7 +125,7 @@ public void testGetUsers01() throws Exception {
       assertNotNull(user.getUsername());
       assertNotNull(user.getUserStatus());
       assertNotNull(user.getEmail());
-      assertTrue(user.getEnabled());
+      assertEquals(Boolean.TRUE, user.getEnabled());
       assertNotNull(user.getInsertedDate());
       assertNotNull(user.getLastModifiedDate());
     }
@@ -210,6 +209,7 @@ public void testGetGroupUsers01() throws Exception {
       User user = users.get(0);
 
       assertNotNull(user.getUsername());
+      assertNotNull(user.getEmail());
       assertNotNull(user.getUserStatus());
       assertNotNull(user.getInsertedDate());
       assertNotNull(user.getLastModifiedDate());
@@ -258,6 +258,7 @@ public void testAddGroupAndUser01() throws Exception {
       List<User> usersInGroup = notNull(userApi.getUsersInGroup(groupName, null, null).getUsers());
       assertEquals(1, usersInGroup.size());
       assertNotNull(usersInGroup.get(0).getUsername());
+      assertNotNull(usersInGroup.get(0).getEmail());
 
       List<Group> groups = notNull(userApi.getListOfUserGroups(email, null, null).getGroups());
       assertEquals(1, groups.size());

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
@@ -23,19 +23,8 @@
  */
 package com.formkiq.stacks.api.handler;
 
-import static com.formkiq.aws.services.lambda.ApiResponseStatus.SC_CREATED;
-import static com.formkiq.aws.services.lambda.ApiResponseStatus.SC_OK;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
 import com.amazonaws.services.lambda.runtime.LambdaLogger;
 import com.formkiq.aws.cognito.CognitoIdentityProviderService;
-import com.formkiq.aws.dynamodb.objects.DateUtil;
 import com.formkiq.aws.services.lambda.ApiAuthorization;
 import com.formkiq.aws.services.lambda.ApiGatewayRequestEvent;
 import com.formkiq.aws.services.lambda.ApiGatewayRequestEventUtil;
@@ -44,8 +33,17 @@
 import com.formkiq.aws.services.lambda.ApiPermission;
 import com.formkiq.aws.services.lambda.ApiRequestHandlerResponse;
 import com.formkiq.module.lambdaservices.AwsServiceCache;
+import com.formkiq.stacks.api.transformers.UsersResponseToMap;
 import software.amazon.awssdk.services.cognitoidentityprovider.model.ListUsersInGroupResponse;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.formkiq.aws.services.lambda.ApiResponseStatus.SC_CREATED;
+import static com.formkiq.aws.services.lambda.ApiResponseStatus.SC_OK;
+
 /** {@link ApiGatewayRequestHandler} for "/groups/{groupName}/users". */
 public class GroupsUsersRequestHandler
     implements ApiGatewayRequestHandler, ApiGatewayRequestEventUtil {
@@ -68,14 +66,9 @@ public ApiRequestHandlerResponse get(final LambdaLogger logger,
     CognitoIdentityProviderService service =
         awsservice.getExtension(CognitoIdentityProviderService.class);
 
-    SimpleDateFormat df = DateUtil.getIsoDateFormatter();
     ListUsersInGroupResponse response = service.listUsersInGroup(groupName, token, limit);
 
-    List<Map<String, String>> users = response.users().stream()
-        .map(u -> Map.of("username", u.username(), "userStatus", u.userStatusAsString(),
-            "insertedDate", toString(df, u.userCreateDate()), "lastModifiedDate",
-            toString(df, u.userLastModifiedDate())))
-        .collect(Collectors.toList());
+    List<Map<String, Object>> users = response.users().stream().map(new UsersResponseToMap()).toList();
 
     Map<String, Object> map = new HashMap<>();
     map.put("users", users);
@@ -109,16 +102,6 @@ public String getRequestUrl() {
     return URL;
   }
 
-  private String toString(final SimpleDateFormat df, final Instant date) {
-    String result = "";
-
-    if (date != null) {
-      result = df.format(Date.from(date));
-    }
-
-    return result;
-  }
-
   @Override
   public Optional<Boolean> isAuthorized(final AwsServiceCache awsServiceCache, final String method,
       final ApiGatewayRequestEvent event, final ApiAuthorization authorization) {