From 3c09d046920d2609dde9fdfe0100cb3fcbf8f603 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 6 Nov 2023 09:21:50 +0100
Subject: [PATCH] OZG-4456 outsource code in new method
---
.../afm/AfmZustaendigeStelleMapper.java | 4 ++++
.../afm/AfmZustaendigeStelleMapperTest.java | 18 ++++++++++++++----
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
index 23a89da9a..5196efb4e 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
@@ -52,6 +52,10 @@ class AfmZustaendigeStelleMapper implements AfmEngineBasedMapper {
if (bayernZustaendigeStelleMetadataMapper.isResponsible(formData)) {
return bayernZustaendigeStelleMetadataMapper.parseZustaendigeStelleData(formData);
}
+ return parseZustaendigeStelleData(formData);
+ }
+
+ FormData parseZustaendigeStelleData(FormData formData) {
var zustaendigeStelleMap = getZustaendigeStelle(formData);
var organisationseinheitenID = getOrganisationseinheitenId(formData);
var builder = ZustaendigeStelle.builder();
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
index 234c2f054..7eda28f0c 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
@@ -69,14 +69,14 @@ class AfmZustaendigeStelleMapperTest {
void shouldReturnFormDataOnNonExistingZustaendigeStelleAndOrganisationseinheitenId() {
var emptyFormData = FormData.builder().formData(new HashMap<String, Object>()).build();
- var parsedFormData = parseFormData(emptyFormData);
+ var parsedFormData = parseZustaendigeStelleData(emptyFormData);
assertThat(parsedFormData).isEqualTo(emptyFormData);
}
@Test
void shouldMapOrganisationseinheitenId() {
- var parsedFormData = parseFormData(formData);
+ var parsedFormData = parseZustaendigeStelleData(formData);
assertThat(parsedFormData.getZustaendigeStelle().getOrganisationseinheitenId())
.isEqualTo(AfmZustaendigeStelleTestFactory.ORGANISATIONSEINHEITEN_ID);
@@ -84,18 +84,25 @@ class AfmZustaendigeStelleMapperTest {
@Test
void shouldMapBezeichnung() {
- var parsedFormData = parseFormData(formData);
+ var parsedFormData = parseZustaendigeStelleData(formData);
assertThat(parsedFormData.getZustaendigeStelle().getBezeichnung()).isEqualTo(BEZEICHNUNG);
}
@Test
void shouldMapEmail() {
- var parsedFormData = parseFormData(formData);
+ var parsedFormData = parseZustaendigeStelleData(formData);
assertThat(parsedFormData.getZustaendigeStelle().getEmail()).isEqualTo(AfmZustaendigeStelleTestFactory.EMAIL);
}
+ @Test
+ void shouldCallparseZustaendigeStelleData() {
+ parseFormData(formData);
+
+ verify(mapper).parseZustaendigeStelleData(formData);
+ }
+
@Test
void shouldCallParseBayernMetadata() {
when(bayernZustaendigeStelleMetadataMapper.isResponsible(any())).thenReturn(true);
@@ -107,6 +114,9 @@ class AfmZustaendigeStelleMapperTest {
assertThat(resultFormData).isEqualTo(expectedFormData);
}
+ private FormData parseZustaendigeStelleData(FormData formData) {
+ return mapper.parseZustaendigeStelleData(formData);
+ }
}
@Nested
--
GitLab