diff --git a/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java
index 9dced378f2a744c234a0abc57365ee48f6d5e446..9c684458339d32dae3862512e6be32f26ac3f21d 100644
--- a/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java
@@ -65,11 +65,10 @@ public class FormDataTestFactory {
SUBFORM_KEY, SUBFORM_VALUE,
NESTED_LIST_WITH_STRINGS_KEY, NESTED_LIST_WITH_STRINGS,
NESTED_LIST_WITH_OBJECTS_KEY, NESTED_LIST_WITH_OBJECTS))
+ // TODO zweites Attachment aus der TestFactory entfernen und die entsprechenden
+ // Tests anpassen
.attachments(List.of(IncomingFileGroupTestFactory.create(),
- IncomingFileGroupTestFactory.createBuilder()
- .name(ATTACHMENT_GROUP_2)
- .file(IncomingFileTestFactory.create())
- .build()))
+ IncomingFileGroupTestFactory.createBuilder().name(ATTACHMENT_GROUP_2).build()))
.representations(List.of(IncomingFileTestFactory.create()));
}
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/GrpcEingangMapper.java b/router/src/main/java/de/ozgcloud/eingang/router/GrpcEingangMapper.java
index 3a2bcc0429d4b71c24bb7eb571e0de5e04c58519..965ee6f81f5bec350c14bfae7b4a324faf4ccfeb 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/GrpcEingangMapper.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/GrpcEingangMapper.java
@@ -25,7 +25,6 @@ package de.ozgcloud.eingang.router;
import java.util.List;
-import de.ozgcloud.eingang.common.formdata.*;
import org.mapstruct.CollectionMappingStrategy;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@@ -33,6 +32,10 @@ import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.NullValuePropertyMappingStrategy;
import org.mapstruct.ReportingPolicy;
+import de.ozgcloud.eingang.common.formdata.Antragsteller;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
import de.ozgcloud.vorgang.common.grpc.GrpcFormDataMapper;
import de.ozgcloud.vorgang.vorgang.GrpcAntragsteller;
import de.ozgcloud.vorgang.vorgang.GrpcEingang;
@@ -47,19 +50,15 @@ import de.ozgcloud.vorgang.vorgang.GrpcZustaendigeStelle;
uses = { GrpcFormDataMapper.class, ServiceKontoMapper.class })
public interface GrpcEingangMapper {
- @Mapping(target = "antragsteller.otherData", source = "antragsteller.data")
- @Mapping(target = "attachmentsList", source = "attachments")
- @Mapping(target = "numberOfAttachments", source = "attachments")
- @Mapping(target = "representationsList", source = "representations")
- @Mapping(target = "numberOfRepresentations", source = "representations")
+ @Mapping(source = "antragsteller.data", target = "antragsteller.otherData")
+ @Mapping(source = "attachments", target = "attachmentsList")
+ @Mapping(source = "attachments", target = "numberOfAttachments")
+ @Mapping(source = "representations", target = "representationsList")
+ @Mapping(source = "representations", target = "numberOfRepresentations")
GrpcEingang toEingang(FormData formData);
- default int representationsToSize(List<IncomingFile> representations) {
- return representations.size();
- }
-
- default int attachmentsToSize(List<IncomingFileGroup> attachments) {
- return attachments.stream().mapToInt(group -> group.getFiles().size()).sum();
+ default int listToSize(List<?> list) {
+ return list.size();
}
@Mapping(source = "files", target = "filesList")
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperITCase.java b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperITCase.java
index d54bdf17b8c848ebb42a79fd5b49b300ee06a96f..4150f6cef6d0574b78c6db89d9b61c068cd620e2 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperITCase.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperITCase.java
@@ -106,7 +106,7 @@ class GrpcEingangMapperITCase {
@Test
void validateNumberOfAttachments() {
- assertThat(eingang.getNumberOfAttachments()).isEqualTo(3);
+ assertThat(eingang.getNumberOfAttachments()).isEqualTo(2);
}
@Test
@@ -136,7 +136,7 @@ class GrpcEingangMapperITCase {
@Test
void validateGroup2AttachmentCount() {
- assertThat(eingang.getAttachmentsList().get(1).getFilesCount()).isEqualTo(2);
+ assertThat(eingang.getAttachmentsList().get(1).getFilesCount()).isEqualTo(1);
}
@Test
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java
index 207b534c4f44785350f93096e1ab95d4b3ed2e01..b0348cc39fa405d1b7ea467d6d99e2a5ee5db4f0 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java
@@ -125,7 +125,7 @@ class GrpcEingangMapperTest {
void validateNumberOfAttachments() {
var eingang = toEingang();
- assertThat(eingang.getNumberOfAttachments()).isEqualTo(3);
+ assertThat(eingang.getNumberOfAttachments()).isEqualTo(2);
}
@Test
@@ -139,14 +139,14 @@ class GrpcEingangMapperTest {
void validateGroup1AttachmentCount() {
var eingang = toEingang();
- assertThat(eingang.getAttachmentsList().getFirst().getFilesCount()).isEqualTo(1);
+ assertThat(eingang.getAttachmentsList().get(0).getFilesCount()).isEqualTo(1);
}
@Test
void validateGroup1Attachment() {
var eingang = toEingang();
- var attachment = eingang.getAttachmentsList().getFirst().getFilesList().getFirst();
+ var attachment = eingang.getAttachmentsList().get(0).getFilesList().get(0);
assertThat(attachment.getId()).isEqualTo(IncomingFileTestFactory.ID);
assertThat(attachment.getVendorId()).isEqualTo(IncomingFileTestFactory.VENDOR_ID);
assertThat(attachment.getName()).isEqualTo(IncomingFileTestFactory.NAME);
@@ -158,7 +158,7 @@ class GrpcEingangMapperTest {
void validateGroup2AttachmentCount() {
var eingang = toEingang();
- assertThat(eingang.getAttachmentsList().get(1).getFilesCount()).isEqualTo(2);
+ assertThat(eingang.getAttachmentsList().get(1).getFilesCount()).isEqualTo(1);
}
@Test
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java b/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java
index 773d545d6ff2b7dbd78a7b1cfeba77aba9cb8e40..60206de34962325a9a4b66061f7f65617233cec3 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java
@@ -184,7 +184,7 @@ class VorgangRemoteServiceTest {
void shouldCallUploadIncomingFile() {
vorgangCreator.uploadAttachments();
- verify(vorgangCreator, times(3)).uploadIncomingFile(any(IncomingFile.class));
+ verify(vorgangCreator, times(2)).uploadIncomingFile(any(IncomingFile.class));
}
@Test
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java
index f548a7ca2f7390a43bc3af5791a0c8fb4c792191..d7ea810f4687a488400fb334987dce12546f2ca9 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java
@@ -126,9 +126,8 @@ public class FormSolutionsEngineBasedAdapterITCase {
void shouldMapAttachment() {
var data = engineAdapter.parseFormData(formData);
- assertThat(data.getAttachments()).hasSize(1);
+ assertThat(data.getAttachments()).hasSize(2);
assertThat(data.getAttachments().getFirst()).isNotNull();
- assertThat(data.getAttachments().getFirst().getFiles()).hasSize(2);
}
}