diff --git a/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileGroupTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileGroupTestFactory.java
index ebabd58ef35199c82391f7f4a07c19b35239dcfe..62d245773b2dbefda8ca421920a153fac9f2d2fb 100644
--- a/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileGroupTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileGroupTestFactory.java
@@ -25,23 +25,12 @@ package de.ozgcloud.eingang.common.formdata;
import java.util.List;
-public class IncomingFileGroupTestFactory {
- public static final String XDOMEA_XML_NAME = "xdomea.xml";
- public static final String REPR_XML_NAME = "repr.xml";
- public static final String REPR_PDF_NAME = "repr.pdf";
- public static final String ATTATCHMENT_XML_NAME = "att.xml";
- public static final String ATTATCHMENT_PNG_NAME = "att.png";
- public static final String ATTATCHMENT_PDF_NAME = "att.pdf";
-
- public static final String INCOMING_FILE_ID = "xxx";
- public static final String ID = "id";
- public static final String FILE_REF1 = "FileRef1";
- public static final String VENDOR_ID_XXX = "vendorId:xxx";
+import com.thedeanda.lorem.LoremIpsum;
- public static final String NAME = "Ausweis";
+public class IncomingFileGroupTestFactory {
- public static final IncomingFile INCOMING_FILE = IncomingFile.builder().id(INCOMING_FILE_ID).vendorId(VENDOR_ID_XXX).build();
- public static final List<IncomingFileGroup> FILE_GROUPS = List.of(IncomingFileGroup.builder().files(List.of(INCOMING_FILE)).build());
+ public static final String NAME = LoremIpsum.getInstance().getWords(1);
+ public static final List<IncomingFile> INCOMING_FILES = List.of(IncomingFileTestFactory.create());
public static IncomingFileGroup create() {
return createBuilder().build();
@@ -50,7 +39,7 @@ public class IncomingFileGroupTestFactory {
public static IncomingFileGroup.IncomingFileGroupBuilder createBuilder() {
return IncomingFileGroup.builder()
.name(NAME)
- .files(List.of(IncomingFileTestFactory.create()));
+ .files(INCOMING_FILES);
}
}
diff --git a/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTestFactory.java
index 03fd991276406c2bb0ef46a4ba54d22704d1c065..f377a61cdeaf5d9381e7394fc95345e40e76c8e6 100644
--- a/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTestFactory.java
@@ -35,7 +35,7 @@ import lombok.SneakyThrows;
public class IncomingFileTestFactory {
public static final String ID = UUID.randomUUID().toString();
- public static final String VENDOR_ID = IncomingFileGroupTestFactory.VENDOR_ID_XXX;
+ public static final String VENDOR_ID = "vendorId:xxx";
public static final String NAME = "XML-Daten.xml";
public static final String CONTENT_TYPE = "application/xml";
public static final String PDF_CONTENT_TYPE = MediaType.APPLICATION_PDF_VALUE;
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataTestFactory.java
index 066b77ac5bcafacce46dab4070ea6f9bc52a7630..edff3cd6ccbf0a7863bfaca5fa8dbea645ea59c6 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataTestFactory.java
@@ -24,6 +24,7 @@
package de.ozgcloud.eingang.formcycle;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
import de.ozgcloud.eingang.formcycle.FormCycleFormData.Builder;
import de.ozgcloud.vorgang.common.grpc.GrpcFormDataTestFactory;
import de.ozgcloud.vorgang.vorgang.GrpcFormData;
@@ -43,7 +44,7 @@ public class FormCycleFormDataTestFactory {
.setFormData(GrpcFormDataTestFactory.create())
.addAttachmentGroup(FormCycleAttachmentGroup.newBuilder()
.setName(IncomingFileGroupTestFactory.NAME)
- .addFileId(IncomingFileGroupTestFactory.VENDOR_ID_XXX)
+ .addFileId(IncomingFileTestFactory.VENDOR_ID)
.build());
}
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerITCase.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerITCase.java
index f63d7df6efbe2c562f896b60e7d1981fdd32e726..61daa9f4a91a7690dd119bd7c2819553d8f00435 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerITCase.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerITCase.java
@@ -37,7 +37,6 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
import de.ozgcloud.common.test.ITCase;
-import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
import de.ozgcloud.eingang.semantik.SemantikAdapter;
import de.ozgcloud.vorgang.common.grpc.GrpcFormDataTestFactory;
@@ -46,11 +45,11 @@ import de.ozgcloud.vorgang.vorgang.GrpcSubForm;
import lombok.SneakyThrows;
@ITCase
-//@SpringBootTest(properties = {
-// "grpc.client.vorgang-manager-local.address=static://127.0.0.1:9090",
-// "grpc.client.vorgang-manager-local.negotiationType=PLAINTEXT"
-//})
-//@ActiveProfiles("itcase")
+// @SpringBootTest(properties = {
+// "grpc.client.vorgang-manager-local.address=static://127.0.0.1:9090",
+// "grpc.client.vorgang-manager-local.negotiationType=PLAINTEXT"
+// })
+// @ActiveProfiles("itcase")
@AutoConfigureMockMvc
class FormDataControllerITCase {
@@ -76,7 +75,7 @@ class FormDataControllerITCase {
.file(new MockMultipartFile("formData", null, FormDataController.HTTP_TYPE_PROTOBUF, buildTestFormData()))
.file(IncomingFileTestFactory.asMultipartFile("representations"))
.file(asMultipartFile("attachments",
- createBuilder().name(IncomingFileGroupTestFactory.VENDOR_ID_XXX + "__" + NAME).build())));
+ createBuilder().name(IncomingFileTestFactory.VENDOR_ID + "__" + NAME).build())));
}
}
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerTest.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerTest.java
index af16a675df3161341c8fcec51aec4f96a16f4607..e9fdd387fcc97a176170c63cf40e392e7fa1b3f4 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerTest.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerTest.java
@@ -239,7 +239,7 @@ class FormDataControllerTest {
.file(new MockMultipartFile("formData", null, FormDataController.HTTP_TYPE_PROTOBUF, buildTestFormData()))
.file(IncomingFileTestFactory.asMultipartFile("representations"))
.file(asMultipartFile("attachments",
- createBuilder().name(IncomingFileGroupTestFactory.VENDOR_ID_XXX).build())));
+ createBuilder().name(IncomingFileTestFactory.VENDOR_ID).build())));
}
}
diff --git a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/IncomingFileGroupMapper.java b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/IncomingFileGroupMapper.java
index 7f35ef41d2912b64faaa2e6c95216c94e682d460..024d2c03ebb264484deced5c6236eca3182edfea 100644
--- a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/IncomingFileGroupMapper.java
+++ b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/IncomingFileGroupMapper.java
@@ -11,5 +11,10 @@ import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
@Mapper
public interface IncomingFileGroupMapper {
- IncomingFileGroup fromMapEntry(Map.Entry<String, List<IncomingFile>> entry); // TODO: Implement this method
+ default IncomingFileGroup fromMapEntry(Map.Entry<String, List<IncomingFile>> entry) {
+ return IncomingFileGroup.builder()
+ .name(entry.getKey())
+ .files(entry.getValue())
+ .build();
+ }
}
diff --git a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/IncomingFileGroupMapperTest.java b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/IncomingFileGroupMapperTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..acdc39b91d4fc677bcbf0f77ee909360bdc18f9c
--- /dev/null
+++ b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/IncomingFileGroupMapperTest.java
@@ -0,0 +1,29 @@
+package de.ozgcloud.eingang.forwarder;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.mapstruct.factory.Mappers;
+
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+
+class IncomingFileGroupMapperTest {
+
+ private final IncomingFileGroupMapper mapper = Mappers.getMapper(IncomingFileGroupMapper.class);
+
+ @Nested
+ class TestFromMapEntry {
+
+ @Test
+ void shouldMapToIncomingFileGroup() {
+ var entry = Map.entry(IncomingFileGroupTestFactory.NAME, IncomingFileGroupTestFactory.INCOMING_FILES);
+
+ var incomingFileGroup = mapper.fromMapEntry(entry);
+
+ assertThat(incomingFileGroup).usingRecursiveComparison().isEqualTo(IncomingFileGroupTestFactory.create());
+ }
+ }
+}