diff --git a/common/pom.xml b/common/pom.xml
index 0d014f643b4e14bc198be9cf3fee612e17f42ee1..70598d2ad26668f38f22ede62c3ab0862d4252c7 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>eingang-manager</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>common</artifactId>
diff --git a/enterprise-adapter/pom.xml b/enterprise-adapter/pom.xml
index 86cd361960b46a6f76dc40a06e552d3fe0392375..b29a4958efd96f456fe013fb92df117d5219af81 100644
--- a/enterprise-adapter/pom.xml
+++ b/enterprise-adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>eingang-manager</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
</parent>
<artifactId>enterprise-adapter</artifactId>
<name>EM - Enterprise Interface Adapter</name>
diff --git a/fim-adapter/pom.xml b/fim-adapter/pom.xml
index e3acc94b6541b7e0114f613c3c0d69ab85c77a72..b5c5d81c7055305f5ff5a86f9dc5d86a03c50292 100644
--- a/fim-adapter/pom.xml
+++ b/fim-adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>eingang-manager</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
</parent>
<artifactId>fim-adapter</artifactId>
<name>Eingangs Adapter - FIM</name>
diff --git a/formcycle-adapter/formcycle-adapter-impl/pom.xml b/formcycle-adapter/formcycle-adapter-impl/pom.xml
index ed03ed830eec84d901e4204ac5744348f38ce11b..d0fcff5c790c8265c8bdc57a73baee375bd9d332 100644
--- a/formcycle-adapter/formcycle-adapter-impl/pom.xml
+++ b/formcycle-adapter/formcycle-adapter-impl/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>formcycle-adapter</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
diff --git a/formcycle-adapter/formcycle-adapter-interface/pom.xml b/formcycle-adapter/formcycle-adapter-interface/pom.xml
index 5951e22341367d1318a44e630d0b6baf4035d8f7..7c37029d6b5e88778e5996cb04b87014e3892d9d 100644
--- a/formcycle-adapter/formcycle-adapter-interface/pom.xml
+++ b/formcycle-adapter/formcycle-adapter-interface/pom.xml
@@ -36,7 +36,7 @@
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>formcycle-adapter-interface</artifactId>
<name>EM - Formcycle Adapter - Interface</name>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
<properties>
<vorgang-manager.version>2.0.0</vorgang-manager.version>
diff --git a/formcycle-adapter/pom.xml b/formcycle-adapter/pom.xml
index 63b93d221b06b16291daed58ab4fe63eaa69d2cc..0936aec04450ceac41ef5d3aa9c103fa42055faf 100644
--- a/formcycle-adapter/pom.xml
+++ b/formcycle-adapter/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>eingang-manager</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
</parent>
<artifactId>formcycle-adapter</artifactId>
diff --git a/formsolutions-adapter/pom.xml b/formsolutions-adapter/pom.xml
index 03eb9a613234b0185ad0dc5baa5845924afa19c6..2cea17c8432640e98cc7bd896d7f81ff8dafdc82 100644
--- a/formsolutions-adapter/pom.xml
+++ b/formsolutions-adapter/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>eingang-manager</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
diff --git a/forwarder/pom.xml b/forwarder/pom.xml
index e42078568cc69cd957b06d28469984bf9a4ddec4..8cc7e8e36c9911496b831b12889179e946fef08d 100644
--- a/forwarder/pom.xml
+++ b/forwarder/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>eingang-manager</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
diff --git a/intelliform-adapter/pom.xml b/intelliform-adapter/pom.xml
index c5a62fb727d1b2d2c5874064eb54ade65443a994..d73352c2c11f6a23fbdb207515bf8187f06c87a8 100644
--- a/intelliform-adapter/pom.xml
+++ b/intelliform-adapter/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>eingang-manager</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java
index b12dfc7a99548a5868891da6608dab10242e64d2..f4b42d22220e907979e96ccdc21b684084ef0ac7 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java
@@ -71,8 +71,8 @@ class DepositDataMapper {
}
public FormData mapToFormData(DepositData depositData) {
- Map<String, IncomingFile> incomingFileMap = mapDepositAttachmentsToIncomingFiles(depositData);
- Document document = parsePrimaryXmlRepresentation(depositData, incomingFileMap);
+ var incomingFileMap = mapDepositAttachmentsToSortedIncomingFiles(depositData);
+ var document = parsePrimaryXmlRepresentation(depositData, incomingFileMap);
var attachmentGroups = findAttachmentGroups(document);
return mapToFormDataWithRepresentationsAndAttachments(
@@ -99,7 +99,14 @@ class DepositDataMapper {
.build();
}
- Map<String, IncomingFile> mapDepositAttachmentsToIncomingFiles(DepositData depositData) {
+ Map<String, IncomingFile> mapDepositAttachmentsToSortedIncomingFiles(DepositData depositData) {
+ var incomingFilesMap = mapDepositAttachmentsToIncomingFiles(depositData);
+ var primaryId = depositData.getPrimaryDataAttachmentId();
+ incomingFilesMap.putFirst(primaryId, getIncomingFileById(primaryId, incomingFilesMap));
+ return incomingFilesMap;
+ }
+
+ private LinkedHashMap<String, IncomingFile> mapDepositAttachmentsToIncomingFiles(DepositData depositData) {
return depositData.getAttachments()
.stream()
.collect(Collectors.toMap(
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/AttachmentTestFactory.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/AttachmentTestFactory.java
index 0bc63fd67c648f3a51d7a57942cd5414a3293262..a2157603218be1f371cd3d516e93640ba2bb5703 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/AttachmentTestFactory.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/AttachmentTestFactory.java
@@ -54,6 +54,8 @@ public class AttachmentTestFactory {
</myForm>""";
public static final String XML_CONTENT = XML_CONTENT_STRING;
public static final String XML_ATTACHMENT_ID = "myForm-xml";
+ public static final String XML_ROHFORM_ATTACHMENT_ID = "myForm-xml-rohform";
+ public static final String XML_ORIGINALFORM_ATTACHMENT_ID = "myForm-xml-originalform";
public static final String XML_NAME = "XML-Daten.xml";
public static final String PDF_ATTACHMENT_CONTENT_TYPE = "application/pdf";
@@ -114,7 +116,7 @@ public class AttachmentTestFactory {
.build());
}
- private static Attachment createAttachment(MetaAttachment metaAttachment) {
+ public static Attachment createAttachment(MetaAttachment metaAttachment) {
var attachment = new Attachment();
attachment.getAttributes().add(createAttributesEntry());
attachment.setContent(metaAttachment.content.getBytes());
@@ -147,7 +149,22 @@ public class AttachmentTestFactory {
);
return Stream.concat(
- Stream.of(createXmlDatenWithContent(xmlFormString)),
+ Stream.of(
+ createAttachment(MetaAttachment.builder()
+ .id(XML_ROHFORM_ATTACHMENT_ID)
+ .name("XML-Daten (Rohform).xml")
+ .contentType(XML_CONTENT_TYPE)
+ .content(xmlFormString)
+ .build()
+ ),
+ createAttachment(MetaAttachment.builder()
+ .id(XML_ORIGINALFORM_ATTACHMENT_ID)
+ .name("XML-Daten (Originalform).xml")
+ .contentType(XML_CONTENT_TYPE)
+ .content(xmlFormString)
+ .build()
+ ),
+ createXmlDatenWithContent(xmlFormString)),
metaAttachments.stream().map(AttachmentTestFactory::createAttachment)
).toList();
}
@@ -163,7 +180,7 @@ public class AttachmentTestFactory {
}
@Builder
- private record MetaAttachment(String id, String name, String contentType, String content, String templateId) {
+ public record MetaAttachment(String id, String name, String contentType, String content, String templateId) {
}
private static List<MetaAttachment> arrayToMetaAttachments(String[] array) {
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java
index 53aa6003c9e0595b8df9e4f534ca82c2f0e91b6e..14e6051660099f272547fd68a7ec71fe265422e5 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java
@@ -25,13 +25,13 @@ package de.ozgcloud.eingang.intelliform;
import static de.ozgcloud.eingang.intelliform.AttachmentTestFactory.*;
import static de.ozgcloud.eingang.intelliform.DepositDataTestFactory.*;
+import static java.util.Collections.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import java.io.IOException;
import java.io.StringReader;
import java.nio.charset.Charset;
-import java.util.Collections;
import java.util.List;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -208,7 +208,11 @@ class DepositDataMapperTest {
var incomingFileIds = formData.getRepresentations().stream()
.map(IncomingFile::getVendorId)
.toList();
- assertThat(incomingFileIds).containsExactly(XML_ATTACHMENT_ID);
+ assertThat(incomingFileIds).containsExactly(
+ XML_ATTACHMENT_ID,
+ XML_ROHFORM_ATTACHMENT_ID,
+ XML_ORIGINALFORM_ATTACHMENT_ID
+ );
}
@DisplayName("should return with attachment groups")
@@ -244,7 +248,7 @@ class DepositDataMapperTest {
@DisplayName("should throw technical exception")
@Test
void shouldThrowTechnicalException() {
- depositData = DepositDataTestFactory.create(Collections.emptyList());
+ depositData = DepositDataTestFactory.create(emptyList());
assertThatThrownBy(TestMapToFormData.this::doMapping)
.isInstanceOf(TechnicalException.class);
@@ -257,20 +261,53 @@ class DepositDataMapperTest {
}
- @DisplayName("map deposit attachments to incoming files")
+ @DisplayName("map deposit attachments to sorted incoming files")
@Nested
- class TestMapDepositAttachmentsToIncomingFiles {
+ class TestMapDepositAttachmentsToSortedIncomingFiles {
+
+ @DisplayName("should fail without primaryDataAttachmentId attachment")
+ @Test
+ void shouldFailWithoutPrimaryDataAttachmentIdAttachment() {
+ var depositData = DepositDataTestFactory.create(emptyList());
+
+ assertThatThrownBy(() -> mapper.mapDepositAttachmentsToSortedIncomingFiles(depositData))
+ .isInstanceOf(TechnicalException.class);
+ }
+
@DisplayName("should keep entry order")
@Test
void shouldKeepEntryOrder() {
var depositData = DepositDataTestFactory.create(ATTACHMENTS);
- var incomingFileMap = mapper.mapDepositAttachmentsToIncomingFiles(depositData);
+ var incomingFileMap = mapper.mapDepositAttachmentsToSortedIncomingFiles(depositData);
var keys = incomingFileMap.keySet().stream().toList();
assertThat(keys).containsExactly(XML_ATTACHMENT_ID, PDF_ATTACHMENT_ID, PNG_ATTACHMENT_ID);
}
+ @DisplayName("should move primary attachment id to first position")
+ @Test
+ void shouldMovePrimaryAttachmentIdToFirstPosition() {
+ var rohformId = "XML-daten-rohform";
+ var depositData = DepositDataTestFactory.create(List.of(
+ AttachmentTestFactory.createAttachment(MetaAttachment.builder()
+ .id(rohformId)
+ .name("XML-Daten (Rohform).xml")
+ .contentType(XML_CONTENT_TYPE)
+ .content("abc")
+ .build()
+ ),
+ AttachmentTestFactory.createPdf(),
+ AttachmentTestFactory.createXmlDaten(),
+ AttachmentTestFactory.createPng()
+ ));
+
+ var incomingFileMap = mapper.mapDepositAttachmentsToSortedIncomingFiles(depositData);
+
+ var keys = incomingFileMap.keySet().stream().toList();
+ assertThat(keys).containsExactly(XML_ATTACHMENT_ID, rohformId, PDF_ATTACHMENT_ID, PNG_ATTACHMENT_ID);
+ }
+
@DisplayName("should keep last entry for duplicate key")
@Test
void shouldKeepLastEntryForDuplicateKey() {
@@ -280,7 +317,7 @@ class DepositDataMapperTest {
AttachmentTestFactory.createXmlDaten()
));
- var incomingFileMap = mapper.mapDepositAttachmentsToIncomingFiles(depositData);
+ var incomingFileMap = mapper.mapDepositAttachmentsToSortedIncomingFiles(depositData);
var keys = incomingFileMap.keySet().stream().toList();
assertThat(keys).containsExactly(XML_ATTACHMENT_ID, PDF_ATTACHMENT_ID);
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java
index 524f388ca41061d7abcfe8b535d4f78853df2081..17c560fb68e7670a05e0dd8feb2102cbc15fd609 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java
@@ -142,16 +142,20 @@ class FormDataEndpointITCase {
return grpcEingangCaptor.getValue().getAntragsteller();
}
- @DisplayName("should have one representation")
+ @DisplayName("should have representations")
@Test
- void shouldHaveOneRepresentation() {
+ void shouldHaveRepresentations() {
sendDepositAndCaptureCreateVorgang();
var eingang = grpcEingangCaptor.getValue();
var representationVendorIds = eingang.getRepresentationsList().stream()
.map(GrpcIncomingFile::getVendorId)
.toList();
- assertThat(representationVendorIds).containsExactly(XML_ATTACHMENT_ID);
+ assertThat(representationVendorIds).containsExactly(
+ XML_ATTACHMENT_ID,
+ XML_ROHFORM_ATTACHMENT_ID,
+ XML_ORIGINALFORM_ATTACHMENT_ID
+ );
}
@DisplayName("should have attachments")
diff --git a/pom.xml b/pom.xml
index 0ba87ca4ba4e0722f24dd73e6f0b5dff1f4947b9..50e955ac71843789ad1397c8feb2a3e5598cb06d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>eingang-manager</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OZG-Cloud Eingang Manager</name>
@@ -55,7 +55,7 @@
</modules>
<properties>
- <vorgang-manager.version>2.10.0-SNAPSHOT</vorgang-manager.version>
+ <vorgang-manager.version>2.10.0</vorgang-manager.version>
<jsoup.version>1.14.3</jsoup.version>
<xmlschema.version>2.3.0</xmlschema.version>
diff --git a/router/pom.xml b/router/pom.xml
index 0a6fa21b87e184f552accb38c7cf5d8ba70af6a5..205240737220e32c8408683562d5f73014c134e0 100644
--- a/router/pom.xml
+++ b/router/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>eingang-manager</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
diff --git a/semantik-adapter/pom.xml b/semantik-adapter/pom.xml
index d28c38abf7daa861cd35148a8c7e730a288c7c52..6bc582e0970821647cb81f8c48de88d819972f6b 100644
--- a/semantik-adapter/pom.xml
+++ b/semantik-adapter/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>eingang-manager</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
</parent>
<artifactId>semantik-adapter</artifactId>
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmEngineBasedAdapter.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmEngineBasedAdapter.java
index 5d7224c75ce7ff634737b79d28aeaf6e05931c6d..36a9a187a73b98daef840cd7784643867f4c7573 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmEngineBasedAdapter.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmEngineBasedAdapter.java
@@ -43,24 +43,15 @@ public class AfmEngineBasedAdapter implements EngineBasedSemantikAdapter {
@Override
public FormData parseFormData(FormData formData) {
- var vorgangNummer = formData.getHeader().getVorgangNummer();
var processedFormData = intelliFormRepresentationAdapter.adaptByRepresentations(formData);
for (var mapper : mappers) {
processedFormData = mapper.parseFormData(processedFormData);
}
- return removeProcessedData(addVorgangNummer(processedFormData, vorgangNummer));
+ return removeProcessedData(processedFormData);
}
- private FormData addVorgangNummer(FormData formData, String vorgangNummer) {
- return formData.toBuilder()
- .header(formData.getHeader().toBuilder()
- .vorgangNummer(vorgangNummer)
- .build()
- )
- .build();
- }
private FormData removeProcessedData(FormData formData) {
return FormDataUtils.from(formData)
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java
index 0f63ef3686963482d332dd1d844e75ae4d2ec865..42222ec8132a79c555967290dd1f2298ec930a18 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java
@@ -67,6 +67,7 @@ class AfmHeaderMapper implements AfmEngineBasedMapper {
var formHeaderBuilder = FormHeader.builder()
.requestId((String) headerDataMap.get(ID))
+ .vorgangNummer((String) headerDataMap.get(ID))
.createdAt(getCreatedAt(headerDataMap))
.formId((String) headerDataMap.get(FORM_ID))
.formName((String) headerDataMap.get(FORM))
@@ -105,4 +106,4 @@ class AfmHeaderMapper implements AfmEngineBasedMapper {
.remove(ServiceKontoFactory.REST_RESPONSE_NAME)
.build();
}
-}
\ No newline at end of file
+}
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmEngineBasedAdapterTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmEngineBasedAdapterTest.java
index 609284d26fccdb41ed91818c5df7ed0161990cdc..a99b67392b0c0cf2ce97c3230fc123280dc27857 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmEngineBasedAdapterTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmEngineBasedAdapterTest.java
@@ -100,13 +100,6 @@ class AfmEngineBasedAdapterTest {
assertThat(mappedFormData.getFormData()).doesNotContainKey(AfmAntragstellerMapper.POSTFACH_ID);
}
- @DisplayName("should keep vorgang nummer")
- @Test
- void shouldKeepVorgangNummer() {
- var mappedFormData = adapter.parseFormData(formData);
-
- assertThat(mappedFormData.getHeader().getVorgangNummer()).isEqualTo(VORGANG_NUMMER);
- }
}
}
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapperTest.java
index 7af0dcd5c208e6c3989c0e8be54948e382c45ac6..80a0e966be30d910f62596d02d669cc36d5062a8 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapperTest.java
@@ -77,6 +77,13 @@ class AfmHeaderMapperTest {
assertThat(parsedFormData.getHeader().getRequestId()).isEqualTo(AfmHeaderTestFactory.ID);
}
+ @Test
+ void shouldMapVorgangNummer() {
+ var parsedFormData = parseFormData();
+
+ assertThat(parsedFormData.getHeader().getVorgangNummer()).isEqualTo(AfmHeaderTestFactory.ID);
+ }
+
@Test
void shouldMapCreatedAt() {
var parsedFormData = parseFormData();
@@ -189,4 +196,4 @@ class AfmHeaderMapperTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/xta-adapter/pom.xml b/xta-adapter/pom.xml
index 5f8d9118152d7af5d35f78f1c168438831ccfa80..fb13d459bda7821591082501d92f4c62c47bf22d 100644
--- a/xta-adapter/pom.xml
+++ b/xta-adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>de.ozgcloud.eingang</groupId>
<artifactId>eingang-manager</artifactId>
- <version>2.10.0-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
</parent>
<artifactId>xta-adapter</artifactId>
<name>Eingangs Adapter - XTA</name>
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaXMLValueReader.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaXMLValueReader.java
index 961231e9ad05e5ef208c05f5218493ebddd0b44e..a94e189b394b396001768386244c08a4cd750250 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaXMLValueReader.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaXMLValueReader.java
@@ -22,7 +22,11 @@ import de.ozgcloud.eingang.common.formdata.IncomingFile;
public class XdomeaXMLValueReader {
private static final String DATEINAME_NODE_QUERY_STRING = "//Hauptobjekt//Dateiname";
- private static final XPathExpression DATEINAME_NODE_QUERY = compileXPathExpression(DATEINAME_NODE_QUERY_STRING);
+ // Interpret XML-Attachments as representations
+ // XML filetype code: 030 (see https://www.xrepository.de/details/urn:xoev-de:xdomea:codeliste:dateiformat)
+ private static final String DATEINAME_NODE_FOR_XML_ANHANG_QUERY_STRING = "//Anlage//Format/Name[contains(., '030')]/..//Dateiname";
+ private static final XPathExpression DATEINAME_NODE_QUERY = compileXPathExpression(
+ DATEINAME_NODE_QUERY_STRING + "|" + DATEINAME_NODE_FOR_XML_ANHANG_QUERY_STRING);
public List<String> readRepresentationFileNames(IncomingFile xdomeaXMLFile) {
return getTextsFromNodes(
diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaXMLValueReaderTest.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaXMLValueReaderTest.java
index fdc793156871725f8e9ce415f05b652ae0dcc435..88d7d7cdae588621eee777d12af476eda7cd7abb 100644
--- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaXMLValueReaderTest.java
+++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaXMLValueReaderTest.java
@@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import java.nio.charset.StandardCharsets;
-import java.util.List;
import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.DisplayName;
@@ -22,6 +21,7 @@ import lombok.SneakyThrows;
class XdomeaXMLValueReaderTest {
private static final String XML_FILE_NAME = "file.xml";
private static final String PDF_FILE_NAME = "file.pdf";
+ private static final String XML_ATTACHMENT_FILE_NAME = "saml-attachment-file.xml";
@Spy
@InjectMocks
@@ -34,7 +34,7 @@ class XdomeaXMLValueReaderTest {
@Mock
IncomingFile incomingXmlFile;
- @DisplayName("should find 'Dateiname' elements in MSR mantelantrag")
+ @DisplayName("should find 'Dateiname' elements and all XML-files in MSR mantelantrag")
@ParameterizedTest
@ValueSource(strings = {
"xdomea/mantelantrag_Geschaeftsgang.Geschaeftsgang.0201.xml",
@@ -45,12 +45,13 @@ class XdomeaXMLValueReaderTest {
var xmlString = TestUtils.loadTextFile(
antragXMLFilename,
XML_FILE_NAME + "\n",
- PDF_FILE_NAME);
+ PDF_FILE_NAME,
+ "\n" + XML_ATTACHMENT_FILE_NAME + "\n");
when(incomingXmlFile.getContentStream()).thenReturn(IOUtils.toInputStream(xmlString, StandardCharsets.UTF_8));
var names = valueReader.readRepresentationFileNames(incomingXmlFile);
- assertThat(names).isEqualTo(List.of(XML_FILE_NAME, PDF_FILE_NAME));
+ assertThat(names).containsExactly(XML_FILE_NAME, PDF_FILE_NAME, XML_ATTACHMENT_FILE_NAME);
}
}
diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
index 43d08f9a67f8f0954290dc1b81d5f2a2b4c5d4b2..6b3bcd60c522a6ceb8a602486baa69b51a269c8c 100644
--- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
+++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
@@ -138,15 +138,30 @@ class XtaITCase {
assertThat(organisationseinheitenId).isEqualTo("9795669");
}
- @DisplayName("should have vorgang nummer")
- @TestZipFileNames
- void shouldHaveVorgangNummer(String zipFileName) {
+ @DisplayName("should have generated vorgang nummer for dFoerdermittel")
+ @Test
+ void shouldHaveVorgangsnummer() {
+ mockNachrichtenBroker("dfoerdermittel_with_anlage.zip");
+
+ runner.runGetXtaMessages();
+
+ var vorgangsNummer = captureEingang()
+ .getHeader()
+ .getVorgangNummer();
+ assertThat(vorgangsNummer).hasSameSizeAs("4627-TY3X");
+ }
+
+ @DisplayName("should have vorgang nummer for AFM")
+ @TestZipFileNamesFromAFM
+ void shouldHaveVorgangsnummerForAfm(String zipFileName) {
mockNachrichtenBroker(zipFileName);
runner.runGetXtaMessages();
- var vorgangNummer = captureEingang().getHeader().getVorgangNummer();
- assertThat(vorgangNummer).hasSize(9);
+ var vorgangsNummer = captureEingang()
+ .getHeader()
+ .getVorgangNummer();
+ assertThat(vorgangsNummer).hasSameSizeAs("20240404370530710707");
}
@DisplayName("should use xta vorgangsnummer for FIM")
@@ -241,6 +256,18 @@ class XtaITCase {
@interface TestZipFileNamesWithoutPdf {
}
+ @Target({ ElementType.METHOD })
+ @Retention(RetentionPolicy.RUNTIME)
+ @ParameterizedTest
+ @ValueSource(strings = {
+ "mantelantrag_without_anlage.zip",
+ "brauchtumsfeuer_without_anlage.zip",
+ "mantelantrag_with_anlage.zip",
+ "brauchtumsfeuer_with_anlage.zip",
+ })
+ @interface TestZipFileNamesFromAFM {
+ }
+
@Target({ ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@ParameterizedTest
diff --git a/xta-adapter/src/test/resources/xdomea/dfoerdermittel_Geschaeftsgang.Geschaeftsgang.0201.xml b/xta-adapter/src/test/resources/xdomea/dfoerdermittel_Geschaeftsgang.Geschaeftsgang.0201.xml
index 28200a104f3cb7ded5851105ad2d9fd80034bc3c..06068ed7f11a66915d42260f0bb8c10774965b0f 100644
--- a/xta-adapter/src/test/resources/xdomea/dfoerdermittel_Geschaeftsgang.Geschaeftsgang.0201.xml
+++ b/xta-adapter/src/test/resources/xdomea/dfoerdermittel_Geschaeftsgang.Geschaeftsgang.0201.xml
@@ -104,4 +104,35 @@
</Verfuegung>
</Beteiligungsschritt>
</ExternerGeschaeftsgang>
+ <Anlage>
+ <Dokument>
+ <Identifikation>
+ <ID>1d8ca22a-9d20-4507-aa5e-b764bb5642f0</ID>
+ </Identifikation>
+ <Typ>Anlage</Typ>
+ <Version>
+ <Nummer>1</Nummer>
+ <Format>
+ <Name listURI="urn:xoev-de:xdomea:codeliste:dateiformat" listVersionID="1.0" xsi:type="DateiformatCodeType">
+ <code xmlns="">030</code>
+ <name xmlns="">xml-eXtensible Markup Language</name>
+ </Name>
+ <Version>0.0</Version>
+ <Primaerdokument>
+ <Dateiname>%s</Dateiname>
+ </Primaerdokument>
+ </Format>
+ <Format>
+ <Name listURI="urn:xoev-de:xdomea:codeliste:dateiformat" listVersionID="1.0" xsi:type="DateiformatCodeType">
+ <code xmlns="">018</code>
+ <name xmlns="">pdf-Portable Document Format</name>
+ </Name>
+ <Version>0.0</Version>
+ <Primaerdokument>
+ <Dateiname>anhang.pdf</Dateiname>
+ </Primaerdokument>
+ </Format>
+ </Version>
+ </Dokument>
+ </Anlage>
</Geschaeftsgang.Geschaeftsgang.0201>
diff --git a/xta-adapter/src/test/resources/xdomea/mantelantrag_Geschaeftsgang.Geschaeftsgang.0201.xml b/xta-adapter/src/test/resources/xdomea/mantelantrag_Geschaeftsgang.Geschaeftsgang.0201.xml
index 349a7a5c3a2406981d48091a319a7aa8f63b16f0..7bed65db92efc3fb0109240b75e19cef0ba7023f 100644
--- a/xta-adapter/src/test/resources/xdomea/mantelantrag_Geschaeftsgang.Geschaeftsgang.0201.xml
+++ b/xta-adapter/src/test/resources/xdomea/mantelantrag_Geschaeftsgang.Geschaeftsgang.0201.xml
@@ -96,4 +96,37 @@
</xdomea:Verfuegung>
</xdomea:Beteiligungsschritt>
</xdomea:ExternerGeschaeftsgang>
+ <xdomea:Anlage>
+ <xdomea:Dokument>
+ <xdomea:Identifikation>
+ <xdomea:ID>1d8ca22a-9d20-4507-aa5e-b764bb5642f0</xdomea:ID>
+ </xdomea:Identifikation>
+ <xdomea:Typ>Anlage</xdomea:Typ>
+ <xdomea:Version>
+ <xdomea:Nummer>1</xdomea:Nummer>
+ <xdomea:Format>
+ <xdomea:Name codeName="xml - eXtensible Markup Language"
+ codelistAgencyName="AG XDOMEA des KoopA ADV" codelistVersionIdentifier="2.0.0"
+ languageCode="de" codelistName="Dateiformat">030
+ </xdomea:Name>
+ <xdomea:Version>0.0</xdomea:Version>
+ <xdomea:Primaerdokument>
+ <xdomea:Dateiname>%s</xdomea:Dateiname>
+ </xdomea:Primaerdokument>
+ </xdomea:Format>
+ </xdomea:Version>
+ <xdomea:Version>
+ <xdomea:Nummer>1</xdomea:Nummer>
+ <xdomea:Format>
+ <xdomea:Name codeName="pdf - Portable Document Format" codelistAgencyName="AG XDOMEA des KoopA ADV"
+ codelistVersionIdentifier="2.0.0" languageCode="de" codelistName="Dateiformat">018
+ </xdomea:Name>
+ <xdomea:Version>0.0</xdomea:Version>
+ <xdomea:Primaerdokument>
+ <xdomea:Dateiname>anhang.pdf</xdomea:Dateiname>
+ </xdomea:Primaerdokument>
+ </xdomea:Format>
+ </xdomea:Version>
+ </xdomea:Dokument>
+ </xdomea:Anlage>
</xdomea:Geschaeftsgang.Geschaeftsgang.0201>