Merge branch 'OZG-7846-filter-for-form-engine' into OZG-7837-mapping-name-as-collection

src/main/java/de/ozgcloud/aggregation/AggregationLoader.java

@@ -47,13 +47,11 @@ class AggregationLoader {
 	private final int batchSize = 100;
 
 	public void load() {
-		Stream<Batch> vorgaenge = extractBatchesOfVorgaengeFromDataSource();
-		Stream<Batch> deletedVorgaenge = Objects.isNull(formIdentifier) ? extractBatchesOfDeletedVorgaengeFromDataSource() : Stream.<Batch>empty();
-		loadVorgaengeIntoRepository(Stream.concat(vorgaenge, deletedVorgaenge));
+		loadVorgaengeIntoRepository(Stream.concat(extractBatchesOfVorgaengeFromDataSource(), extractBatchesOfDeletedVorgaengeFromDataSource()));
 	}
 
 	Stream<Batch> extractBatchesOfVorgaengeFromDataSource() {
-		return extractBatchesFromDataSource(page -> getVorgaengeFromDataSource(page));
+		return extractBatchesFromDataSource(this::getVorgaengeFromDataSource);
 	}
 
 	List<OzgCloudVorgang> getVorgaengeFromDataSource(Page page) {
@@ -77,7 +75,8 @@ class AggregationLoader {
 	}
 
 	Stream<Batch> extractBatchesOfDeletedVorgaengeFromDataSource() {
-		return extractBatchesFromDataSource(getPagedDeletedVorgaenge(vorgangService.findDeleted()));
+		return Objects.isNull(formIdentifier) ? extractBatchesFromDataSource(getPagedDeletedVorgaenge(vorgangService.findDeleted()))
+				: Stream.empty();
 	}
 
 	Function<Page, List<OzgCloudVorgang>> getPagedDeletedVorgaenge(Stream<OzgCloudVorgangStub> allDeletedVorgaenge) {

src/test/java/de/ozgcloud/aggregation/AggregationLoaderTest.java

@@ -70,12 +70,9 @@ class AggregationLoaderTest {
 		@Captor
 		private ArgumentCaptor<Stream<Batch>> batchStreamCaptor;
 
-		@Nested
-		class TestOnFormIdentifierIsNull {
-
 		@BeforeEach
 		void setUp() {
-				aggregationLoader = spy(aggregationLoaderBuilder.formIdentifier(null).build());
+			aggregationLoader = spy(aggregationLoaderBuilder.formIdentifier(formIdentifier).build());
 			doReturn(Stream.of(batchOfVorgaenge)).when(aggregationLoader).extractBatchesOfVorgaengeFromDataSource();
 			doReturn(Stream.of(batchOfDeletedVorgaenge)).when(aggregationLoader).extractBatchesOfDeletedVorgaengeFromDataSource();
 			doNothing().when(aggregationLoader).loadVorgaengeIntoRepository(any());
@@ -104,40 +101,6 @@ class AggregationLoaderTest {
 		}
 	}
 
-		@Nested
-		class TestOnFormIdentifierIsNotNull {
-
-			@BeforeEach
-			void setUp() {
-				aggregationLoader = spy(aggregationLoaderBuilder.formIdentifier(formIdentifier).build());
-				doReturn(Stream.of(batchOfVorgaenge)).when(aggregationLoader).extractBatchesOfVorgaengeFromDataSource();
-				doNothing().when(aggregationLoader).loadVorgaengeIntoRepository(any());
-			}
-
-			@Test
-			void shouldExtractBatchesOfVorgaengeFromDataSource() {
-				aggregationLoader.load();
-
-				verify(aggregationLoader).extractBatchesOfVorgaengeFromDataSource();
-			}
-
-			@Test
-			void shouldNotExtractBatchesOfDeletedVorgaengeFromDataSource() {
-				aggregationLoader.load();
-
-				verify(aggregationLoader, never()).extractBatchesOfDeletedVorgaengeFromDataSource();
-			}
-
-			@Test
-			void shouldLoadVorgaengeIntoRepository() {
-				aggregationLoader.load();
-
-				verify(aggregationLoader).loadVorgaengeIntoRepository(batchStreamCaptor.capture());
-				assertThat(batchStreamCaptor.getValue()).containsExactly(batchOfVorgaenge);
-			}
-		}
-	}
-
 	@Nested
 	class TestExtractBatchesOfVorgaengeFromDataSource {
 		@Captor
@@ -276,6 +239,9 @@ class AggregationLoaderTest {
 		@Mock
 		private Batch batch;
 
+		@Nested
+		class TestOnFormIdentifierNull {
+
 			@BeforeEach
 			void init() {
 				aggregationLoader = spy(aggregationLoaderBuilder.formIdentifier(null).build());
@@ -296,7 +262,8 @@ class AggregationLoaderTest {
 				aggregationLoader.extractBatchesOfDeletedVorgaengeFromDataSource();
 
 				verify(aggregationLoader).getPagedDeletedVorgaenge(deletedVorgaengeCaptor.capture());
-			assertThat(deletedVorgaengeCaptor.getValue()).usingRecursiveFieldByFieldElementComparator().containsExactlyElementsOf(deletedVorgaenge);
+				assertThat(deletedVorgaengeCaptor.getValue()).usingRecursiveFieldByFieldElementComparator()
+						.containsExactlyElementsOf(deletedVorgaenge);
 			}
 
 			@Test
@@ -314,6 +281,32 @@ class AggregationLoaderTest {
 			}
 		}
 
+		@Nested
+		class TestOnFormIdentifierNotNull {
+
+			@BeforeEach
+			void init() {
+				aggregationLoader = spy(aggregationLoaderBuilder.formIdentifier(formIdentifier).build());
+			}
+
+			@Test
+			void shouldNotFindDeleted() {
+				aggregationLoader.extractBatchesOfDeletedVorgaengeFromDataSource();
+
+				verify(vorgangService, never()).findDeleted();
+			}
+
+			@Test
+			void shouldReturnEmptyStream() {
+				aggregationLoader = spy(aggregationLoaderBuilder.formIdentifier(formIdentifier).build());
+
+				var extracted = aggregationLoader.extractBatchesOfDeletedVorgaengeFromDataSource();
+
+				assertThat(extracted).isEmpty();
+			}
+		}
+	}
+
 	@Nested
 	class TestGetPagedDeletedVorgaenge {