bugfix(#1115): multifile-input does not show files ins subfolders

digiwf-connector/digiwf-connector-starter/src/main/java/de/muenchen/oss/digiwf/connector/core/application/port/in/CreateBpmnErrorInPort.java

@@ -2,6 +2,7 @@
 
 
 import de.muenchen.oss.digiwf.connector.core.domain.BpmnError;
+import jakarta.validation.Valid;
 
 public interface CreateBpmnErrorInPort {
 
@@ -11,5 +12,5 @@ public interface CreateBpmnErrorInPort {
      *
      * @param bpmnError error parameters
      */
-    void createBpmnError(BpmnError bpmnError);
+    void createBpmnError(@Valid BpmnError bpmnError);
 }

digiwf-engine/digiwf-engine-service/src/main/java/de/muenchen/oss/digiwf/shared/file/AbstractFileService.java

@@ -40,10 +40,11 @@
 
     public List<String> getFileNames(final String filePath, final String fileContext, final Optional<String> documentStorageUrl) {
         try {
+            final String pathToFolder = fileContext + "/" + filePath;
             if (documentStorageUrl.isPresent()) {
-                return this.removeFolderFromPaths(this.documentStorageFolderRepository.getAllFilesInFolderRecursively(fileContext + "/" + filePath, documentStorageUrl.get()).block());
+                return this.extractFilenamesFromFolder(this.documentStorageFolderRepository.getAllFilesInFolderRecursively(pathToFolder, documentStorageUrl.get()).block(), pathToFolder);
             }
-            return this.removeFolderFromPaths(this.documentStorageFolderRepository.getAllFilesInFolderRecursively(fileContext + "/" + filePath).block());
+            return this.extractFilenamesFromFolder(this.documentStorageFolderRepository.getAllFilesInFolderRecursively(pathToFolder).block(), pathToFolder);
         } catch (final Exception ex) {
             log.error("Getting all files of folder {} failed: {}", filePath, ex);
             throw new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR, String.format("Getting all files of folder %s failed", filePath));
@@ -70,10 +71,20 @@
 
     //---------------------------------------- helper methods ---------------------------------------- //
 
-    private List<String> removeFolderFromPaths(final Set<String> fileList) {
+    /**
+     * Extract the filenames from the given file list. Make sure that only filenames for files in the given folder are returned.
+     * Don't return filenames for files in subfolders.
+     *
+     * @param fileList
+     * @param pathToFolder
+     * @return
+     */
+    private List<String> extractFilenamesFromFolder(final Set<String> fileList, final String pathToFolder) {
+        final String basePath = (pathToFolder + "/").replace("//", "/");
         return fileList.stream()
-                .map(file -> file.substring(file.lastIndexOf("/") + 1))
-                .collect(Collectors.toList());
+                .map(file -> file = file.replace(basePath, ""))
+                .filter(file -> !file.contains("/"))
+                .toList();
     }
 
 }

digiwf-engine/digiwf-engine-service/src/main/resources/prozesse/example/formserver-example/formserver-example.config.json → digiwf-engine/digiwf-engine-service/src/main/resources/prozesse/example/formserver-example/formserver-example.processconfig.json

@@ -15,11 +15,11 @@
       },
       {
         "key": "app_instance_file_paths_readonly",
-        "value": "zulassungsbescheinigung_i_fahrzeugschein/assistants"
+        "value": "zulassungsbescheinigung_i_fahrzeugschein"
       },
       {
         "key": "app_instance_file_paths",
-        "value": "zulassungsbescheinigung_i_fahrzeugschein/assistants"
+        "value": "zulassungsbescheinigung_i_fahrzeugschein"
       }
     ]
   }

digiwf-engine/digiwf-engine-service/src/main/resources/prozesse/example/formserver-example/start.schema.json → digiwf-engine/digiwf-engine-service/src/main/resources/prozesse/example/formserver-example/formserver-example.schema.json

@@ -487,8 +487,8 @@
                                                     }
                                                 },
                                                 "key": "zulassungsbescheinigung_i_fahrzeugschein",
-                                                "uuidEnabled": false,
-                                                "filePath": "zulassungsbescheinigung_i_fahrzeugschein/assistants",
+                                                "uuidEnabled": true,
+                                                "filePath": "zulassungsbescheinigung_i_fahrzeugschein",
                                                 "x-options": {
                                                     "fieldColProps": {
                                                         "cols": 12,

digiwf-engine/digiwf-engine-service/src/main/resources/prozesse/example/formserver-example/formserver-test.bpmn

@@ -12,8 +12,8 @@
     <bpmn:userTask id="Activity_0ojk6tw" name="Check Vars" camunda:candidateGroups="group1">
       <bpmn:extensionElements>
         <camunda:inputOutput>
-          <camunda:inputParameter name="app_file_paths_readonly">zulassungsbescheinigung_i_fahrzeugschein/assistants</camunda:inputParameter>
-          <camunda:inputParameter name="app_file_paths">zulassungsbescheinigung_i_fahrzeugschein/assistants</camunda:inputParameter>
+          <camunda:inputParameter name="app_file_paths_readonly">zulassungsbescheinigung_i_fahrzeugschein</camunda:inputParameter>
+          <camunda:inputParameter name="app_file_paths">zulassungsbescheinigung_i_fahrzeugschein</camunda:inputParameter>
           <camunda:inputParameter name="app_task_schema_key">formserver_example_parkausweis_form</camunda:inputParameter>
         </camunda:inputOutput>
       </bpmn:extensionElements>

digiwf-task/digiwf-tasklist-service/src/main/java/de/muenchen/oss/digiwf/task/service/application/usecase/WorkOnTaskFileUseCase.java

@@ -18,9 +18,8 @@
 import org.springframework.web.client.HttpServerErrorException;
 
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Collectors;
+
 
 @Slf4j
 @Component
@@ -51,9 +50,9 @@ public List<String> getFileNames(@NonNull final String taskId, @NonNull final St
             String documentStorageUrl = this.fileConfig.processSyncConfig;
             String pathToFolder = fileContext + "/" + filePath;
             if (documentStorageUrl != null) {
-                return this.removeFolderFromPaths(this.documentStorageFolderRepository.getAllFilesInFolderRecursively(pathToFolder, documentStorageUrl).block());
+                return this.extractFilenamesFromFolder(this.documentStorageFolderRepository.getAllFilesInFolderRecursively(pathToFolder, documentStorageUrl).block(), pathToFolder);
             }
-            return this.removeFolderFromPaths(this.documentStorageFolderRepository.getAllFilesInFolderRecursively(pathToFolder).block());
+            return this.extractFilenamesFromFolder(this.documentStorageFolderRepository.getAllFilesInFolderRecursively(pathToFolder).block(), pathToFolder);
         } catch (final Exception ex) {
             log.error("Getting all files of folder {} failed", filePath, ex);
             throw new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR, String.format("Getting all files of folder %s failed", filePath));
@@ -83,10 +82,20 @@ public String getPresignedUrl(final PresignedUrlAction action, @NonNull final St
         return presignedUrlPort.getPresignedUrl(pathToFile, 5, action);
     }
 
-    private List<String> removeFolderFromPaths(final Set<String> fileList) {
+    /**
+     * Extract the filenames from the given file list. Make sure that only filenames for files in the given folder are returned.
+     * Don't return filenames for files in subfolders.
+     *
+     * @param fileList
+     * @param pathToFolder
+     * @return
+     */
+    private List<String> extractFilenamesFromFolder(final Set<String> fileList, final String pathToFolder) {
+        final String basePath = (pathToFolder + "/").replace("//", "/");
         return fileList.stream()
-                .map(file -> file.substring(file.lastIndexOf("/") + 1))
-                .collect(Collectors.toList());
+                .map(file -> file = file.replace(basePath, ""))
+                .filter(file -> !file.contains("/"))
+                .toList();
     }
 
     private void initializeFileConfig(String taskId) {