Add check 'skipBeforeDraftCancel' to processBeforeDraftCancel method, this method was possibly called on composition/association entities before

Author: lisajulia

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandler.java

@@ -58,7 +58,7 @@ public DraftCancelAttachmentsHandler(
   @Before
   @HandlerOrder(HandlerOrder.LATE)
   void processBeforeDraftCancel(DraftCancelEventContext context) {
-    if (isWhereEmpty(context)) {
+    if (!skipBeforeDraftCancel(context)) {
       logger.debug(
           "Processing before {} event for entity {}", context.getEvent(), context.getTarget());
 
@@ -98,8 +98,22 @@ private Validator buildDeleteContentValidator(
     };
   }
 
-  private boolean isWhereEmpty(DraftCancelEventContext context) {
-    return context.getCqn().where().isEmpty();
+  private boolean skipBeforeDraftCancel(DraftCancelEventContext context) {
+    if (!context.getCqn().where().isEmpty()) {
+      logger.debug(
+          "Skipping draft cancel processing for entity {} because this is not a bulk operation (WHERE clause found in context).",
+          context.getTarget().getQualifiedName());
+      return true;
+    }
+    String entityName = context.getTarget().getName();
+    if (entityName.contains(".")) {
+      logger.debug(
+          "Skipping draft cancel processing for entity {} because this is a composition/association entity (contains dots indicating nested path).",
+          entityName);
+      return true;
+    }
+    // Do not skip processing for other cases
+    return false;
   }
 
   private List<Attachments> readAttachments(

cds-feature-attachments/src/test/java/com/sap/cds/feature/attachments/handler/draftservice/DraftCancelAttachmentsHandlerTest.java

@@ -21,6 +21,7 @@
 import com.sap.cds.ql.Delete;
 import com.sap.cds.ql.cqn.CqnDelete;
 import com.sap.cds.reflect.CdsEntity;
+import com.sap.cds.reflect.CdsStructuredType;
 import com.sap.cds.services.draft.DraftCancelEventContext;
 import com.sap.cds.services.draft.Drafts;
 import com.sap.cds.services.runtime.CdsRuntime;
@@ -59,6 +60,8 @@ void setup() {
     dataArgumentCaptor = ArgumentCaptor.forClass(Attachments.class);
   }
 
+  // The next test checks that processBeforeDraftCancel is skipped
+  // if a where condition is included in the context.
   @Test
   void whereConditionIncludedNothingHappens() {
     getEntityAndMockContext(RootTable_.CDS_NAME);
@@ -70,6 +73,28 @@ void whereConditionIncludedNothingHappens() {
     verifyNoInteractions(attachmentsReader, deleteContentAttachmentEvent);
   }
 
+  // The next test checks that processBeforeDraftCancel is skipped
+  // if a the entity is a composition/association entity.
+  @Test
+  void entityNameContainsDotsNothingHappens() {
+    CdsEntity entityWithDots = mock(CdsEntity.class);
+    when(entityWithDots.getName()).thenReturn("Books.covers_drafts");
+    when(entityWithDots.getQualifiedName()).thenReturn("AdminService.Books.covers_drafts");
+     
+    DraftCancelEventContext context = mock(DraftCancelEventContext.class);
+    when(context.getTarget()).thenReturn(entityWithDots);
+    
+    CqnDelete mockDelete = mock(CqnDelete.class);
+    when(context.getCqn()).thenReturn(mockDelete);
+    when(mockDelete.where()).thenReturn(Optional.empty()); // No WHERE clause
+    
+    cut.processBeforeDraftCancel(context);
+    
+    // Assert - No interactions should happen because entity name contains dots
+    verifyNoInteractions(attachmentsReader);
+    verifyNoInteractions(deleteContentAttachmentEvent);
+  }
+
   @Test
   void nothingSelectedNothingToDo() {
     getEntityAndMockContext(RootTable_.CDS_NAME);