Merge pull request 'OZG-3778 Vorgangsnummer an VorgangManager senden' (#67)...

Merge pull request 'OZG-3778 Vorgangsnummer an VorgangManager senden' (#67) from OZG-3778-Vorgangsnummer-speichern into master

Reviewed-on: https://git.ozg-sh.de/mgm/intelliform-adapter/pulls/67

formcycle-adapter/formcycle-adapter-impl/src/main/java/de/itvsh/kop/eingang/formcycle/FormDataController.java

@@ -76,10 +76,16 @@ class FormDataController {
 		mappedFormData = addRepresentations(representations, mappedFormData);
 		mappedFormData = addFiles(formData, attachments, mappedFormData);
 		mappedFormData = addServiceKonto(formData, mappedFormData);
+		mappedFormData = addVorgangNummer(mappedFormData);
 
 		semantikAdapter.processFormData(mappedFormData);
 
-		return FormCycleConfirmationResponse.newBuilder().setVorgangNummer(vorgangNummerSupplier.get()).build();
+		return FormCycleConfirmationResponse.newBuilder().setVorgangNummer(mappedFormData.getHeader().getRequestId()).build();
+	}
+
+	private FormData addVorgangNummer(FormData mappedFormData) {
+		var formDataHeader = mappedFormData.getHeader().toBuilder().requestId(vorgangNummerSupplier.get()).build();
+		return mappedFormData.toBuilder().header(formDataHeader).build();
 	}
 
 	private FormData addRepresentations(Optional<Collection<MultipartFile>> files, FormData mappedFormData) {

formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormDataControllerTest.java

@@ -119,6 +119,14 @@ class FormDataControllerTest {
 			assertThat(confirmation.getVorgangNummer()).isEqualTo(VORGANG_NUMMER);
 		}
 
+		@Test
+		void shouldSetVorgangNummer() {
+			doPostRequest();
+
+			verify(semantikAdapter).processFormData(formDataCaptor.capture());
+			assertThat(formDataCaptor.getValue().getHeader().getRequestId()).isEqualTo(VORGANG_NUMMER);
+		}
+
 		@Test
 		void shouldCallMapper() {
 			doPostRequest();
@@ -131,7 +139,7 @@ class FormDataControllerTest {
 			doPostRequest();
 
 			verify(semantikAdapter).processFormData(formDataCaptor.capture());
-			assertThat(formDataCaptor.getValue()).usingRecursiveComparison().ignoringFields("representations", "attachments", "numberOfAttachments")
+			assertThat(formDataCaptor.getValue()).usingRecursiveComparison().ignoringFields("representations", "attachments", "numberOfAttachments", "header.requestId")
 					.isEqualTo(mappedFormData);
 		}