diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/ExportService.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/ExportService.java index dea71b8ecffd2e0a22f6d3f69107ffa6ce0e6b39..dfa730ff9003f54fcef6bc626d36c471dccec27e 100644 --- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/ExportService.java +++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/ExportService.java @@ -75,7 +75,8 @@ class ExportService { var exportFiles = Stream .of(representations.stream(), attachments.stream(), kommentarsData.getAttachments().stream(), - postfachMailData.getAttachments().stream()) + postfachMailData.getAttachments().stream(), + bescheidData.getFiles().stream()) .flatMap(s -> s) .toList(); return ExportData.builder().abgabe(abgabe).exportFilename(buildXmlFilename(filenameId)).exportFiles(exportFiles).build(); diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/BescheidExportDataTestFactory.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/BescheidExportDataTestFactory.java index a8750928c920bc87ecdc49b5fe79aeae537cc26b..e731e4838f28f5056d77210640b33845c7f4ef1b 100644 --- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/BescheidExportDataTestFactory.java +++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/bescheid/BescheidExportDataTestFactory.java @@ -8,7 +8,8 @@ import de.xoev.xdomea.DokumentType; public class BescheidExportDataTestFactory { public static final DokumentType DOKUMENT_TYPE = DokumentTypeTestFactory.create(); - public static final OzgFile OZG_FILE = OzgFileTestFactory.createWithUniqueId(); + public static final OzgFile ATTACHMENT = OzgFileTestFactory.createWithUniqueId(); + public static final OzgFile DOCUMENT = OzgFileTestFactory.createWithUniqueId(); public static BescheidExportData create() { return createBuilder().build(); @@ -17,6 +18,7 @@ public class BescheidExportDataTestFactory { public static BescheidExportData.BescheidExportDataBuilder createBuilder() { return BescheidExportData.builder() .dokumentType(DOKUMENT_TYPE) - .file(OZG_FILE); + .file(DOCUMENT) + .file(ATTACHMENT); } } diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/ExportServiceTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/ExportServiceTest.java index 4cb6ebb420df44f1ea730e236351db5b1e781a13..6b7317d5dda8cd690a9ee490d22e9258bc4a2945 100644 --- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/ExportServiceTest.java +++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/ExportServiceTest.java @@ -366,18 +366,18 @@ class ExportServiceTest { } @Test - void shouldContainExportExportFiles() { + void shouldContainExportFiles() { var exportData = callService(); assertThat(exportData.getExportFiles()) - .hasSize(4) + .hasSize(6) .containsAll(representations) .containsAll(attachments) .containsAll(kommentarsExportData.getAttachments()) - .containsAll(postfachMailExportData.getAttachments()); + .containsAll(postfachMailExportData.getAttachments()) + .containsAll(bescheidExportData.getFiles()); } - @Test void shouldExportKommentare() { callService();