Fix issue of deletion of attachments from target entities

Author: yashmeet29

sdm/src/main/java/com/sap/cds/sdm/persistence/DBQuery.java

@@ -379,47 +379,48 @@ public int deleteAttachmentsByObjectIds(
       return 0;
     }
 
-    // Get the target entity of the composition
+    // Get the target entity of the composition (this is the SOURCE attachment entity)
     CdsAssociationType assocType = (CdsAssociationType) compositionElement.get().getType();
-    String targetEntityName = assocType.getTarget().getQualifiedName();
+    String sourceAttachmentEntityName = assocType.getTarget().getQualifiedName();
 
     int deletedCount = 0;
 
     // Try deleting from draft table first
-    Optional<CdsEntity> attachmentDraftEntity = model.findEntity(targetEntityName + "_drafts");
+    Optional<CdsEntity> attachmentDraftEntity =
+        model.findEntity(sourceAttachmentEntityName + "_drafts");
     if (attachmentDraftEntity.isPresent()) {
       var deleteQuery =
           Delete.from(attachmentDraftEntity.get())
               .where(doc -> doc.get("objectId").in(objectIds.toArray()));
       Result result = persistenceService.run(deleteQuery);
       deletedCount += result.rowCount();
       logger.info(
-          "Deleted {} attachment records from draft table '{}' for objectIds: {}",
+          "Deleted {} attachment records from SOURCE draft table '{}' for objectIds: {}",
           result.rowCount(),
-          targetEntityName + "_drafts",
+          sourceAttachmentEntityName + "_drafts",
           objectIds);
     }
 
     // Try deleting from non-draft table
-    Optional<CdsEntity> attachmentEntity = model.findEntity(targetEntityName);
+    Optional<CdsEntity> attachmentEntity = model.findEntity(sourceAttachmentEntityName);
     if (attachmentEntity.isPresent()) {
       var deleteQuery =
           Delete.from(attachmentEntity.get())
               .where(doc -> doc.get("objectId").in(objectIds.toArray()));
       Result result = persistenceService.run(deleteQuery);
       deletedCount += result.rowCount();
       logger.info(
-          "Deleted {} attachment records from table '{}' for objectIds: {}",
+          "Deleted {} attachment records from SOURCE table '{}' for objectIds: {}",
           result.rowCount(),
-          targetEntityName,
+          sourceAttachmentEntityName,
           objectIds);
     }
 
     if (deletedCount == 0) {
       logger.warn(
           "No attachment metadata found in source entity '{}' for objectIds: {}. This may indicate"
               + " the records were already cleaned up.",
-          targetEntityName,
+          sourceAttachmentEntityName,
           objectIds);
     }
 

sdm/src/main/java/com/sap/cds/sdm/service/handler/SDMCustomServiceHandler.java

@@ -246,23 +246,23 @@ public void moveAttachments(AttachmentMoveEventContext context) throws IOExcepti
 
         // After successful DB update, clean up source entity metadata
         // Only clean up successfully moved attachments (not failed ones)
-        List<String> successfullyMovedObjectIds = new ArrayList<>(successfulMovesMap.keySet());
-        if (!successfullyMovedObjectIds.isEmpty()) {
+        // Use the OLD objectIds (before move) to identify source records
+        List<String> oldObjectIds = new ArrayList<>(successfulMovesMap.keySet());
+        if (!oldObjectIds.isEmpty()) {
           try {
             int deletedCount =
-                dbQuery.deleteAttachmentsByObjectIds(
-                    persistenceService, successfullyMovedObjectIds, context);
+                dbQuery.deleteAttachmentsByObjectIds(persistenceService, oldObjectIds, context);
             logger.info(
                 "Cleaned up {} attachment metadata records from source entity for {} successfully"
                     + " moved attachments",
                 deletedCount,
-                successfullyMovedObjectIds.size());
+                oldObjectIds.size());
           } catch (Exception cleanupException) {
             // Log cleanup failure but don't fail the entire move operation
             logger.warn(
                 "Failed to clean up source entity metadata for {} attachments: {}. Attachments were"
                     + " successfully moved to target.",
-                successfullyMovedObjectIds.size(),
+                oldObjectIds.size(),
                 cleanupException.getMessage());
           }
         }