improvements

Author: Schmarvinius

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/UpdateAttachmentsHandler.java

@@ -5,6 +5,8 @@
 
 import static java.util.Objects.requireNonNull;
 
+import java.io.IOException;
+
 import com.sap.cds.CdsData;
 import com.sap.cds.CdsDataProcessor;
 import com.sap.cds.CdsDataProcessor.Filter;
@@ -34,8 +36,6 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,7 +52,7 @@
 public class UpdateAttachmentsHandler implements EventHandler {
 
   private static final Logger logger = LoggerFactory.getLogger(UpdateAttachmentsHandler.class);
-  public static final Filter VALMAX_FILTER = (path, element, type) -> element.findAnnotation("Validation.Maximum")
+  public static final Filter VALMAX_FILTER = (path, element, type) -> element.getName().contentEquals("content") && element.findAnnotation("Validation.Maximum")
       .isPresent();
 
   private final ModifyAttachmentEventFactory eventFactory;
@@ -88,10 +88,20 @@ void processBefore(CdsUpdateEventContext context, List<CdsData> data) {
     boolean associationsAreUnchanged = associationsAreUnchanged(target, data);
 
     if (ApplicationHandlerHelper.containsContentField(target, data) || !associationsAreUnchanged) {
-
       // Check here for size of new attachments
       if (containsValMaxAnnotation(target, data)) {
+        List<Attachments> attachments = ApplicationHandlerHelper.condenseAttachments(data, target);
         long maxSizeValue = FileSizeUtils.convertValMaxToInt(getValMaxValue(target, data));
+          attachments.forEach(attachment -> {
+            try {
+              int size = attachment.getContent().available();
+              if (size > maxSizeValue) {
+                throw new IllegalArgumentException("Attachment " + attachment.getFileName() + " exceeds the maximum allowed size of " + maxSizeValue + " bytes.");
+              }
+            } catch (IOException e) {
+              throw new RuntimeException("Failed to read attachment content size", e);
+            }
+          });
         logger.debug("Validation.Maximum annotation found with value: {}", maxSizeValue);
       }
 

cds-feature-attachments/src/main/java/com/sap/cds/feature/attachments/handler/applicationservice/helper/FileSizeUtils.java

@@ -1,7 +1,6 @@
 package com.sap.cds.feature.attachments.handler.applicationservice.helper;
 
 import java.math.BigDecimal;
-import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

samples/bookshop/srv/attachments.cds

@@ -7,7 +7,9 @@ extend my.Books with {
   attachments : Composition of many Attachments;
 }
 
-annotate my.Books.attachments with @Validation.Maximum: '2MB';
+annotate my.Books.attachments with {
+  content @Validation.Maximum: '20MB';
+}
 
 
 // Add UI component for attachments table to the Browse Books App