update

Author: mfriesen

aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/AttributeValueToMap.java

@@ -45,19 +45,39 @@ public Map<String, Object> apply(final Map<String, AttributeValue> map) {
     for (Map.Entry<String, AttributeValue> e : map.entrySet()) {
 
       String key = getKey(e.getKey());
-      String s = e.getValue().s();
-      String n = e.getValue().n();
 
-      if (isEmpty(s) && !isEmpty(n)) {
-        result.put(key, Double.valueOf(n));
-      } else {
-        result.put(key, s);
-      }
+      Object obj = convert(e.getValue());
+      result.put(key, obj);
     }
 
     return result;
   }
 
+  private Object convert(final AttributeValue val) {
+    Object obj = null;
+
+    switch (val.type()) {
+      case S -> {
+        obj = val.s();
+      }
+      case N -> {
+        obj = val.n();
+      }
+      case BOOL -> {
+        obj = val.b();
+      }
+      case L -> {
+        obj = val.l().stream().map(this::convert).toList();
+      }
+      default -> {
+        throw new IllegalArgumentException(
+            "Unsupported attribute value map conversion " + val.type());
+      }
+    }
+
+    return obj;
+  }
+
   private String getKey(final String key) {
 
     String k = key;

aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/MapToAttributeValue.java

@@ -25,6 +25,7 @@
 
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
@@ -42,17 +43,25 @@ public Map<String, AttributeValue> apply(final Map<String, Object> map) {
     Map<String, AttributeValue> result = new HashMap<>();
 
     for (Map.Entry<String, Object> e : map.entrySet()) {
-
-      if (e.getValue() instanceof Double d) {
-        result.put(e.getKey(), AttributeValue.fromN(String.valueOf(d)));
-      } else if (e.getValue() instanceof String s) {
-        result.put(e.getKey(), AttributeValue.fromS(s));
-      } else {
-        throw new IllegalArgumentException(
-            "Unsupported data type: " + e.getValue().getClass().getName());
-      }
+      AttributeValue a = convert(e.getValue());
+      result.put(e.getKey(), a);
     }
 
     return result;
   }
+
+  private AttributeValue convert(final Object obj) {
+    AttributeValue o = null;
+    if (obj instanceof Double d) {
+      o = AttributeValue.fromN(String.valueOf(d));
+    } else if (obj instanceof String s) {
+      o = AttributeValue.fromS(s);
+    } else if (obj instanceof Collection<?> c) {
+      o = AttributeValue.fromL(c.stream().map(this::convert).toList());
+    } else {
+      throw new IllegalArgumentException("Unsupported data type: " + obj.getClass().getName());
+    }
+
+    return o;
+  }
 }

aws-dynamodb/src/test/java/com/formkiq/aws/dynamodb/AttributeValueToMapTest.java

@@ -26,6 +26,7 @@
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 
+import java.util.List;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,20 +37,23 @@
 public class AttributeValueToMapTest {
 
   /** {@link AttributeValueToMap}. */
-  private AttributeValueToMap av = new AttributeValueToMap();
+  private final AttributeValueToMap av = new AttributeValueToMap();
 
   @Test
   void testApply01() {
     // given
     Map<String, AttributeValue> map = Map.of("contentType", AttributeValue.fromS("text/plain"),
-        "contentLength", AttributeValue.fromN("38"));
+        "contentLength", AttributeValue.fromN("38"), "ids",
+        AttributeValue.fromL(List.of(AttributeValue.fromS("123"), AttributeValue.fromS("444"))));
 
     // when
     Map<String, Object> result = av.apply(map);
 
     // then
-    assertEquals(2, result.size());
+    final int expected = 3;
+    assertEquals(expected, result.size());
     assertEquals("text/plain", result.get("contentType"));
-    assertEquals(Double.valueOf("38"), result.get("contentLength"));
+    assertEquals("38", result.get("contentLength").toString());
+    assertEquals("[123, 444]", result.get("ids").toString());
   }
 }

lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/CognitoRequestTest.java

@@ -400,7 +400,7 @@ public void testAddUser01() throws Exception {
       addUser(userApi, email, null);
     } catch (ApiException e) {
       // then
-      assertTrue(e.getResponseBody().contains("Invalid email address format"));
+      assertTrue(e.getResponseBody().contains("Username should be an email"));
     }
   }
 

lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/DocumentsDocumentIdUrlRequestTest.java

@@ -25,6 +25,7 @@
 
 import static com.formkiq.testutils.aws.FkqDocumentService.addDocument;
 import static com.formkiq.testutils.aws.FkqDocumentService.waitForDocumentContent;
+import static com.formkiq.testutils.aws.FkqDocumentService.waitForDocumentContentType;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.TimeUnit;
@@ -62,7 +63,7 @@ public void testGet01() throws Exception {
 
       // then
       GetDocumentContentResponse response =
-          waitForDocumentContent(client, siteId, documentId, text);
+          waitForDocumentContentType(client, siteId, documentId, "text/plain");
 
       assertEquals("text/plain", response.getContentType());
       assertEquals(text, response.getContent());

lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/DocumentsUploadRequestTest.java

@@ -404,6 +404,7 @@ public void testPost03() throws Exception {
       // then
       assertEquals(STATUS_OK, httpResponse.statusCode());
       waitForDocumentContent(client, siteId, documentId, content);
+      waitForDocumentContentType(client, siteId, documentId, "text/html");
       assertEquals("text/html", api.getDocument(documentId, siteId, null).getContentType());
 
       // given