OZG-5413 intelliform: Fix number of files

semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAttachedFilesMapper.java → semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmFileCountMapper.java

@@ -29,19 +29,14 @@ import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.semantik.enginebased.FilesMapperHelper;
 
 @Component
-class AfmAttachedFilesMapper implements AfmEngineBasedMapper {
+class AfmFileCountMapper implements AfmEngineBasedMapper {
 
 	@Override
 	public FormData parseFormData(FormData formData) {
-		var formDataBuilder = formData.toBuilder();
-		FilesMapperHelper.getAttachedFileGroups(formData)
-				.ifPresent(fileGroups -> formDataBuilder
-						.attachments(fileGroups)
-						.numberOfAttachments(FilesMapperHelper.countAttachedFiles(fileGroups)));
-		FilesMapperHelper.getRepresentations(formData)
-				.ifPresent(representations -> formDataBuilder.representations(representations).numberOfRepresentations(representations.size()));
-
-		return FilesMapperHelper.removeProcessedData(formDataBuilder.build());
+		return formData.toBuilder()
+				.numberOfRepresentations(formData.getRepresentations().size())
+				.numberOfAttachments(FilesMapperHelper.countAttachedFiles(formData.getAttachments()))
+				.build();
 	}
 
 }

semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/intelliform/IntelliFormRepresentationAdapter.java

@@ -103,7 +103,6 @@ public class IntelliFormRepresentationAdapter {
 						Map.of(
 								HEADER_FIELD, createHeaderMap(document)
 						).entrySet().stream()
-
 				).collect(ORDERED_MAP_ENTRY_COLLECTOR))
 				.build();
 	}

semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAttachedFilesMapperTest.java → semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmFileCountMapperTest.java

@@ -26,44 +26,40 @@ package de.ozgcloud.eingang.semantik.enginebased.afm;
 import static org.assertj.core.api.Assertions.*;
 
 import java.util.List;
-import java.util.Map;
 
 import de.ozgcloud.eingang.common.formdata.FormData;
 import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
 import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
 import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
 import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
-import de.ozgcloud.eingang.semantik.enginebased.FilesMapperHelper;
-import de.ozgcloud.eingang.semantik.enginebased.afm.AfmAttachedFilesMapper;
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Spy;
 
-class AfmAttachedFilesMapperTest {
+class AfmFileCountMapperTest {
 
 	@Spy
 	@InjectMocks
-	private AfmAttachedFilesMapper mapper;
+	private AfmFileCountMapper mapper;
 
-	private IncomingFileGroup attachmentWithMultipleFiles = IncomingFileGroupTestFactory.createBuilder()
+	private final IncomingFileGroup attachmentWithMultipleFiles = IncomingFileGroupTestFactory.createBuilder()
 			.name("anotherAttachment")
 			.clearFiles()
 			.files(List.of(IncomingFileTestFactory.create(), IncomingFileTestFactory.create()))
 			.build();
 
-	private FormData formData = FormDataTestFactory.createBuilder()
+	private final FormData formData = FormDataTestFactory.createBuilder()
 			.clearAttachments()
-			.formData(Map.of(FilesMapperHelper.FIELD_NAME_MAPPED_FILES,
-					Map.of(FilesMapperHelper.ATTACHMENTS, List.of(IncomingFileGroupTestFactory.create(), attachmentWithMultipleFiles))))
+			.attachments(List.of(IncomingFileGroupTestFactory.create(), attachmentWithMultipleFiles))
 			.build();
 
 	@Nested
 	class TestParseFormData {
 
 		@Test
-		void shouldMapAttachments() {
+		void shouldKeepAttachments() {
 			var parsedFormData = parseFormData();
 
 			assertThat(parsedFormData.getAttachments()).hasSize(2);
@@ -79,7 +75,7 @@ class AfmAttachedFilesMapperTest {
 		}
 
 		@Test
-		void shouldMapRepresentations() {
+		void shouldKeepRepresentations() {
 			var parsedFormData = parseFormData();
 
 			assertThat(parsedFormData.getRepresentations()).hasSize(1);
@@ -92,13 +88,6 @@ class AfmAttachedFilesMapperTest {
 			assertThat(parsedFormData.getNumberOfRepresentations()).isEqualTo(1);
 		}
 
-		@Test
-		void shouldRemoveFilesFromMap() {
-			var parsedFormData = parseFormData();
-
-			assertThat(parsedFormData.getFormData().get(FilesMapperHelper.FIELD_NAME_MAPPED_FILES)).isNull();
-		}
-
 		private FormData parseFormData() {
 			return mapper.parseFormData(formData);
 		}