From 3c18b9d2cf574882dda488c8bfd6e73072245207 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 23 May 2023 14:22:28 +0200
Subject: [PATCH] OZG-3778 send vorgangNummer to vorgang manager
---
.../itvsh/kop/eingang/formcycle/FormDataController.java | 8 +++++++-
.../kop/eingang/formcycle/FormDataControllerTest.java | 8 ++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/itvsh/kop/eingang/formcycle/FormDataController.java b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/itvsh/kop/eingang/formcycle/FormDataController.java
index 9c414c519..1702267a0 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/itvsh/kop/eingang/formcycle/FormDataController.java
+++ b/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) {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormDataControllerTest.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormDataControllerTest.java
index 9731385a0..3004d0cc9 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormDataControllerTest.java
+++ b/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();
--
GitLab