From 449ef147815822c49d8372d0b2a3616031436b73 Mon Sep 17 00:00:00 2001
From: "Zickermann, Jan" <jan.zickermann@dataport.de>
Date: Tue, 28 May 2024 14:00:24 +0200
Subject: [PATCH] OZG-5412 intelliform-adapter: Fix IncomingfileGroup null
---
.../intelliform/DepositDataMapper.java | 7 +++--
.../intelliform/DepositDataMapperTest.java | 26 +++++++++++++++++++
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java
index 61150c388..5964b4cef 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java
@@ -151,8 +151,11 @@ class DepositDataMapper {
return incomingFileMap.get(id);
}
- private IncomingFileGroup createSingularFileGroup(IncomingFile incomingFile) {
- return IncomingFileGroup.builder().file(incomingFile).build();
+ IncomingFileGroup createSingularFileGroup(IncomingFile incomingFile) {
+ return IncomingFileGroup.builder()
+ .name(incomingFile.getName())
+ .file(incomingFile)
+ .build();
}
private List<String> getNamesWithout(Collection<String> names, Collection<String> excludedStrings) {
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java
index ac6a615b2..d189c43a0 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java
@@ -39,6 +39,7 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
+import org.mockito.Mock;
import org.mockito.Spy;
import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
@@ -200,4 +201,29 @@ class DepositDataMapperTest {
}
}
+ @DisplayName("create singular file group")
+ @Nested
+ class TestCreateSingularFileGroup {
+ @Mock
+ IncomingFile incomingFile;
+
+ @DisplayName("should have name")
+ @Test
+ void shouldHaveName() {
+ when(incomingFile.getName()).thenReturn("somename");
+
+ var fileGroup = mapper.createSingularFileGroup(incomingFile);
+
+ assertThat(fileGroup.getName()).isEqualTo(incomingFile.getName());
+ }
+
+ @DisplayName("should have file")
+ @Test
+ void shouldHaveFile() {
+ var fileGroup = mapper.createSingularFileGroup(incomingFile);
+
+ assertThat(fileGroup.getFiles()).containsExactly(incomingFile);
+ }
+ }
+
}
--
GitLab