OZG-3757 OZG-3763 change responsibility check for FormBasedMapper

semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedMapper.java

@@ -23,13 +23,11 @@
  */
 package de.itvsh.kop.eingangsadapter.semantik.formbased;
 
-import java.util.List;
-
 import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
 
 interface FormBasedMapper {
 
 	FormData parseFormData(FormData formData);
 
-	List<AnliegenId> getResponsibleAnliegenIds();
+	boolean isResponsible(FormData formData);
 }

semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedSemantikAdapter.java

@@ -23,8 +23,8 @@
  */
 package de.itvsh.kop.eingangsadapter.semantik.formbased;
 
+import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,34 +35,29 @@ import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
 public class FormBasedSemantikAdapter {
 
 	@Autowired(required = false)
-	private List<FormBasedMapper> mappers;
+	private List<FormBasedMapper> mappers = Collections.emptyList();
 
 	public FormData parseFormData(FormData formData) {
-		var formDataAnliegenId = getAnliegenId(formData);
 
-		var processedFormData = formData;
-
-		// TODO OZG-1929 Muss gekläert werden, wie damit umgegangen wird
-		if (Objects.isNull(mappers)) {
-			return formData;
+		return new FormDataProcessor().process(formData);
 	}
 
-		for (int i = 0; i < mappers.size(); i++) {
-			var mapper = mappers.get(i);
-			if (isResponsible(mapper, formDataAnliegenId)) {
-				var processed = mapper.parseFormData(processedFormData);
-				processedFormData = processed;
-			}
-		}
+	class FormDataProcessor {
+		private FormData processedFormData;
+
+		FormData process(FormData originalFormData) {
+			processedFormData = originalFormData;
+			mappers.stream()
+					.filter(mapper -> mapper.isResponsible(processedFormData))
+					.forEach(this::parseWithMapper);
+
 			return processedFormData;
 		}
 
-	AnliegenId getAnliegenId(FormData formData) {
-		return null;// TODO AnliegenId aus FormData holen
+		private void parseWithMapper(FormBasedMapper mapper) {
+			processedFormData = mapper.parseFormData(processedFormData);
 		}
 
-	private boolean isResponsible(FormBasedMapper mapper, AnliegenId anliegenId) {
-		// TODO isNull rausnehmen, sobald die AnliegenIds definiert sind
-		return Objects.isNull(anliegenId) || mapper.getResponsibleAnliegenIds().contains(anliegenId);
 	}
+
 }
\ No newline at end of file

semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedSemantikAdapterTest.java

@@ -23,12 +23,12 @@
  */
 package de.itvsh.kop.eingangsadapter.semantik.formbased;
 
+import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -38,6 +38,7 @@ import org.mockito.Mock;
 import org.mockito.Spy;
 
 import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
 
 class FormBasedSemantikAdapterTest {
 
@@ -45,40 +46,45 @@ class FormBasedSemantikAdapterTest {
 	@InjectMocks
 	private FormBasedSemantikAdapter adapter;
 	@Spy
-	private List<FormBasedMapper> mappers;
+	private List<FormBasedMapper> mappers = new ArrayList<>();
 	@Mock
 	private FormBasedMapper mapper;
 
 	@Nested
 	class TestParseFromData {
 
-		private FormData formData = FormData.builder().build();
-		private AnliegenId anliegenId = AnliegenId.from(UUID.randomUUID().toString());
+		private FormData formData = FormDataTestFactory.create();
 
 		@BeforeEach
 		void mockEngineBasedMapper() {
-			when(mappers.size()).thenReturn(1);
-			when(mappers.get(anyInt())).thenReturn(mapper);
-
-			doReturn(anliegenId).when(adapter).getAnliegenId(any(FormData.class));
+			when(mapper.isResponsible(any())).thenReturn(true);
+			mappers.add(mapper);
 		}
 
 		@Test
-		void shouldCallMappersOnMatchingAnliegenId() {
-			when(mapper.getResponsibleAnliegenIds()).thenReturn(List.of(anliegenId));
-
+		void shouldCallMapperIfResponsible() {
 			adapter.parseFormData(formData);
 
 			verify(mapper).parseFormData(formData);
 		}
 
 		@Test
-		void shouldNotCallMappersOnNonMatchingAnliegenId() {
-			when(mapper.getResponsibleAnliegenIds()).thenReturn(Collections.emptyList());
+		void shouldNotCallMappersIfNOTREsponsible() {
+			when(mapper.isResponsible(any())).thenReturn(false);
 
 			adapter.parseFormData(formData);
 
 			verifyNoMoreInteractions(mapper);
 		}
+
+		@Test
+		void shouldReturnMappingResult() {
+			var expected = FormDataTestFactory.create();
+			when(mapper.parseFormData(any())).thenReturn(expected);
+
+			var result = adapter.parseFormData(formData);
+
+			assertThat(result).isSameAs(expected);
+		}
 	}
 }
\ No newline at end of file