Merge pull request 'OZG-5412 mantel-antrag: Fix NPE when formId null' (#131)...

Merge pull request 'OZG-5412 mantel-antrag: Fix NPE when formId null' (#131) from OZG-5412-Dataport-Mantelantrag-Fix-FormId-NPE into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/eingang-manager/pulls/131


Reviewed-by: OZG-Cloud Team <noreply@ozg-sh.de>

semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragFormBasedMapper.java

@@ -34,10 +34,10 @@ public class MantelantragFormBasedMapper implements FormBasedMapper {
 
 	@Override
 	public boolean isResponsible(FormData formData) {
-		return formData
-				.getHeader()
-				.getFormId()
-				.equals(MANTELANTRAG_FORM_ID);
+		return Optional.ofNullable(formData.getHeader())
+				.flatMap(header -> Optional.ofNullable(header.getFormId()))
+				.map(MANTELANTRAG_FORM_ID::equals)
+				.orElse(false);
 	}
 
 	@Override

semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragFormBasedMapperTest.java

@@ -63,6 +63,32 @@ class MantelantragFormBasedMapperTest {
 			assertThat(isResponsibleResult).isFalse();
 		}
 
+		@DisplayName("should be false if header null")
+		@Test
+		void shouldBeFalseIfHeaderNull() {
+			var formData = FormDataTestFactory.createBuilder()
+					.header(null)
+					.build();
+
+			var isResponsibleResult = mapper.isResponsible(formData);
+
+			assertThat(isResponsibleResult).isFalse();
+		}
+
+		@DisplayName("should be false if form id null")
+		@Test
+		void shouldBeFalseIfFormIdNull() {
+			var formData = FormDataTestFactory.createBuilder()
+					.header(FormHeaderTestFactory.createBuilder()
+							.formId(null)
+							.build())
+					.build();
+
+			var isResponsibleResult = mapper.isResponsible(formData);
+
+			assertThat(isResponsibleResult).isFalse();
+		}
+
 		private FormData createWithFormId(String formId) {
 			return FormDataTestFactory.createBuilder()
 					.header(FormHeaderTestFactory.createBuilder()