update

mfriesen · mfriesen · commit ba3030da45ec · 2024-10-08T18:34:03.000-05:00
diff --git a/docs/openapi/openapi-iam.yaml b/docs/openapi/openapi-iam.yaml
@@ -7942,6 +7942,7 @@
               - UPDATE
               - DELETE
               - SOFT_DELETE
+              - RESTORE
             UserActivity:
               type: object
               properties:
diff --git a/docs/openapi/openapi-jwt.yaml b/docs/openapi/openapi-jwt.yaml
@@ -7942,6 +7942,7 @@
               - UPDATE
               - DELETE
               - SOFT_DELETE
+              - RESTORE
             UserActivity:
               type: object
               properties:
diff --git a/docs/openapi/openapi-key.yaml b/docs/openapi/openapi-key.yaml
@@ -7942,6 +7942,7 @@
               - UPDATE
               - DELETE
               - SOFT_DELETE
+              - RESTORE
             UserActivity:
               type: object
               properties:
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
@@ -1764,6 +1764,10 @@ public boolean restoreSoftDeletedDocument(final String siteId, final String docu
       restored = this.dbService.moveItems(list,
           new DocumentRestoreMoveAttributeFunction(siteId, documentId));
 
+      if (this.interceptor != null) {
+        this.interceptor.restoreSoftDeletedDocument(siteId, documentId);
+      }
+
       String path = attr.get("path").s();
       String userId = attr.get("userId").s();
 
diff --git a/dynamodb-documents/src/main/java/com/formkiq/stacks/dynamodb/DocumentServiceInterceptor.java b/dynamodb-documents/src/main/java/com/formkiq/stacks/dynamodb/DocumentServiceInterceptor.java
@@ -49,4 +49,12 @@ void saveDocument(String siteId, String documentId, Map<String, Object> current,
    * @param softDelete boolean
    */
   void deleteDocument(String siteId, String documentId, boolean softDelete);
+
+  /**
+   * Restore Soft Deleted Document Inteerceptor.
+   * 
+   * @param siteId {@link String}
+   * @param documentId {@link String}
+   */
+  void restoreSoftDeletedDocument(String siteId, String documentId);
 }
diff --git a/fkq-plugins/src/main/java/com/formkiq/plugins/useractivity/UserActivityPlugin.java b/fkq-plugins/src/main/java/com/formkiq/plugins/useractivity/UserActivityPlugin.java
@@ -73,4 +73,12 @@ public interface UserActivityPlugin {
    * @param documentId {@link String}
    */
   void deleteSoftDocumentActivity(String siteId, String documentId);
+
+  /**
+   * Restore Soft Delete Document Activity.
+   * 
+   * @param siteId {@link String}
+   * @param documentId {@link String}
+   */
+  void restoreSoftDeletedDocumentActivity(String siteId, String documentId);
 }
diff --git a/lambda-api-graalvm/src/main/resources/cloudformation/openapi-iam.yaml b/lambda-api-graalvm/src/main/resources/cloudformation/openapi-iam.yaml
@@ -7986,6 +7986,7 @@ Resources:
                 - UPDATE
                 - DELETE
                 - SOFT_DELETE
+                - RESTORE
             UserActivity:
               type: "object"
               properties:
diff --git a/lambda-api-graalvm/src/main/resources/cloudformation/openapi-jwt.yaml b/lambda-api-graalvm/src/main/resources/cloudformation/openapi-jwt.yaml
@@ -7986,6 +7986,7 @@ Resources:
                 - UPDATE
                 - DELETE
                 - SOFT_DELETE
+                - RESTORE
             UserActivity:
               type: "object"
               properties:
diff --git a/lambda-api-graalvm/src/main/resources/cloudformation/openapi-key.yaml b/lambda-api-graalvm/src/main/resources/cloudformation/openapi-key.yaml
@@ -7986,6 +7986,7 @@ Resources:
                 - UPDATE
                 - DELETE
                 - SOFT_DELETE
+                - RESTORE
             UserActivity:
               type: "object"
               properties:
diff --git a/lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/ConfigurationApiKeyRequestTest.java b/lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/ConfigurationApiKeyRequestTest.java
@@ -234,7 +234,7 @@ public void testAddApiKey01() throws Exception {
       // then
       ApiClient apiClientWithToken = getApiClientWithToken(response.getApiKey());
       api = new SystemManagementApi(apiClientWithToken);
-      List<Site> sites = notNull(api.getSites().getSites());
+      List<Site> sites = notNull(api.getSites(null).getSites());
       assertEquals(1, sites.size());
       assertEquals(siteId, sites.get(0).getSiteId());
       assertEquals("GOVERN",
diff --git a/lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/SitesRequestTest.java b/lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/SitesRequestTest.java
@@ -62,7 +62,7 @@ public void testSites01() throws Exception {
       SystemManagementApi api = new SystemManagementApi(apiClient);
 
       // when
-      GetSitesResponse sites = api.getSites();
+      GetSitesResponse sites = api.getSites(null);
 
       // then
       assertEquals(1, sites.getSites().size());
diff --git a/lambda-api/src/test/java/com/formkiq/stacks/api/handler/DocumentsIdRequestTest.java b/lambda-api/src/test/java/com/formkiq/stacks/api/handler/DocumentsIdRequestTest.java
@@ -211,12 +211,13 @@ private List<Document> getDocuments(final String siteId) throws ApiException {
         .getDocuments());
   }
 
-  @NotNull
-  private List<Document> getSoftDeletedDocuments(final String siteId) throws ApiException {
+  @NotNullprivate
+  List<Document> getSoftDeletedDocuments(final String siteId) throws ApiException {
     return notNull(this.documentsApi
         .getDocuments(siteId, null, Boolean.TRUE, null, null, null, null, null).getDocuments());
   }
 
+
   /**
    * PUT /documents/{documentId}/restore request.
    *
diff --git a/lambda-api/src/test/java/com/formkiq/stacks/api/handler/SitesRequestTest.java b/lambda-api/src/test/java/com/formkiq/stacks/api/handler/SitesRequestTest.java
@@ -138,7 +138,7 @@ public void testHandleGetSites01() throws Exception {
     ssm.putParameter("/formkiq/" + FORMKIQ_APP_ENVIRONMENT + "/maildomain", "tryformkiq.com");
 
     // when
-    GetSitesResponse response = this.systemApi.getSites();
+    GetSitesResponse response = this.systemApi.getSites(null);
 
     // then
     List<Site> sites = response.getSites();
@@ -187,7 +187,7 @@ public void testHandleGetSites02() throws Exception {
     setBearerToken(new String[] {"default", "Admins", "finance"});
 
     // when
-    GetSitesResponse response = this.systemApi.getSites();
+    GetSitesResponse response = this.systemApi.getSites(null);
 
     // then
     List<Site> sites = response.getSites();
@@ -216,7 +216,7 @@ public void testHandleGetSites03() throws Exception {
     setBearerToken(new String[] {"default_read", "finance"});
 
     // when
-    GetSitesResponse response = this.systemApi.getSites();
+    GetSitesResponse response = this.systemApi.getSites(null);
 
     // then
     List<Site> sites = response.getSites();
@@ -256,7 +256,7 @@ public void testHandleGetSites04() throws Exception {
     config.save(siteId, new DynamicObject(Map.of(MAX_DOCUMENTS, "5", MAX_WEBHOOKS, "10")));
 
     // when
-    GetSitesResponse response = this.systemApi.getSites();
+    GetSitesResponse response = this.systemApi.getSites(null);
 
     // then
     List<Site> sites = response.getSites();
@@ -278,7 +278,7 @@ public void testHandleGetSites05() {
 
     // when
     try {
-      this.systemApi.getSites();
+      this.systemApi.getSites(null);
       fail();
     } catch (ApiException e) {
       // then
