OZG-536 -> OZG-594 add content to incomingFile

pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/IncomingFile.java

 package de.itvsh.ozg.pluto.vorgang;
 
+import com.google.protobuf.ByteString;
+
 import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
@@ -14,4 +16,5 @@ public class IncomingFile {
 	private String name;
 	private String contentType;
 	private long size;
+	private ByteString content;
 }

pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/GrpcIncomingFileTestFactory.java

 package de.itvsh.ozg.pluto.vorgang;
 
+import com.google.protobuf.ByteString;
+
 public class GrpcIncomingFileTestFactory {
 
 	public static final String ID = IncomingFileTestFactory.ID;
 	public static final String VENDOR_ID = IncomingFileTestFactory.VENDOR_ID;
 	public static final String NAME = IncomingFileTestFactory.NAME;
-	public static final String CONTENT_TYPE = IncomingFileTestFactory.CONTENT_TYPE;
+	public static final String CONTENT_TYPE = IncomingFileTestFactory.CONTENT_TYPE_STR;
 	public static final long SIZE = IncomingFileTestFactory.SIZE;
+	public static final ByteString CONTENT = IncomingFileTestFactory.CONTENT;
 
 	public static GrpcIncomingFile create() {
 		return createBuilder().build();
@@ -18,6 +21,7 @@ public class GrpcIncomingFileTestFactory {
 				.setVendorId(VENDOR_ID)
 				.setName(NAME)
 				.setContentType(CONTENT_TYPE)
-				.setSize(SIZE);
+				.setSize(SIZE)
+				.setContent(CONTENT);
 	}
 }
\ No newline at end of file

pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/GrpcVorgangServiceITCase.java

@@ -21,41 +21,35 @@ import de.itvsh.ozg.pluto.common.grpc.StreamRecorder;
 class GrpcVorgangServiceITCase {
 
 	@Autowired
-	GrpcVorgangService service;
+	private GrpcVorgangService service;
 
 	@Autowired
 	private MongoOperations mongoOperations;
 
 	@Nested
-	class CreateVorgang {
+	class TestCreateVorgang {
 
 		private final StreamRecorder<GrpcCreateVorgangResponse> responseObserver = StreamRecorder.create();
-		private GrpcCreateVorgangRequest request = GrpcCreateVorgangRequestTestFactory
-				.create();
+		private final GrpcCreateVorgangRequest request = GrpcCreateVorgangRequestTestFactory.create();
 
 		@BeforeEach
-		void init() {
-
+		void dropVorgangCollection() {
 			mongoOperations.dropCollection(Vorgang.class);
 		}
 
 		@Test
-		void validateGrpcResponse() {
-
-			service.createVorgang(request, responseObserver);
+		void verifyGrpcResponseMessage() {
+			doCreateVorgangServiceCall();
 
 			List<GrpcCreateVorgangResponse> grpcResponse = responseObserver.getValues();
-			assertThat(grpcResponse).hasSize(1);
-
-			GrpcCreateVorgangResponse response = grpcResponse.get(0);
 
-			assertThat(response.getMessage()).isEqualTo("ok");
+			assertThat(grpcResponse).hasSize(1);
+			assertThat(grpcResponse.get(0).getMessage()).isEqualTo("ok");
 		}
 
 		@Test
-		void validateVorgangAndEingangHasBeenCreated() {
-
-			service.createVorgang(request, responseObserver);
+		void shouldHaveEingang() {
+			doCreateVorgangServiceCall();
 
 			List<Vorgang> vorgangs = mongoOperations.findAll(Vorgang.class);
 
@@ -64,15 +58,14 @@ class GrpcVorgangServiceITCase {
 		}
 
 		@Nested
-		class Attachments {
+		class TestAttachments {
 
 			private Eingang eingang;
 
 			@BeforeEach
 			void init() {
-
-				service.createVorgang(request, responseObserver);
-				eingang = mongoOperations.findAll(Vorgang.class).get(0).getEingangs().get(0);
+				doCreateVorgangServiceCall();
+				eingang = getFirstEingang();
 			}
 
 			@Test
@@ -95,19 +88,44 @@ class GrpcVorgangServiceITCase {
 		}
 
 		@Nested
-		class Representations {
+		class TestRepresentations {
 
-			@Test
-			void validateRepresentationCreated() {
+			private Eingang eingang;
 
-				service.createVorgang(request, responseObserver);
+			@BeforeEach
+			void doCall() {
+				doCreateVorgangServiceCall();
+			}
 
-				Eingang eingang = mongoOperations.findAll(Vorgang.class).get(0).getEingangs().get(0);
+			@BeforeEach
+			void getEingang() {
+				eingang = getFirstEingang();
+			}
 
+			@Test
+			void shouldHaveRepresentations() {
 				assertThat(eingang.getRepresentations()).hasSize(1);
+			}
+
+			@Test
+			void shouldHaveNumerOfRepresentations() {
 				assertThat(eingang.getNumberOfRepresentations()).isEqualTo(5);
-				assertThat(eingang.getRepresentations().get(0)).usingRecursiveComparison().isEqualTo(IncomingFileTestFactory.create());
 			}
+
+			@Test
+			void shouldHaveIncomingFile() {
+				IncomingFile incomingFile = eingang.getRepresentations().get(0);
+
+				assertThat(incomingFile).usingRecursiveComparison().isEqualTo(IncomingFileTestFactory.create());
+			}
+		}
+
+		private Eingang getFirstEingang() {
+			return mongoOperations.findAll(Vorgang.class).get(0).getEingangs().get(0);
+		}
+
+		private void doCreateVorgangServiceCall() {
+			service.createVorgang(request, responseObserver);
 		}
 	}
 }

pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/IncomingFileMapperTest.java

+package de.itvsh.ozg.pluto.vorgang;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.mapstruct.factory.Mappers;
+
+class IncomingFileMapperTest {
+
+	private static final IncomingFileMapper mapper = Mappers.getMapper(IncomingFileMapper.class);
+
+	@Nested
+	class TestGrpcIncomingFileMapToIncomingFile {
+
+		@Test
+		void shouldMap() {
+			var result = mapper.map(GrpcIncomingFileTestFactory.create());
+
+			assertThat(result).isNotNull().usingRecursiveComparison().isEqualTo(IncomingFileTestFactory.create());
+		}
+	}
+}
\ No newline at end of file

pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/IncomingFileTestFactory.java

@@ -2,13 +2,16 @@ package de.itvsh.ozg.pluto.vorgang;
 
 import java.util.UUID;
 
+import com.google.protobuf.ByteString;
+
 public class IncomingFileTestFactory {
 
 	public static final String ID = UUID.randomUUID().toString();
 	public static final String VENDOR_ID = UUID.randomUUID().toString();
 	public static final String NAME = "XML-Daten.xml";
-	public static final String CONTENT_TYPE = "application/xml";
+	public static final String CONTENT_TYPE_STR = "application/xml";
 	public static final long SIZE = 2048;
+	public static final ByteString CONTENT = ByteString.copyFrom("Da ziehe ich meinen virtuellen Hut!".getBytes());
 
 	public static IncomingFile create() {
 		return createBuilder().build();
@@ -19,7 +22,8 @@ public class IncomingFileTestFactory {
 				.id(ID)
 				.vendorId(VENDOR_ID)
 				.name(NAME)
-				.contentType(CONTENT_TYPE)
-				.size(SIZE);
+				.contentType(CONTENT_TYPE_STR)
+				.size(SIZE)
+				.content(CONTENT);
 	}
 }