From a1b224adbdb491c7e047e90ebdd5fbb27c136ca1 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Thu, 20 Jun 2024 13:53:51 +0200 Subject: [PATCH] RED-9375: fix component mapping endpoint validation --- .../dataexchange/service/FileExchangeExportService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/FileExchangeExportService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/FileExchangeExportService.java index b2980bd15..49aa65dfb 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/FileExchangeExportService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/service/FileExchangeExportService.java @@ -91,7 +91,6 @@ public class FileExchangeExportService { } - private void addToExportDownloadQueue(ExportDownloadMessage downloadJob) { rabbitTemplate.convertAndSend(MessagingConfiguration.EXPORT_DOWNLOAD_QUEUE, downloadJob, message -> { @@ -133,11 +132,10 @@ public class FileExchangeExportService { List files = fileStatusManagementService.getDossierStatus(dossier.getId()); - if (!request.fileIds().isEmpty() // - && !request.dossierIds().isEmpty() // + if (!request.dossierIds().contains(dossier.getId()) // && files.stream() - .noneMatch(fileModel -> request.fileIds().contains(fileModel.getId()))) { - // no files of dossier in requested files and dossier not explicitly requested -> don't export it. + .noneMatch(fileModel -> request.fileIds().isEmpty() || request.fileIds().contains(fileModel.getId()))) { + // dossier has no files in requested files and dossier not explicitly requested -> don't export it. return; }