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

.gitignore

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

lib/aws-s3.js

@@ -76,6 +76,10 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
     } else {
       logConfig.info('Separate object store mode enabled - clients will be created per tenant')
     }
+
+    this.on('DeleteAttachment', async msg => {
+      await this.delete(msg.url);
+    });
   }
 
   /**
@@ -375,54 +379,6 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
     }
   }
 
-  /**
-   * Deletes a file from S3 based on the provided key
-   * @param {string} key - The key of the file to delete
-   * @returns {Promise} - Promise resolving when deletion is complete
-   */
-  async deleteAttachment(key) {
-    if (!key) return
-    return await this.delete(key)
-  }
-
-  /**
-   * Registers attachment handlers for the given service and entity
-   * @param {*} records - The records to process
-   * @param {import('@sap/cds').Request} req - The request object
-   */
-  async deleteAttachmentsWithKeys(records, req) {
-    if (req?.attachmentsToDelete?.length > 0) {
-      req.attachmentsToDelete.forEach((attachment) => {
-        this.deleteAttachment(attachment.url)
-      })
-    }
-  }
-
-  /**
-   * Registers attachment handlers for the given service and entity
-   * @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)
-        })
-
-      if (deletedAttachments.length > 0) {
-        let attachmentsToDelete = await SELECT.from(attachments).columns("url").where({ ID: { in: [...deletedAttachments] } })
-        if (attachmentsToDelete.length > 0) {
-          req.attachmentsToDelete = attachmentsToDelete
-        }
-      }
-    }
-  }
-
   /**
    * Registers attachment handlers for the given service and entity
    * @param {import('@sap/cds').Request} req - The request object
@@ -481,128 +437,48 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
     }
   }
 
-  /**
-   * Registers attachment handlers for the given service and entity
-   * @param {{draftEntity: string, activeEntity:cds.Entity, id:string}} param0 - The service and entities
-   * @returns 
-   */
-  async getAttachmentsToDelete({ draftEntity, activeEntity, whereXpr }) {
-    const [draftAttachments, activeAttachments] = await Promise.all([
-      SELECT.from(draftEntity).columns("url").where(whereXpr),
-      SELECT.from(activeEntity).columns("url").where(whereXpr)
-    ])
-
-    const activeUrls = new Set(activeAttachments.map(a => a.url))
-    return draftAttachments
-      .filter(({ url }) => !activeUrls.has(url))
-      .map(({ url }) => ({ url }))
-  }
-
-  /**
-   * Add draft attachment deletion data to the request
-   * @param {import('@sap/cds').Request} req - The request object
-   */
-  async attachDraftDeletionData(req) {
-    const draftEntity = cds.model.definitions[req?.target?.name]
-    const name = req?.target?.name
-    const activeEntity = name ? cds.model.definitions?.[name.split(".").slice(0, -1).join(".")] : undefined
-
-    if (!draftEntity || !activeEntity) return
-
-    const diff = await req.diff()
-    if (diff._op !== "delete" || !diff.ID) return
-
-    const attachmentsToDelete = await this.getAttachmentsToDelete({
-      draftEntity,
-      activeEntity,
-      whereXpr: { ID: diff.ID }
-    })
-
-    if (attachmentsToDelete.length) {
-      req.attachmentsToDelete = attachmentsToDelete
-    }
-  }
-
-  /**
-   * Add draft discard deletion data to the request
-   * @param {import('@sap/cds').Request} req - The request object
-   */
-  async attachDraftDiscardDeletionData(req) {
-    const parentEntity = req.target.name.split('.').slice(0, -1).join('.')
-    const draftEntity = cds.model.definitions[`${parentEntity}.attachments.drafts`]
-    const activeEntity = cds.model.definitions[`${parentEntity}.attachments`]
-    if (!draftEntity || !activeEntity) return
-
-    const whereXpr = []
-    for (const foreignKey of activeEntity.keys['up_']._foreignKeys) {
-      if (whereXpr.length) {
-        whereXpr.push('and')
-      }
-      whereXpr.push(
-        {ref: [foreignKey.parentElement.name]},
-        '=',
-        {val: req.data[foreignKey.childElement.name]}
-      )
-    }
-    const attachmentsToDelete = await this.getAttachmentsToDelete({
-      draftEntity,
-      activeEntity,
-      whereXpr
-    })
-
-    if (attachmentsToDelete.length) {
-      req.attachmentsToDelete = attachmentsToDelete
-    }
-  }
-
-  /**
-   * @inheritdoc
-   */
-  registerUpdateHandlers(srv, entity, mediaElement) {
-    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)
-      )
-    })
-  }
-
   /**
    * @inheritdoc
    */
-  registerDraftUpdateHandlers(srv, entity, mediaElement) {
-    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) {
+  registerUpdateHandlers(srv, mediaElements) {
+    for (const mediaElement of mediaElements) {
+      srv.prepend(() => {
         srv.on(
           "PUT",
-          mediaElement.drafts,
+          mediaElement,
           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)
-        )
-      }
-    })
+  /**
+   * @inheritdoc
+   */
+  registerDraftUpdateHandlers(srv, entity, mediaElements) {
+    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)
+          )
+        }
+      })
+    }
   }
 
   /**