update

Author: mfriesen

dynamodb-documents/src/main/java/com/formkiq/stacks/dynamodb/DocumentServiceImpl.java

@@ -442,9 +442,11 @@ public boolean deleteDocument(final String siteId, final String documentId,
 
     this.versionsService.deleteAllVersionIds(this.dbClient, siteId, documentId);
 
-    DocumentItem item = findDocument(siteId, documentId);
+    Map<String, AttributeValue> documentRecord = getDocumentRecord(siteId, documentId);
 
-    deleteFolderIndex(siteId, item);
+    if (documentRecord.containsKey("path")) {
+      deleteFolderIndex(siteId, documentRecord.get("path").s());
+    }
 
     Map<String, AttributeValue> keys = keysGeneric(siteId, PREFIX_DOCS + documentId, null);
     AttributeValue pk = keys.get(PK);
@@ -468,13 +470,27 @@ public boolean deleteDocument(final String siteId, final String documentId,
 
       list.addAll(queryDocumentAttributes(pk, sk, false));
 
-      if (this.dbService.deleteItems(list)) {
+      List<Map<String, AttributeValue>> listKeys = list.stream()
+          .map(map -> map.entrySet().stream()
+              .filter(entry -> entry.getKey().equals(PK) || entry.getKey().equals(SK))
+              .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)))
+          .toList();
+
+      if (this.dbService.deleteItems(listKeys)) {
         deleted = true;
       }
     }
 
     if (this.interceptor != null) {
-      this.interceptor.deleteDocument(siteId, documentId, softDelete);
+
+      if (documentRecord.isEmpty()) {
+        documentRecord = list.stream().filter(l -> l.get(SK).s().startsWith("softdelete#document#"))
+            .findAny().orElse(null);
+      }
+
+      AttributeValueToMap transform = new AttributeValueToMap();
+      Map<String, Object> apply = transform.apply(documentRecord);
+      this.interceptor.deleteDocument(siteId, documentId, softDelete, apply);
     }
 
     return deleted;
@@ -613,13 +629,13 @@ public void deleteDocumentTags(final String siteId, final String documentId) {
    * Delete Folder Index.
    *
    * @param siteId {@link String}
-   * @param item {@link DocumentItem}
+   * @param path {@link String}
    */
-  private void deleteFolderIndex(final String siteId, final DocumentItem item) {
-    if (item != null) {
+  private void deleteFolderIndex(final String siteId, final String path) {
+    if (!isEmpty(path)) {
 
       try {
-        Map<String, String> attr = this.folderIndexProcessor.getIndex(siteId, item.getPath());
+        Map<String, String> attr = this.folderIndexProcessor.getIndex(siteId, path);
 
         if (attr.containsKey("documentId")) {
           deleteItem(Map.of(PK, AttributeValue.builder().s(attr.get(PK)).build(), SK,
@@ -805,6 +821,14 @@ private <T> PaginationResults<T> findAndTransform(final String pkKey, final Stri
     return new PaginationResults<>(list, results.getToken());
   }
 
+  private Map<String, AttributeValue> getDocumentRecord(final String siteId,
+      final String documentId) {
+    GetItemRequest r = GetItemRequest.builder().key(keysDocument(siteId, documentId))
+        .tableName(this.documentTableName).consistentRead(Boolean.TRUE).build();
+
+    return this.dbClient.getItem(r).item();
+  }
+
   @Override
   public DocumentItem findDocument(final String siteId, final String documentId) {
     return findDocument(siteId, documentId, false, null, 0).getResult();
@@ -817,10 +841,7 @@ public PaginationResult<DocumentItem> findDocument(final String siteId, final St
     DocumentItem item = null;
     PaginationMapToken pagination = null;
 
-    GetItemRequest r = GetItemRequest.builder().key(keysDocument(siteId, documentId))
-        .tableName(this.documentTableName).consistentRead(Boolean.TRUE).build();
-
-    Map<String, AttributeValue> result = this.dbClient.getItem(r).item();
+    Map<String, AttributeValue> result = getDocumentRecord(siteId, documentId);
 
     if (result != null && !result.isEmpty()) {
 
@@ -1579,7 +1600,7 @@ private List<Map<String, AttributeValue>> queryDocumentAttributes(final Attribut
     final int limit = 100;
     Map<String, AttributeValue> startkey = null;
     List<Map<String, AttributeValue>> list = new ArrayList<>();
-    QueryConfig config = new QueryConfig().projectionExpression(softDelete ? null : "PK,SK");
+    QueryConfig config = new QueryConfig();
 
     do {
 
@@ -1765,7 +1786,8 @@ public boolean restoreSoftDeletedDocument(final String siteId, final String docu
           new DocumentRestoreMoveAttributeFunction(siteId, documentId));
 
       if (this.interceptor != null) {
-        this.interceptor.restoreSoftDeletedDocument(siteId, documentId);
+        Map<String, Object> apply = new AttributeValueToMap().apply(attr);
+        this.interceptor.restoreSoftDeletedDocument(siteId, documentId, apply);
       }
 
       String path = attr.get("path").s();

dynamodb-documents/src/main/java/com/formkiq/stacks/dynamodb/DocumentServiceInterceptor.java

@@ -47,14 +47,17 @@ void saveDocument(String siteId, String documentId, Map<String, Object> current,
    * @param siteId {@link String}
    * @param documentId {@link String}
    * @param softDelete boolean
+   * @param current {@link Map}
    */
-  void deleteDocument(String siteId, String documentId, boolean softDelete);
+  void deleteDocument(String siteId, String documentId, boolean softDelete,
+      Map<String, Object> current);
 
   /**
    * Restore Soft Deleted Document Inteerceptor.
    * 
    * @param siteId {@link String}
    * @param documentId {@link String}
+   * @param current {@link Map}
    */
-  void restoreSoftDeletedDocument(String siteId, String documentId);
+  void restoreSoftDeletedDocument(String siteId, String documentId, Map<String, Object> current);
 }

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

@@ -53,32 +53,38 @@ public interface UserActivityPlugin {
    * 
    * @param siteId {@link String}
    * @param documentId {@link String}
-   * @param record {@link Map}
+   * @param current {@link Map}
+   * @param previous {@link Map}
    */
-  void updateDocumentActivity(String siteId, String documentId, Map<String, Object> record);
+  void updateDocumentActivity(String siteId, String documentId, Map<String, Object> current,
+      Map<String, Object> previous);
 
   /**
    * Add delete Document Activity.
    * 
    * @param siteId {@link String}
    * @param documentId {@link String}
+   * @param record {@link Map}
    */
-  void deleteDocumentActivity(String siteId, String documentId);
+  void deleteDocumentActivity(String siteId, String documentId, Map<String, Object> record);
 
 
   /**
    * Add soft delete Document Activity.
    *
    * @param siteId {@link String}
    * @param documentId {@link String}
+   * @param record {@link Map}
    */
-  void deleteSoftDocumentActivity(String siteId, String documentId);
+  void deleteSoftDocumentActivity(String siteId, String documentId, Map<String, Object> record);
 
   /**
    * Restore Soft Delete Document Activity.
    * 
    * @param siteId {@link String}
    * @param documentId {@link String}
+   * @param record {@link Map}
    */
-  void restoreSoftDeletedDocumentActivity(String siteId, String documentId);
+  void restoreSoftDeletedDocumentActivity(String siteId, String documentId,
+      Map<String, Object> record);
 }