draft delete gap fix

CHANGELOG.md

@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 - MTX: Support for deleting tenant-specific objects from S3 upon tenant unsubscription in shared mode.
 
+### Fixed
+
+- Deleted attachments are now removed from S3 when a draft is discarded or deleted.
+
 ## Version 2.1.0
 
 ### Added

lib/aws-s3.js

@@ -30,7 +30,7 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
       return super.init();
     }
   }
-  
+
   async createClientS3(tenantID) {
     try {
       if (s3ClientsCache[tenantID]) {
@@ -71,7 +71,7 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
       DEBUG?.(`Created S3 client for tenant ${tenantID}`);
     } catch (error) {
       // eslint-disable-next-line no-console
-      console.error(`Creation of S3 client for tenant ${tenantID} failed`,error);
+      console.error(`Creation of S3 client for tenant ${tenantID} failed`, error);
     }
   }
 
@@ -142,7 +142,7 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
   }
 
   async attachDeletionData(req) {
-    const attachments = cds.model.definitions[req.query.target.name + ".attachments"];
+    const attachments = cds.model.definitions[req?.query?.target?.name + ".attachments"];
     if (attachments) {
       const diffData = await req.diff();
       let deletedAttachments = [];
@@ -196,16 +196,85 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
     }
   }
 
+  async getAttachmentsToDelete({ draftEntity, activeEntity, id }) {
+    const [draftAttachments, activeAttachments] = await Promise.all([
+      SELECT.from(draftEntity).columns("url").where(id),
+      SELECT.from(activeEntity).columns("url").where(id)
+    ]);
+
+    const activeUrls = new Set(activeAttachments.map(a => a.url));
+    return draftAttachments
+      .filter(({ url }) => !activeUrls.has(url))
+      .map(({ url }) => ({ url }));
+  }
+
+  async attachDraftDeletionData(req) {
+    const draftEntity = cds.model.definitions[req?.query?.target?.name];
+    const name = req?.query?.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,
+      id: { ID: diff.ID }
+    });
+
+    if (attachmentsToDelete.length) {
+      req.attachmentsToDelete = attachmentsToDelete;
+    }
+  }
+
+  async attachDraftDiscardDeletionData(req) {
+    const { ID } = req.data;
+    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 attachmentsToDelete = await this.getAttachmentsToDelete({
+      draftEntity,
+      activeEntity,
+      id: { up__ID: ID }
+    });
+
+    if (attachmentsToDelete.length) {
+      req.attachmentsToDelete = attachmentsToDelete;
+    }
+  }
+
   registerUpdateHandlers(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) {
         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)
+        );
       }
     });
   }