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 56bb2c52a0572702d3914541feefd9b4dfecdead..dad25e9f009aa064cc79e5837ccf4687d0dcdc89 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 93a7070b872ec2e0af8fa0ac30337b84ec5fd6fc..eb435c85ecd0d0dc5214f7a595abc7bd9632f396 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 9d5393268d6e1321be5cfa7dde91fb3927a0cb88..acb9fede61f17309e4417fac7149f5d03177c588 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 f31d0e2d7242e2b0c9b2ed091a4d9460e5e29571..3171846b129f4f676a7392d2f857e0f72714705c 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 6b68709fdd773e68b8919c2e535c124bce73a0d2..953ff17d4427885712c3d95f1b9524b0b1dc1bc1 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 2ade6abdcc57a9963450a108e33bc88f3380cec9..28e807688770910087b28d5ec2a228c4f90789dd 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);