update

formkiq · Jun 16, 2024 · a9f6f12 · a9f6f12
1 parent 431af2b
commit a9f6f12
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 5 deletions.
diff --git a/aws-s3/src/main/java/com/formkiq/aws/s3/S3PresignerService.java b/aws-s3/src/main/java/com/formkiq/aws/s3/S3PresignerService.java
@@ -45,7 +45,7 @@
 public class S3PresignerService {
 
   /** {@link S3ConnectionBuilder}. */
-  private S3PresignerConnectionBuilder builder;
+  private final S3PresignerConnectionBuilder builder;
 
   /**
    * Constructor.
@@ -79,9 +79,7 @@ public URL presignGetUrl(final String bucket, final String key, final Duration d
           .signatureDuration(duration).getObjectRequest(getObjectRequest).build();
 
       PresignedGetObjectRequest req = signer.presignGetObject(getRequest);
-      URL url = req.url();
-
-      return url;
+      return req.url();
     }
   }
 

diff --git a/docs/openapi/openapi-iam.yaml b/docs/openapi/openapi-iam.yaml
@@ -7185,6 +7185,7 @@
               - KEY_ONLY
               - NUMBER
               - STRING
+              - PUBLICATION
             FulltextAttribute:
               type: object
               properties:
@@ -8397,6 +8398,7 @@
               - NUMBER
               - BOOLEAN
               - KEY_ONLY
+              - PUBLICATION
             AddAttributeRequest:
               required:
               - attribute

diff --git a/docs/openapi/openapi-jwt.yaml b/docs/openapi/openapi-jwt.yaml
@@ -7185,6 +7185,7 @@
               - KEY_ONLY
               - NUMBER
               - STRING
+              - PUBLICATION
             FulltextAttribute:
               type: object
               properties:
@@ -8397,6 +8398,7 @@
               - NUMBER
               - BOOLEAN
               - KEY_ONLY
+              - PUBLICATION
             AddAttributeRequest:
               required:
               - attribute

diff --git a/docs/openapi/openapi-key.yaml b/docs/openapi/openapi-key.yaml
@@ -7185,6 +7185,7 @@
               - KEY_ONLY
               - NUMBER
               - STRING
+              - PUBLICATION
             FulltextAttribute:
               type: object
               properties:
@@ -8397,6 +8398,7 @@
               - NUMBER
               - BOOLEAN
               - KEY_ONLY
+              - PUBLICATION
             AddAttributeRequest:
               required:
               - attribute

diff --git a/dynamodb-documents/src/main/java/com/formkiq/stacks/dynamodb/DocumentServiceImpl.java b/dynamodb-documents/src/main/java/com/formkiq/stacks/dynamodb/DocumentServiceImpl.java
@@ -76,6 +76,7 @@
 import com.formkiq.aws.dynamodb.objects.DateUtil;
 import com.formkiq.aws.dynamodb.objects.Objects;
 import com.formkiq.aws.dynamodb.objects.Strings;
+import com.formkiq.stacks.dynamodb.attributes.AttributeDataType;
 import com.formkiq.stacks.dynamodb.attributes.AttributeKeyReserved;
 import com.formkiq.stacks.dynamodb.attributes.AttributeRecord;
 import com.formkiq.stacks.dynamodb.attributes.AttributeService;
@@ -1486,13 +1487,23 @@ private boolean isPathChanges(final Map<String, AttributeValue> previous,
   @Override
   public void publishDocument(final String siteId, final String documentId, final String s3version,
       final String path, final String contentType, final String userId) {
+
     DocumentAttributePublicationValue val = new DocumentAttributePublicationValue().setPath(path)
         .setS3version(s3version).setContentType(contentType);
+
     DocumentAttributeRecord r = new DocumentAttributeRecord().setDocumentId(documentId)
         .setKey(AttributeKeyReserved.PUBLICATION.getKey()).setUserId(userId)
         .setInsertedDate(new Date()).setPublicationValue(val);
     r.updateValueType();
+
     this.dbService.putItem(r.getAttributes(siteId));
+
+    AttributeRecord a = new AttributeRecord().documentId(AttributeKeyReserved.PUBLICATION.getKey())
+        .key(AttributeKeyReserved.PUBLICATION.getKey()).type(AttributeType.STANDARD)
+        .dataType(AttributeDataType.PUBLICATIONS);
+    if (!this.dbService.exists(a.fromS(a.pk(siteId)), a.fromS(a.sk()))) {
+      this.dbService.putItem(a.getAttributes(siteId));
+    }
   }
 
   /**

diff --git a/...odb-documents/src/main/java/com/formkiq/stacks/dynamodb/attributes/AttributeDataType.java b/...odb-documents/src/main/java/com/formkiq/stacks/dynamodb/attributes/AttributeDataType.java
@@ -34,5 +34,7 @@ public enum AttributeDataType {
   /** Number. */
   NUMBER,
   /** {@link String}. */
-  STRING;
+  STRING,
+  /** Publication. */
+  PUBLICATIONS;
 }
diff --git a/lambda-api-graalvm/src/main/resources/cloudformation/openapi-iam.yaml b/lambda-api-graalvm/src/main/resources/cloudformation/openapi-iam.yaml
@@ -7220,6 +7220,7 @@ Resources:
                 - KEY_ONLY
                 - NUMBER
                 - STRING
+                - PUBLICATION
             FulltextAttribute:
               type: "object"
               properties:
@@ -8477,6 +8478,7 @@ Resources:
                 - NUMBER
                 - BOOLEAN
                 - KEY_ONLY
+                - PUBLICATION
 
             AddAttributeRequest:
               required:

diff --git a/lambda-api-graalvm/src/main/resources/cloudformation/openapi-jwt.yaml b/lambda-api-graalvm/src/main/resources/cloudformation/openapi-jwt.yaml
@@ -7220,6 +7220,7 @@ Resources:
                 - KEY_ONLY
                 - NUMBER
                 - STRING
+                - PUBLICATION
             FulltextAttribute:
               type: "object"
               properties:
@@ -8477,6 +8478,7 @@ Resources:
                 - NUMBER
                 - BOOLEAN
                 - KEY_ONLY
+                - PUBLICATION
 
             AddAttributeRequest:
               required:

diff --git a/lambda-api-graalvm/src/main/resources/cloudformation/openapi-key.yaml b/lambda-api-graalvm/src/main/resources/cloudformation/openapi-key.yaml
@@ -7220,6 +7220,7 @@ Resources:
                 - KEY_ONLY
                 - NUMBER
                 - STRING
+                - PUBLICATION
             FulltextAttribute:
               type: "object"
               properties:
@@ -8477,6 +8478,7 @@ Resources:
                 - NUMBER
                 - BOOLEAN
                 - KEY_ONLY
+                - PUBLICATION
 
             AddAttributeRequest:
               required:

diff --git a/lambda-s3/src/test/java/com/formkiq/stacks/lambda/s3/DocumentActionsProcessorTest.java b/lambda-s3/src/test/java/com/formkiq/stacks/lambda/s3/DocumentActionsProcessorTest.java
@@ -53,6 +53,8 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import com.formkiq.stacks.dynamodb.attributes.AttributeKeyReserved;
+import com.formkiq.stacks.dynamodb.attributes.AttributeRecord;
 import com.formkiq.stacks.dynamodb.documents.DocumentAttributePublicationValue;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.AfterAll;
@@ -1814,6 +1816,10 @@ public void testPublishAction01() throws Exception {
       assertEquals(documentId, pv.getPath());
       assertEquals("joe", pd.getUserId());
       assertNotNull(pv.getS3version());
+
+      AttributeRecord attribute =
+          attributeService.getAttribute(siteId, AttributeKeyReserved.PUBLICATION.getKey());
+      assertNotNull(attribute);
     }
   }
 }