feat(dispatch): max filesize per use case (#261)

* feat(dispatch): max filesize per use case

* docs(dispatch): README add max filesize

* conf(dispatch): max filesize default 90MB

* docs(dispatch): README update max filesize

Author: simonhir

dispatch-service/README.md

@@ -51,6 +51,7 @@ swim:
       bucket: # bucket to look for new files in
       path: # path to look for new files under
       recursive: # if the file lookup should be recursive (optional, default: false)
+      max-file-size: # max size files can have that they are dispatched (optional, default: 90MB (IEC) -> 90*1024*1024B, example: 1GB)
       required-tags: # map of tags required on files to be dispatched (optional, default: {})
       requires-metadata: # if a metadata file is required (optional, default: false)
       destination-binding: # the target destination binding, see section "Adding additional target"

dispatch-service/src/main/java/de/muenchen/oss/swim/dispatcher/application/usecase/DispatcherUseCase.java

@@ -118,15 +118,15 @@ Map<String, Throwable> processDirectory(final UseCase useCase, final String fold
      * @param useCase The use case the file was found for.
      * @param file The file to be processed.
      * @throws FileSizeException If file is above configured
-     *             {@link SwimDispatcherProperties#getMaxFileSize()}
+     *             {@link UseCase#getMaxFileSize()}
      * @throws MetadataException If metadata file required but could not be loaded
      * @throws UseCaseException If use case can't be resolved in reroute action.
      */
     protected void processFile(final UseCase useCase, final File file, final Map<String, String> tags)
             throws FileSizeException, MetadataException, UseCaseException {
         // check file size
-        if (file.size() > swimDispatcherProperties.getMaxFileSize()) {
-            final String message = String.format("File %s too large. %d > %d", file.path(), file.size(), swimDispatcherProperties.getMaxFileSize());
+        if (file.size() > useCase.getMaxFileSize().toBytes()) {
+            final String message = String.format("File %s too large. %d > %d", file.path(), file.size(), useCase.getMaxFileSize().toBytes());
             throw new FileSizeException(message);
         }
         // resolve action

dispatch-service/src/main/java/de/muenchen/oss/swim/dispatcher/configuration/SwimDispatcherProperties.java

@@ -87,11 +87,6 @@ public class SwimDispatcherProperties {
      */
     @NotEmpty
     private String fallbackMail;
-    /**
-     * Max size files can have that they are dispatched.
-     * Default: 100MiB
-     */
-    private Long maxFileSize = 100 * 1024 * 1024L;
     /**
      * Folder name where finished files are moved to.
      */

dispatch-service/src/main/java/de/muenchen/oss/swim/dispatcher/domain/model/UseCase.java

@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.Map;
 import lombok.Data;
+import org.springframework.util.unit.DataSize;
 
 @Data
 public class UseCase {
@@ -28,6 +29,11 @@ public class UseCase {
      * If to look recursive for files.
      */
     private boolean recursive = false;
+    /**
+     * Max size files can have that they are dispatched.
+     * Default: 90MB (IEC)
+     */
+    private DataSize maxFileSize = DataSize.ofMegabytes(90);
     /**
      * If filename contains sensitive data and should not be logged.
      */

dispatch-service/src/main/resources/application-local.yml

@@ -82,6 +82,7 @@ swim:
       bucket: swim-bucket
       path: test-dipa
       recursive: true
+      max-file-size: 1GB
       destination-binding: dipa-out
       mail-addresses:
         - test-dipa@example.com

dispatch-service/src/test/java/de/muenchen/oss/swim/dispatcher/application/usecase/DispatcherUseCaseTest.java

@@ -152,7 +152,7 @@ void testProcessFile_MetadataDestination() throws FileSizeException, MetadataExc
     void testProcessFile_FileSizeException() {
         final UseCase useCase = swimDispatcherProperties.getUseCases().getFirst();
         assertThrows(FileSizeException.class,
-                () -> dispatcherUseCase.processFile(useCase, new File(BUCKET, "test.pdf", swimDispatcherProperties.getMaxFileSize() + 1), TAGS));
+                () -> dispatcherUseCase.processFile(useCase, new File(BUCKET, "test.pdf", useCase.getMaxFileSize().toBytes() + 1), TAGS));
     }
 
     @Test