diff --git a/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapper.java b/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapper.java
index df75de3780c3613202cfff2c323126e4fd48dd1e..218a7c9d3789b4b2f7f7235dd4af3a2b78b6c329 100644
--- a/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapper.java
+++ b/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapper.java
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Component;
import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
-import de.ozgcloud.eingang.xta.RepresentationsAttachmentsPair;
+import de.ozgcloud.eingang.xta.EingangRepresentationsAndAttachments;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
@@ -47,9 +47,9 @@ public class XdomeaMessageDataMapper {
private final XdomeaXMLValueReader valueReader;
- public RepresentationsAttachmentsPair mapIncomingFilesToRepresentationsAttachmentsPair(List<IncomingFile> incomingFileList) {
+ public EingangRepresentationsAndAttachments mapIncomingFilesToRepresentationsAttachmentsPair(List<IncomingFile> incomingFileList) {
var xdomeaMessageData = mapIncomingFilesToXdomeaMessageData(incomingFileList);
- return RepresentationsAttachmentsPair.builder()
+ return EingangRepresentationsAndAttachments.builder()
.representations(removeUuidPrefixFromIncomingFiles(getPairRepresentations(xdomeaMessageData)))
.attachments(removeUuidPrefixFromIncomingFileGroups(xdomeaMessageData.attachments()))
.build();
diff --git a/src/main/java/de/ozgcloud/eingang/xta/RepresentationsAttachmentsPair.java b/src/main/java/de/ozgcloud/eingang/xta/EingangRepresentationsAndAttachments.java
similarity index 91%
rename from src/main/java/de/ozgcloud/eingang/xta/RepresentationsAttachmentsPair.java
rename to src/main/java/de/ozgcloud/eingang/xta/EingangRepresentationsAndAttachments.java
index 075e9a35d0336516679631ff9ec2c8009f9aa966..05dcdbe4963d1271035a379dbd5c5c252f714bc5 100644
--- a/src/main/java/de/ozgcloud/eingang/xta/RepresentationsAttachmentsPair.java
+++ b/src/main/java/de/ozgcloud/eingang/xta/EingangRepresentationsAndAttachments.java
@@ -30,7 +30,9 @@ import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
import lombok.Builder;
@Builder
-public record RepresentationsAttachmentsPair(
+public record EingangRepresentationsAndAttachments(
+ String primaryFormDataFileName,
+ String primaryFormDataPdfFileName,
List<IncomingFile> representations,
List<IncomingFileGroup> attachments
) {
diff --git a/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMapper.java b/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMapper.java
index e96525d61cae4aa4ded58b87b4e5a12e8cce2c43..82d53feff44124836433dd00f21cb23e400ceead 100644
--- a/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMapper.java
+++ b/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMapper.java
@@ -51,7 +51,7 @@ interface XtaMessageMapper {
@Mapping(target = "representation", ignore = true)
@Mapping(target = "attachment", ignore = true)
@Mapping(target = "control.metaData", source = "metaData")
- FormData toFormData(RepresentationsAttachmentsPair representationsAttachmentsPair, XtaMessageMetaData metaData,
+ FormData toFormData(EingangRepresentationsAndAttachments representationsAttachmentsPair, XtaMessageMetaData metaData,
@Context VorgangNummerSupplier vorgangNummerSupplier);
@Mapping(target = "formId", source = "messageTypeCode")
diff --git a/src/main/java/de/ozgcloud/eingang/xta/XtaService.java b/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
index db1eeac979c4d597f86f00cdd0054cf3bec29d19..cee05fbdc39b3ef0685832794323677f95cff119 100644
--- a/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
+++ b/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
@@ -112,7 +112,7 @@ class XtaService {
return addRepresentations(formData, xtaMessage.messageFile().name());
}
- RepresentationsAttachmentsPair getRepresentationsAttachmentsPair(XtaMessageMetaData metaData, List<IncomingFile> incomingFiles) {
+ EingangRepresentationsAndAttachments getRepresentationsAttachmentsPair(XtaMessageMetaData metaData, List<IncomingFile> incomingFiles) {
if (isXDomeaMessageType(metaData.messageTypeCode())) {
return xdomeaMessageDataMapper.mapIncomingFilesToRepresentationsAttachmentsPair(incomingFiles);
}
@@ -160,8 +160,8 @@ class XtaService {
return StringUtils.startsWith(messageType, FIM_MESSAGE_TYPE_PREFIX);
}
- RepresentationsAttachmentsPair mapIncomingFilesToRepresentations(List<IncomingFile> incomingFiles) {
- return RepresentationsAttachmentsPair.builder()
+ EingangRepresentationsAndAttachments mapIncomingFilesToRepresentations(List<IncomingFile> incomingFiles) {
+ return EingangRepresentationsAndAttachments.builder()
.representations(incomingFiles)
.attachments(Collections.emptyList())
.build();
diff --git a/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapperTest.java b/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapperTest.java
index fe10962ae2aa1b9792a0a4a74b0ef677a3c389db..92c8ca837ca4aa6ded9bd6d7a1238e801ef19bcd 100644
--- a/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapperTest.java
+++ b/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapperTest.java
@@ -59,7 +59,7 @@ class XdomeaMessageDataMapperTest {
@DisplayName("map incoming files to representations attachments pair")
@Nested
- class TestMapIncomingFilesToRepresentationsAttachmentsPair {
+ class TestMapIncomingFilesToEingangRepresentationsAndAttachments {
@Mock
private List<IncomingFile> incomingFileList;
diff --git a/src/test/java/de/ozgcloud/eingang/xta/RepresentationsAttachmentsPairTestFactory.java b/src/test/java/de/ozgcloud/eingang/xta/EingangRepresentationsAndAttachmentsTestFactory.java
similarity index 86%
rename from src/test/java/de/ozgcloud/eingang/xta/RepresentationsAttachmentsPairTestFactory.java
rename to src/test/java/de/ozgcloud/eingang/xta/EingangRepresentationsAndAttachmentsTestFactory.java
index 8c08c71dfe32cb0cd879cc3196434f0d2ab958db..9bb1d29aa12f39fe77a1dd8c2e6b13cf64144f45 100644
--- a/src/test/java/de/ozgcloud/eingang/xta/RepresentationsAttachmentsPairTestFactory.java
+++ b/src/test/java/de/ozgcloud/eingang/xta/EingangRepresentationsAndAttachmentsTestFactory.java
@@ -30,7 +30,7 @@ import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
-public class RepresentationsAttachmentsPairTestFactory {
+public class EingangRepresentationsAndAttachmentsTestFactory {
static final List<IncomingFile> PAIR_REPRESENTATIONS = List.of(
IncomingFileTestFactory.createBuilder().name("representation1.xml").build(),
IncomingFileTestFactory.createBuilder().name("representation1.pdf").build()
@@ -42,12 +42,12 @@ public class RepresentationsAttachmentsPairTestFactory {
IncomingFileGroupTestFactory.create()
);
- static RepresentationsAttachmentsPair create() {
+ static EingangRepresentationsAndAttachments create() {
return createBuilder().build();
}
- static RepresentationsAttachmentsPair.RepresentationsAttachmentsPairBuilder createBuilder() {
- return RepresentationsAttachmentsPair.builder()
+ static EingangRepresentationsAndAttachments.EingangRepresentationsAndAttachmentsBuilder createBuilder() {
+ return EingangRepresentationsAndAttachments.builder()
.representations(PAIR_REPRESENTATIONS)
.attachments(PAIR_ATTACHMENTS);
}
diff --git a/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java b/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java
index 7dd985e31ca5ab08925e97e5eebc727541d75fda..c20bccddb711109dec7bd81c4df3bebeafb18a3f 100644
--- a/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java
+++ b/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java
@@ -53,12 +53,12 @@ class XtaMessageMapperTest {
class TestToFormData {
private XtaMessageMetaData xtaMessageMetaData;
- private RepresentationsAttachmentsPair representationsAttachmentsPair;
+ private EingangRepresentationsAndAttachments eingangRepresentationsAndAttachments;
@BeforeEach
void mock() {
xtaMessageMetaData = XtaMessageMetaDataTestFactory.create();
- representationsAttachmentsPair = RepresentationsAttachmentsPairTestFactory.create();
+ eingangRepresentationsAndAttachments = EingangRepresentationsAndAttachmentsTestFactory.create();
when(vorgangNummerSupplier.get(VORGANG_NUMMER_SUFFIX_LENGTH)).thenReturn(FormHeaderTestFactory.VORGANGNUMMER);
}
@@ -66,7 +66,7 @@ class XtaMessageMapperTest {
void shouldMapRepresentations() {
var formData = doMapping();
- assertThat(formData.getRepresentations()).isEqualTo(representationsAttachmentsPair.representations());
+ assertThat(formData.getRepresentations()).isEqualTo(eingangRepresentationsAndAttachments.representations());
}
@Test
@@ -87,7 +87,7 @@ class XtaMessageMapperTest {
void shouldMapAttachments() {
var formData = doMapping();
- assertThat(formData.getAttachments()).isEqualTo(representationsAttachmentsPair.attachments());
+ assertThat(formData.getAttachments()).isEqualTo(eingangRepresentationsAndAttachments.attachments());
}
@Test
@@ -121,7 +121,7 @@ class XtaMessageMapperTest {
}
private FormData doMapping() {
- return mapper.toFormData(representationsAttachmentsPair, xtaMessageMetaData, vorgangNummerSupplier);
+ return mapper.toFormData(eingangRepresentationsAndAttachments, xtaMessageMetaData, vorgangNummerSupplier);
}
}
@@ -153,18 +153,18 @@ class XtaMessageMapperTest {
class TestToFimFormData {
private XtaMessageMetaData xtaMessageMetaData;
- private RepresentationsAttachmentsPair representationsAttachmentsPair;
+ private EingangRepresentationsAndAttachments eingangRepresentationsAndAttachments;
@BeforeEach
void mock() {
xtaMessageMetaData = XtaMessageMetaDataTestFactory.createFim();
- representationsAttachmentsPair = RepresentationsAttachmentsPairTestFactory.create();
+ eingangRepresentationsAndAttachments = EingangRepresentationsAndAttachmentsTestFactory.create();
when(vorgangNummerSupplier.get(VORGANG_NUMMER_SUFFIX_LENGTH)).thenReturn(FormHeaderTestFactory.VORGANGNUMMER);
}
@Test
void shouldSetFormEngineName() {
- var formData = mapper.toFormData(representationsAttachmentsPair, xtaMessageMetaData, vorgangNummerSupplier);
+ var formData = mapper.toFormData(eingangRepresentationsAndAttachments, xtaMessageMetaData, vorgangNummerSupplier);
assertThat(formData.getHeader().getFormEngineName()).isEqualTo(FormHeaderTestFactory.FIM_FORM_ENGINE_NAME);
}
diff --git a/src/test/java/de/ozgcloud/eingang/xta/XtaServiceTest.java b/src/test/java/de/ozgcloud/eingang/xta/XtaServiceTest.java
index 12b47247bcd7c0ec9fbd38cc6e3c2f5c041fc2c5..ee254b4e7c8b0c985a722a5f7917469b191a22a6 100644
--- a/src/test/java/de/ozgcloud/eingang/xta/XtaServiceTest.java
+++ b/src/test/java/de/ozgcloud/eingang/xta/XtaServiceTest.java
@@ -199,17 +199,17 @@ class XtaServiceTest {
private final XtaMessage message = XtaMessageTestFactory.create();
private final XtaMessageMetaData messageMetaData = XtaMessageMetaDataTestFactory.create();
private final FormData mappedFormData = FormDataTestFactory.create();
- private RepresentationsAttachmentsPair classification;
+ private EingangRepresentationsAndAttachments classification;
@Captor
private ArgumentCaptor<XtaMessageMetaData> messageMetaDataCaptor;
@Captor
- private ArgumentCaptor<RepresentationsAttachmentsPair> classificationCaptor;
+ private ArgumentCaptor<EingangRepresentationsAndAttachments> classificationCaptor;
@BeforeEach
void init() {
- classification = RepresentationsAttachmentsPairTestFactory.create();
+ classification = EingangRepresentationsAndAttachmentsTestFactory.create();
var incomingFiles = List.of(IncomingFileTestFactory.create(), IncomingFileTestFactory.create());
when(incomingFilesMapper.toIncomingFiles(message.messageFile())).thenReturn(incomingFiles);
doReturn(classification).when(service).getRepresentationsAttachmentsPair(messageMetaData, incomingFiles);
@@ -278,12 +278,12 @@ class XtaServiceTest {
@DisplayName("get representations attachments pair")
@Nested
- class TestGetRepresentationsAttachmentsPair {
+ class TestGetEingangRepresentationsAndAttachments {
@Mock
private XtaMessageMetaData messageMetaData;
@Mock
- private RepresentationsAttachmentsPair classification;
+ private EingangRepresentationsAndAttachments classification;
private List<IncomingFile> incomingFiles;