Merge branch...

Merge branch 'refs/heads/OZG-5413-Senden-OD-Mantelantrag-an-AFM-Eingangsstelle-via-NB' into OZG-5415-Semantik-Adapter-Formbase

xta-adapter/src/main/java/de/ozgcloud/eingang/xdomea/XdomeaMessageDataMapper.java

@@ -25,35 +25,52 @@ public class XdomeaMessageDataMapper {
 
 	public XdomeaMessageData mapIncomingFilesToXdomeaMessageData(List<IncomingFile> incomingFileList) {
 		var xdomeaXMLFile = findXdomeaXMLFile(incomingFileList);
-
 		var representationFileNames = valueReader.readRepresentationFileNames(xdomeaXMLFile);
+		var attachmentFileNames = getFileNamesExcluding(
+				incomingFileList,
+				Stream.concat(Stream.of(xdomeaXMLFile.getName()), representationFileNames.stream())
+		);
 
-		var fileNameToFileMap = incomingFileList.stream()
-				.collect(Collectors.toMap(IncomingFile::getName, file -> file));
+		var fileNameToFileMap = createFileNameToIncomingFileMap(incomingFileList);
 		return XdomeaMessageData.builder()
 				.metadataFile(xdomeaXMLFile)
-				// Representations are incoming files which are referenced in the xdomea-xml in 'Dateiname' elements
-				.representations(getFilesByName(
+				.representations(getRepresentations(representationFileNames, fileNameToFileMap))
+				.attachments(getAttachments(attachmentFileNames, fileNameToFileMap))
+				.build();
+	}
+
+	private Map<String, IncomingFile> createFileNameToIncomingFileMap(List<IncomingFile> incomingFileList) {
+		return incomingFileList.stream()
+				.collect(Collectors.toMap(IncomingFile::getName, file -> file));
+	}
+
+	private Stream<String> getFileNamesExcluding(List<IncomingFile> incomingFileList, Stream<String> excludedFileNames) {
+		return dropNames(
+				incomingFileList.stream().map(IncomingFile::getName),
+				excludedFileNames.collect(Collectors.toSet())
+		);
+	}
+
+	private List<IncomingFile> getRepresentations(List<String> representationFileNames, Map<String, IncomingFile> fileNameToFileMap) {
+		return getFilesByName(
 				movePrimaryRepresentationFileNameToFirstPosition(representationFileNames),
 				fileNameToFileMap
+		);
+	}
+
+	private List<IncomingFileGroup> getAttachments(Stream<String> attachmentFileNames, Map<String, IncomingFile> fileNameToFileMap) {
+		return Stream.of(IncomingFileGroup.builder()
+						.name(ATTACHMENT_GROUP_NAME)
+						.files(
+								getFilesByName(
+										attachmentFileNames,
+										fileNameToFileMap
 								)
 						)
-				// Attachments are all incoming files which are neither the xdomea-xml nor representations
-				.attachments(Stream.of(IncomingFileGroup.builder()
-								.name(ATTACHMENT_GROUP_NAME)
-								.files(getFilesByName(
-										dropNames(
-												incomingFileList.stream().map(IncomingFile::getName),
-												Stream.concat(Stream.of(xdomeaXMLFile.getName()), representationFileNames.stream())
-														.collect(Collectors.toSet())
-										),
-										fileNameToFileMap))
 						.build())
 				// Do not include empty attachment group
 				.filter(group -> !group.getFiles().isEmpty())
-						.toList()
-				)
-				.build();
+				.toList();
 	}
 
 	private Stream<String> movePrimaryRepresentationFileNameToFirstPosition(List<String> representationFileNames) {