From 89e0a9df28394a6161a9613de24a1f0ea99a2663 Mon Sep 17 00:00:00 2001
From: "Zickermann, Jan" <jan.zickermann@dataport.de>
Date: Thu, 2 May 2024 12:20:49 +0200
Subject: [PATCH] OZG-5413 xdomea: Rename primaryDocument to metadataFile
---
.../eingang/xdomea/XdomeaMessageData.java | 2 +-
.../xdomea/XdomeaMessageDataMapper.java | 2 +-
.../ozgcloud/eingang/xta/XtaMessageMapper.java | 18 ++++++++++--------
.../xdomea/XdomeaMessageDataMapperTest.java | 6 +++---
.../xdomea/XdomeaMessageDataTestFactory.java | 2 +-
.../eingang/xta/XtaMessageMapperTest.java | 2 +-
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageData.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageData.java
index 3e5cfeda7..432b06c52 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageData.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageData.java
@@ -9,7 +9,7 @@ import lombok.Singular;
@Builder
public record XdomeaMessageData(
- IncomingFile primaryDocument,
+ IncomingFile metadataFile,
List<IncomingFile> representations,
@Singular
List<IncomingFileGroup> attachments
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapper.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapper.java
index d0aa8ba08..9f9f2f93c 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapper.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapper.java
@@ -31,7 +31,7 @@ public class XdomeaMessageDataMapper {
var fileNameToFileMap = incomingFileList.stream()
.collect(Collectors.toMap(IncomingFile::getName, file -> file));
return XdomeaMessageData.builder()
- .primaryDocument(xdomeaXMLFile)
+ .metadataFile(xdomeaXMLFile)
// Representations are incoming files which are referenced in the xdomea-xml in 'Dateiname' elements
.representations(getFilesByName(
movePrimaryRepresentationFileNameToFirstPosition(representationFileNames),
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMapper.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMapper.java
index fdab0a006..79cfdc3ee 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMapper.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMapper.java
@@ -1,18 +1,18 @@
package de.ozgcloud.eingang.xta;
-import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import java.util.List;
+import java.util.stream.Stream;
+
import org.mapstruct.Context;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormHeader;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.common.vorgang.VorgangNummerSupplier;
import de.ozgcloud.eingang.xdomea.XdomeaMessageData;
-import java.util.List;
-import java.util.stream.Stream;
-
@Mapper
interface XtaMessageMapper {
int VORGANG_NUMMER_SUFFIX_LENGTH = 4;
@@ -22,14 +22,16 @@ interface XtaMessageMapper {
@Mapping(target = "id", ignore = true)
@Mapping(target = "zustaendigeStelle", ignore = true)
@Mapping(target = "header", source = "metaData")
- @Mapping(target="representations", source="xdomeaMessageData")
+ @Mapping(target = "representations", source = "xdomeaMessageData")
+ @Mapping(target = "representation", ignore = true)
+ @Mapping(target = "attachment", ignore = true)
FormData toFormData(XdomeaMessageData xdomeaMessageData, XtaMessageMetaData metaData, @Context VorgangNummerSupplier vorgangNummerSupplier);
default List<IncomingFile> getRepresentations(XdomeaMessageData xdomeaMessageData) {
return Stream.concat(
- Stream.of(xdomeaMessageData.primaryDocument()),
- xdomeaMessageData.representations().stream()
- ).toList();
+ Stream.of(xdomeaMessageData.metadataFile()),
+ xdomeaMessageData.representations().stream()
+ ).toList();
}
@Mapping(target = "formId", source = "messageType")
diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapperTest.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapperTest.java
index b2fd5099c..b061b1590 100644
--- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapperTest.java
+++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapperTest.java
@@ -125,12 +125,12 @@ class XdomeaMessageDataMapperTest {
doReturn(REPR_XML_NAME).when(fileClassifier).findPrimaryRepresentationName(representationFileNames);
}
- @DisplayName("should contain primary document (xdomea)")
+ @DisplayName("should contain xdomea metadata file")
@Test
- void shouldContainPrimaryDocument() {
+ void shouldContainXdomeaMetadataFile() {
var classification = doClassify();
- var primaryDocument = classification.primaryDocument();
+ var primaryDocument = classification.metadataFile();
assertThat(primaryDocument.getName()).isEqualTo(XDOMEA_XML_NAME);
}
diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataTestFactory.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataTestFactory.java
index ccdf9d4c4..90a659b8d 100644
--- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataTestFactory.java
+++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataTestFactory.java
@@ -12,7 +12,7 @@ public class XdomeaMessageDataTestFactory {
public static XdomeaMessageData.XdomeaMessageDataBuilder createBuilder() {
return XdomeaMessageData.builder()
- .primaryDocument(IncomingFileTestFactory.createBuilder().name("xdomea-primary-document.xml").build())
+ .metadataFile(IncomingFileTestFactory.createBuilder().name("xdomea-primary-document.xml").build())
.representations(List.of(IncomingFileTestFactory.create()))
.attachment(IncomingFileGroup.builder().file(IncomingFileTestFactory.create()).build());
}
diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java
index 24e749096..52eb46a97 100644
--- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java
+++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMapperTest.java
@@ -43,7 +43,7 @@ class XtaMessageMapperTest {
void shouldMapRepresentations() {
var formData = doMapping();
- assertThat(formData.getRepresentations()).containsExactly(xdomeaMessageData.primaryDocument(), xdomeaMessageData.representations().getFirst());
+ assertThat(formData.getRepresentations()).containsExactly(xdomeaMessageData.metadataFile(), xdomeaMessageData.representations().getFirst());
}
@Test
--
GitLab