OZG-7262 OZG-7584 Attachments should not be null

archive-manager-server/src/main/java/de/ozgcloud/archive/export/ExportGrpcService.java

@@ -44,8 +44,6 @@ import net.devh.boot.grpc.server.service.GrpcService;
 @RequiredArgsConstructor
 class ExportGrpcService extends ExportServiceImplBase {
 
-	static final int CHUNK_SIZE = 256 * 1024;
-
 	private final ExportService exportService;
 	private final TaskExecutor taskExecutor;
 

archive-manager-server/src/main/java/de/ozgcloud/archive/kommentar/Kommentar.java

@@ -29,6 +29,7 @@ import java.util.List;
 import de.ozgcloud.common.binaryfile.FileId;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.Singular;
 
 @Builder
 @Getter
@@ -37,5 +38,6 @@ public class Kommentar {
 	private String text;
 	private ZonedDateTime createdAt;
 	private String createdBy;
+	@Singular
 	private List<FileId> attachments;
 }

archive-manager-server/src/main/java/de/ozgcloud/archive/kommentar/KommentarMapper.java

@@ -27,6 +27,7 @@ import java.util.Map;
 import java.util.Objects;
 
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 import org.mapstruct.NullValueCheckStrategy;
 import org.mapstruct.ReportingPolicy;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +56,7 @@ abstract class KommentarMapper {
 		return grpcObjectMapper.mapFromGrpc(item);
 	}
 
+	@Mapping(target = "attachment", ignore = true)
 	abstract Kommentar mapItemMapToKommentar(Map<String, Object> map);
 
 	String mapObjectToString(Object object) {

archive-manager-server/src/test/java/de/ozgcloud/archive/kommentar/KommentarMapperTest.java

@@ -145,6 +145,9 @@ class KommentarMapperTest {
 	@Nested
 	class TestMapItemMapToKommentar {
 
+		@Nested
+		class OnAllFieldsSet {
+
 			@BeforeEach
 			void init() {
 				doReturn(KommentarTestFactory.ID).when(mapper).mapObjectToString(KommentarTestFactory.ID);
@@ -243,6 +246,18 @@ class KommentarMapperTest {
 			}
 		}
 
+		@Nested
+		class OnAttachmentsMissing {
+
+			@Test
+			void shouldSetToEmptyCollection() {
+				var kommentar = mapper.mapItemMapToKommentar(Map.of());
+
+				assertThat(kommentar.getAttachments()).isEmpty();
+			}
+		}
+	}
+
 	@Nested
 	class TestMapObjectToString {