[268]- Fix/Delete cascading attachments when deleting parent

.gitignore

@@ -3,4 +3,5 @@
 node_modules/
 gen/
 
-package-lock.json
+package-lock.json
+.vscode/*

lib/aws-s3.js

@@ -403,19 +403,29 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
    * @param {import('@sap/cds').Request} req - The request object
    */
   async attachDeletionData(req) {
-    const attachments = cds.model.definitions[req?.target?.name + ".attachments"]
-    if (attachments) {
-      const diffData = await req.diff()
-      let deletedAttachments = []
-      diffData.attachments?.filter((object) => {
-        return object._op === "delete"
-      })
-        .map((attachment) => {
-          deletedAttachments.push(attachment.ID)
+    const attachmentCompositions = Object.keys(req?.target?.associations)
+      .filter(assoc => req?.target?.associations[assoc]._target['@_is_media_data']);
+    if (attachmentCompositions.length) {
+      const diffData = await req.diff();
+      const queries = [];
+      for (const attachmentsComp of attachmentCompositions) {
+        let deletedAttachments = []
+        diffData[attachmentsComp]?.forEach(object => {
+          if (object._op === "delete") {
+            deletedAttachments.push(object.ID)
+          }
         })
-
-      if (deletedAttachments.length > 0) {
-        let attachmentsToDelete = await SELECT.from(attachments).columns("url").where({ ID: { in: [...deletedAttachments] } })
+        if (deletedAttachments.length) {
+          queries.push(
+            SELECT.from(req.target.associations[attachmentsComp]._target).columns("url").where({ ID: { in: [...deletedAttachments] } })
+          )
+        }
+      }
+      if (queries.length > 0) {
+        let attachmentsToDelete = []
+        for (const toDeleteAttachments of await Promise.all(queries)) {
+          attachmentsToDelete = attachmentsToDelete.concat(toDeleteAttachments);
+        }
         if (attachmentsToDelete.length > 0) {
           req.attachmentsToDelete = attachmentsToDelete
         }
@@ -549,51 +559,55 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
   /**
    * @inheritdoc
    */
-  registerUpdateHandlers(srv, entity, mediaElement) {
+  registerUpdateHandlers(srv, entity, mediaElements) {
     srv.before(["DELETE", "UPDATE"], entity, this.attachDeletionData.bind(this))
     srv.after(["DELETE", "UPDATE"], entity, this.deleteAttachmentsWithKeys.bind(this))
 
-    srv.prepend(() => {
-      srv.on(
-        "PUT",
-        mediaElement,
-        this.updateContentHandler.bind(this)
-      )
-    })
+    for (const mediaElement of mediaElements) {
+      srv.prepend(() => {
+        srv.on(
+          "PUT",
+          mediaElement,
+          this.updateContentHandler.bind(this)
+        )
+      })
+    }
   }
 
   /**
    * @inheritdoc
    */
-  registerDraftUpdateHandlers(srv, entity, mediaElement) {
+  registerDraftUpdateHandlers(srv, entity, mediaElements) {
     srv.before(["DELETE", "UPDATE"], entity, this.attachDeletionData.bind(this))
     srv.after(["DELETE", "UPDATE"], entity, this.deleteAttachmentsWithKeys.bind(this))
 
     // case: attachments uploaded in draft and draft is discarded
     srv.before("CANCEL", entity.drafts, this.attachDraftDiscardDeletionData.bind(this))
     srv.after("CANCEL", entity.drafts, this.deleteAttachmentsWithKeys.bind(this))
 
-    srv.prepend(() => {
-      if (mediaElement.drafts) {
-        srv.on(
-          "PUT",
-          mediaElement.drafts,
-          this.updateContentHandler.bind(this)
-        )
-
-        // case: attachments uploaded in draft and deleted before saving
-        srv.before(
-          "DELETE",
-          mediaElement.drafts,
-          this.attachDraftDeletionData.bind(this)
-        )
-        srv.after(
-          "DELETE",
-          mediaElement.drafts,
-          this.deleteAttachmentsWithKeys.bind(this)
-        )
-      }
-    })
+    for (const mediaElement of mediaElements) {
+      srv.prepend(() => {
+        if (mediaElement.drafts) {
+          srv.on(
+            "PUT",
+            mediaElement.drafts,
+            this.updateContentHandler.bind(this)
+          )
+
+          // case: attachments uploaded in draft and deleted before saving
+          srv.before(
+            "DELETE",
+            mediaElement.drafts,
+            this.attachDraftDeletionData.bind(this)
+          )
+          srv.after(
+            "DELETE",
+            mediaElement.drafts,
+            this.deleteAttachmentsWithKeys.bind(this)
+          )
+        }
+      })
+    }
   }
 
   /**

lib/basic.js

@@ -173,10 +173,12 @@ module.exports = class AttachmentsService extends cds.Service {
    * @param {cds.Entity} entity - The entity containing attachment associations
    * @param {cds.Entity} target - Attachments entity definition to register handlers for
    */
-  registerUpdateHandlers(srv, entity, target) {
-    srv.after("PUT", target, async (req) => {
-      await this.nonDraftHandler(req, target)
-    })
+  registerUpdateHandlers(srv, entity, targets) {
+    for (const target of targets) {
+      srv.after("PUT", target, async (req) => {
+        await this.nonDraftHandler(req, target)
+      })
+    }
   }
 
   /**
@@ -185,8 +187,10 @@ module.exports = class AttachmentsService extends cds.Service {
    * @param {cds.Entity} entity - The entity containing attachment associations
    * @param {cds.Entity} target - Attachments entity definition to register handlers for
    */
-  registerDraftUpdateHandlers(srv, entity, target) {
-    srv.after("SAVE", entity, this.draftSaveHandler(target))
+  registerDraftUpdateHandlers(srv, entity, targets) {
+    for (const target of targets) {
+      srv.after("SAVE", entity, this.draftSaveHandler(target))
+    }
     return
   }
 
@@ -202,6 +206,7 @@ module.exports = class AttachmentsService extends cds.Service {
       attachmentName: Attachments.name,
       attachmentKey: key
     })
+
     return await UPDATE(Attachments, key).with(data)
   }
 

lib/plugin.js

@@ -58,15 +58,22 @@ cds.once("served", async function registerPluginHandlers() {
           srv.before("READ", targets, validateAttachment)
 
           srv.after("READ", targets, readAttachment)
-
+
+          const mediaDraftEntities = [];
+          const mediaEntities = [];
+srv.before("PUT", isDraft ? target.drafts : target, (req) => validateAttachmentSize(req))
           if (isDraft) {
-            srv.before("PUT", target.drafts, (req) => validateAttachmentSize(req))
             srv.before("NEW", target.drafts, (req) => onPrepareAttachment(req))
-            AttachmentsSrv.registerDraftUpdateHandlers(srv, entity, target)
+            mediaDraftEntities.push(target);
           } else {
-            srv.before("PUT", target, (req) => validateAttachmentSize(req))
             srv.before("CREATE", target, (req) => onPrepareAttachment(req))
-            AttachmentsSrv.registerUpdateHandlers(srv, entity, target)
+            mediaEntities.push(target);
+          }
+          if (mediaDraftEntities.length) {
+            AttachmentsSrv.registerDraftUpdateHandlers(srv, entity, mediaDraftEntities)
+          }
+          if (mediaEntities.length) {
+            AttachmentsSrv.registerUpdateHandlers(srv, entity, mediaEntities)
           }
         }
       })

tests/incidents-app/.gitignore

@@ -0,0 +1,3 @@
+
+# added by cds
+.cdsrc-private.json

tests/incidents-app/package.json

@@ -22,10 +22,6 @@
             }
           }
         }
-      },
-      "attachments": {
-        "kind": "db",
-        "scan": false
       }
     }
   },