update

Author: mfriesen

fkq-lambda-core/src/main/java/com/formkiq/aws/services/lambda/ApiGatewayRequestToUserActivityFunction.java

@@ -65,8 +65,8 @@ public class ApiGatewayRequestToUserActivityFunction {
   public UserActivity.Builder apply(final ApiAuthorization authorization,
       final ApiGatewayRequestEvent request, final ApiRequestHandlerResponse response) {
 
-    UserActivity.Builder builder =
-        UserActivity.builder().source("HTTP").status(UserActivityStatus.COMPLETE);
+    UserActivity.Builder builder = UserActivity.builder().source("HTTP")
+        .status(UserActivityStatus.COMPLETE).insertedDate(getInsertedDate(request));
 
     if (response != null) {
       builder = builder.status(response.statusCode());
@@ -85,8 +85,7 @@ public UserActivity.Builder apply(final ApiAuthorization authorization,
       String activityType = getType(request);
 
       builder = builder.resource(resource).entityNamespace(entityNamespace).type(activityType)
-          .insertedDate(getInsertedDate(request)).sourceIpAddress(getSourceIp(request))
-          .body(getBody(request))
+          .sourceIpAddress(getSourceIp(request)).body(getBody(request))
           .userId(authorization != null ? authorization.getUsername() : "System");
 
       if (isGenerateS3Key(request)) {
@@ -130,7 +129,7 @@ private String findResourceId(final ApiGatewayRequestEvent request,
    */
   private static String getResource(final ApiGatewayRequestEvent request) {
     String[] split = request.getResource().split("/");
-    return split[1].toLowerCase();
+    return split[1];
   }
 
   private static String getType(final ApiGatewayRequestEvent request) {

fkq-lambda-core/src/test/java/com/formkiq/aws/services/lambda/ApiGatewayRequestToUserActivityFunctionTest.java

@@ -101,7 +101,7 @@ public void testGetDocumentById() throws IOException {
         assertNull(activity.message());
 
         final long expectedTime = 1750944882199L;
-        assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate());
+        assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate().toInstant());
         assertEquals(request.getPathParameters().get("documentId"), activity.documentId());
       }
     }
@@ -144,7 +144,7 @@ public void testDeleteDocumentById() throws IOException {
       assertNull(activity.message());
 
       final long expectedTime = 1546105259536L;
-      assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate());
+      assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate().toInstant());
       assertEquals(request.getPathParameters().get("documentId"), activity.documentId());
     }
   }
@@ -183,7 +183,7 @@ public void testGetDocuments() throws IOException {
       assertNull(activity.message());
 
       final long expectedTime = 1750944882199L;
-      assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate());
+      assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate().toInstant());
     }
   }
 
@@ -209,7 +209,7 @@ public void testNull() {
     assertNull(activity.sourceIpAddress());
     assertEquals(UserActivityStatus.COMPLETE, activity.status());
     assertNull(activity.message());
-    assertNull(activity.insertedDate());
+    assertNotNull(activity.insertedDate());
   }
 
   private int getYear() {
@@ -236,7 +236,7 @@ public void testGetEntityTypes() throws IOException {
 
       // then
       assertNotNull(activity);
-      assertEquals("entitytypes", activity.resource());
+      assertEquals("entityTypes", activity.resource());
       assertEquals("HTTP", activity.source());
       assertEquals("view", activity.type());
       assertNull(activity.entityId());
@@ -251,7 +251,7 @@ public void testGetEntityTypes() throws IOException {
       assertNull(activity.message());
 
       final long expectedTime = 1751589734043L;
-      assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate());
+      assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate().toInstant());
     }
   }
 
@@ -280,7 +280,7 @@ public void testAddEntityTypes() throws IOException {
 
       // then
       assertNotNull(activity);
-      assertEquals("entitytypes", activity.resource());
+      assertEquals("entityTypes", activity.resource());
       assertEquals("HTTP", activity.source());
       assertEquals("create", activity.type());
       assertEquals("""
@@ -295,7 +295,7 @@ public void testAddEntityTypes() throws IOException {
       assertEquals(body.get("entityTypeId"), activity.entityTypeId());
       assertNull(activity.documentId());
 
-      String expectedS3 = "activities/" + getSiteIdName(siteId) + "/entitytypes/year=" + getYear()
+      String expectedS3 = "activities/" + getSiteIdName(siteId) + "/entityTypes/year=" + getYear()
           + "/month=" + getMonth() + "/day=" + getDay() + "/" + activity.entityTypeId() + "/";
       assertTrue(activity.s3Key().startsWith(expectedS3));
 
@@ -304,7 +304,7 @@ public void testAddEntityTypes() throws IOException {
       assertNull(activity.message());
 
       final long expectedTime = 1751589856468L;
-      assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate());
+      assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate().toInstant());
     }
   }
 
@@ -354,7 +354,7 @@ public void testAddEntity() throws IOException {
       assertNull(activity.message());
 
       final long expectedTime = 1751636384960L;
-      assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate());
+      assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate().toInstant());
     }
   }
 
@@ -395,7 +395,7 @@ public void testGetEntitiesByType() throws IOException {
       assertNull(activity.message());
 
       final long expectedTime = 1751636079140L;
-      assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate());
+      assertEquals(Instant.ofEpochMilli(expectedTime), activity.insertedDate().toInstant());
     }
   }
 

fkq-plugins/src/main/java/com/formkiq/plugins/useractivity/UserActivity.java

@@ -24,6 +24,7 @@
 package com.formkiq.plugins.useractivity;
 
 import java.time.Instant;
+import java.util.Date;
 
 /**
  * Represents an activity performed by a user on a document or entity. This includes metadata such
@@ -43,7 +44,7 @@ public record UserActivity(
     String userId,
 
     /* The timestamp when the activity was recorded. */
-    Instant insertedDate,
+    Date insertedDate,
 
     /* The S3 object key for the stored document or metadata. */
     String s3Key,
@@ -221,8 +222,8 @@ public Builder entityNamespace(final String activityEntityNamespace) {
      * @return a new {@link UserActivity} object
      */
     public UserActivity build() {
-      return new UserActivity(resource, documentId, type, userId, insertedDate, s3Key, message,
-          status, sourceIpAddress, source, entityTypeId, entityId, entityNamespace, body);
+      return new UserActivity(resource, documentId, type, userId, Date.from(insertedDate), s3Key,
+          message, status, sourceIpAddress, source, entityTypeId, entityId, entityNamespace, body);
     }
   }
 }