From 7b36cd67c8124a330a01093098e3f28d61dea970 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Sat, 13 Jan 2024 16:57:10 +0100
Subject: [PATCH] OZG-4697 parse and set geburtsname
---
.../eingang/intelliform/CustomHeaderReader.java | 3 ++-
.../eingang/intelliform/CustomHeaderReaderTest.java | 10 ++++++++++
.../eingang/intelliform/CustomHeaderTestFactory.java | 2 ++
.../enginebased/afm/AfmAntragstellerHeaderMapper.java | 3 ++-
.../afm/AfmAntragstellerHeaderMapperTest.java | 7 +++++++
.../semantik/enginebased/afm/AfmHeaderTestFactory.java | 2 ++
6 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/CustomHeaderReader.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/CustomHeaderReader.java
index 56bb2c52a..dad25e9f0 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/CustomHeaderReader.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/CustomHeaderReader.java
@@ -39,7 +39,7 @@ public class CustomHeaderReader {
public static final String HEADER_VORNAME = "u:saml_givenname";
public static final String HEADER_NACHNAME = "u:saml_surname";
public static final String HEADER_GEBURTSORT = "u:saml_placeofbirth";
- // TODO: public static final String HEADER_GEBURTSNAME = "u:saml_??";
+ public static final String HEADER_GEBURTSNAME = "u:saml_birthname";
public static final String HEADER_EMAIL = "u:saml_mail";
public static final String HEADER_TELEFON = "u:saml_telephonenumber";
public static final String HEADER_STRASSE = "u:saml_postaladdress";
@@ -52,6 +52,7 @@ public class CustomHeaderReader {
getAttribute(document, HEADER_POSTFACH_ID).ifPresent(addHeader);
getAttribute(document, HEADER_VORNAME).ifPresent(addHeader);
getAttribute(document, HEADER_NACHNAME).ifPresent(addHeader);
+ getAttribute(document, HEADER_GEBURTSNAME).ifPresent(addHeader);
getAttribute(document, HEADER_GEBURTSORT).ifPresent(addHeader);
getAttribute(document, HEADER_EMAIL).ifPresent(addHeader);
getAttribute(document, HEADER_TELEFON).ifPresent(addHeader);
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/CustomHeaderReaderTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/CustomHeaderReaderTest.java
index 93a7070b8..eb435c85e 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/CustomHeaderReaderTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/CustomHeaderReaderTest.java
@@ -97,6 +97,16 @@ class CustomHeaderReaderTest {
assertThat(formData).containsEntry(CustomHeaderReader.HEADER_NACHNAME, CustomHeaderTestFactory.NACHNAME);
}
+ @Test
+ void shouldAddGeburtsname() {
+ when(attribute.getName()).thenReturn(CustomHeaderReader.HEADER_GEBURTSNAME);
+ when(attribute.getValue()).thenReturn(CustomHeaderTestFactory.GEBURTSNAME);
+
+ var formData = reader.getHeader(document);
+
+ assertThat(formData).containsEntry(CustomHeaderReader.HEADER_GEBURTSNAME, CustomHeaderTestFactory.GEBURTSNAME);
+ }
+
@Test
void shouldAddGeburtsort() {
when(attribute.getName()).thenReturn(CustomHeaderReader.HEADER_GEBURTSORT);
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/CustomHeaderTestFactory.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/CustomHeaderTestFactory.java
index 9d5393268..acb9fede6 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/CustomHeaderTestFactory.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/CustomHeaderTestFactory.java
@@ -32,6 +32,7 @@ public class CustomHeaderTestFactory {
public static final String POSTFACH_ID = "postfach_id";
public static final String VORNAME = "vorname";
public static final String NACHNAME = "nachname";
+ public static final String GEBURTSNAME = "geburtsname";
public static final String GEBURTSORT = "geburtsort";
public static final String EMAIL = "email";
public static final String TELEFON = "telefon";
@@ -44,6 +45,7 @@ public class CustomHeaderTestFactory {
map.put(CustomHeaderReader.HEADER_POSTFACH_ID, POSTFACH_ID);
map.put(CustomHeaderReader.HEADER_VORNAME, VORNAME);
map.put(CustomHeaderReader.HEADER_NACHNAME, NACHNAME);
+ map.put(CustomHeaderReader.HEADER_GEBURTSNAME, GEBURTSNAME);
map.put(CustomHeaderReader.HEADER_GEBURTSORT, GEBURTSORT);
map.put(CustomHeaderReader.HEADER_EMAIL, EMAIL);
map.put(CustomHeaderReader.HEADER_TELEFON, TELEFON);
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java
index f31d0e2d7..3171846b1 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java
@@ -19,7 +19,7 @@ public class AfmAntragstellerHeaderMapper {
static final String KEY_VORNAME = "u:saml_givenname";
static final String KEY_NACHNAME = "u:saml_surname";
static final String KEY_GEBURTSORT = "u:saml_placeofbirth";
- // TODO: public static final String HEADER_GEBURTSNAME = "u:saml_??";
+ public static final String KEY_GEBURTSNAME = "u:saml_birthname";
static final String KEY_EMAIL = "u:saml_mail";
static final String KEY_TELEFON = "u:saml_telephonenumber";
static final String KEY_STRASSE = "u:saml_postaladdress";
@@ -35,6 +35,7 @@ public class AfmAntragstellerHeaderMapper {
.postfachId((String) headers.get(KEY_POSTFACH_ID))
.vorname((String) headers.get(KEY_VORNAME))
.nachname((String) headers.get(KEY_NACHNAME))
+ .geburtsname((String) headers.get(KEY_GEBURTSNAME))
.geburtsort((String) headers.get(KEY_GEBURTSORT))
.email((String) headers.get(KEY_EMAIL))
.telefon((String) headers.get(KEY_TELEFON))
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapperTest.java
index 6b68709fd..953ff17d4 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapperTest.java
@@ -85,6 +85,13 @@ class AfmAntragstellerHeaderMapperTest {
assertThat(result.getNachname()).isEqualTo(AfmHeaderTestFactory.CUSTOM_NACHNAME);
}
+ @Test
+ void shouldSetGeburtsname() {
+ var result = mapper.buildAntragsteller(headers);
+
+ assertThat(result.getGeburtsname()).isEqualTo(AfmHeaderTestFactory.CUSTOM_GEBURTSNAME);
+ }
+
@Test
void shouldSetGeburtsort() {
var result = mapper.buildAntragsteller(headers);
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java
index 2ade6abdc..28e807688 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java
@@ -41,6 +41,7 @@ public class AfmHeaderTestFactory {
public static final String CUSTOM_POSTFACH_ID = "postfach_id";
public static final String CUSTOM_VORNAME = "vorname";
public static final String CUSTOM_NACHNAME = "nachname";
+ public static final String CUSTOM_GEBURTSNAME = "Geburtsname";
public static final String CUSTOM_GEBURTSORT = "geburtsort";
public static final String CUSTOM_EMAIL = "email";
public static final String CUSTOM_TELEFON = "telefon";
@@ -77,6 +78,7 @@ public class AfmHeaderTestFactory {
map.put(AfmAntragstellerHeaderMapper.KEY_POSTFACH_ID, CUSTOM_POSTFACH_ID);
map.put(AfmAntragstellerHeaderMapper.KEY_VORNAME, CUSTOM_VORNAME);
map.put(AfmAntragstellerHeaderMapper.KEY_NACHNAME, CUSTOM_NACHNAME);
+ map.put(AfmAntragstellerHeaderMapper.KEY_GEBURTSNAME, CUSTOM_GEBURTSNAME);
map.put(AfmAntragstellerHeaderMapper.KEY_GEBURTSORT, CUSTOM_GEBURTSORT);
map.put(AfmAntragstellerHeaderMapper.KEY_EMAIL, CUSTOM_EMAIL);
map.put(AfmAntragstellerHeaderMapper.KEY_TELEFON, CUSTOM_TELEFON);
--
GitLab