Skip to content
Snippets Groups Projects
Commit 8e069cd6 authored by Felix Reichenbach's avatar Felix Reichenbach
Browse files

Merge branch 'OZG-7846-filter-for-form-engine' into 'main' 

Ozg 7846 filter for form engine

See merge request !13
parents f0774609 be7edcb1
No related branches found
No related tags found
1 merge request!13Ozg 7846 filter for form engine
Show whitespace changes
Inline Side-by-side
pom.xml
+ 1
− 1
View file @ 8e069cd6
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<inceptionYear>2024</inceptionYear> <inceptionYear>2024</inceptionYear>
<properties> <properties>
<ozgcloud.api-lib.version>0.18.0</ozgcloud.api-lib.version> <ozgcloud.api-lib.version>0.19.0-SNAPSHOT</ozgcloud.api-lib.version>
<jslt.version>0.1.14</jslt.version> <jslt.version>0.1.14</jslt.version>
<hibernate-validator.version>8.0.2.Final</hibernate-validator.version> <hibernate-validator.version>8.0.2.Final</hibernate-validator.version>
<spring-boot.build-image.imageName>docker.ozg-sh.de/aggregation-manager:build-latest</spring-boot.build-image.imageName> <spring-boot.build-image.imageName>docker.ozg-sh.de/aggregation-manager:build-latest</spring-boot.build-image.imageName>
......
src/main/java/de/ozgcloud/aggregation/AggregationManagerRunner.java
+ 29
− 14
View file @ 8e069cd6
...@@ -25,6 +25,7 @@ package de.ozgcloud.aggregation; ...@@ -25,6 +25,7 @@ package de.ozgcloud.aggregation;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.IntFunction; import java.util.function.IntFunction;
...@@ -40,6 +41,7 @@ import org.springframework.boot.CommandLineRunner; ...@@ -40,6 +41,7 @@ import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import de.ozgcloud.aggregation.transformation.AggregationMapping.FormIdentifier;
import de.ozgcloud.aggregation.transformation.Transformation; import de.ozgcloud.aggregation.transformation.Transformation;
import de.ozgcloud.aggregation.transformation.TransformationException; import de.ozgcloud.aggregation.transformation.TransformationException;
import de.ozgcloud.aggregation.transformation.TransformationService; import de.ozgcloud.aggregation.transformation.TransformationService;
...@@ -48,6 +50,7 @@ import de.ozgcloud.aggregation.warehouse.DocumentEntry; ...@@ -48,6 +50,7 @@ import de.ozgcloud.aggregation.warehouse.DocumentEntry;
import de.ozgcloud.aggregation.warehouse.WarehouseRepository; import de.ozgcloud.aggregation.warehouse.WarehouseRepository;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgang; import de.ozgcloud.apilib.vorgang.OzgCloudVorgang;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangQuery; import de.ozgcloud.apilib.vorgang.OzgCloudVorgangQuery;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangQuery.FormIdentification;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService; import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStub; import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStub;
import de.ozgcloud.apilib.vorgang.Page; import de.ozgcloud.apilib.vorgang.Page;
...@@ -80,45 +83,57 @@ public class AggregationManagerRunner implements CommandLineRunner { ...@@ -80,45 +83,57 @@ public class AggregationManagerRunner implements CommandLineRunner {
var identifier = transformationProperties.getIdentifier(); var identifier = transformationProperties.getIdentifier();
var aggregationMappings = transformationProperties.getAggregationMappings(); var aggregationMappings = transformationProperties.getAggregationMappings();
if (Objects.isNull(aggregationMappings) || aggregationMappings.isEmpty()) { if (Objects.isNull(aggregationMappings) || aggregationMappings.isEmpty()) {
runWithTransformation(transformationService.load(identifier, null)); runWithTransformation(transformationService.load(identifier, null), Optional.empty());
} else { } else {
aggregationMappings.stream() aggregationMappings.stream()
.map(aggregationMapping -> transformationService.load(identifier, aggregationMapping)) .forEach(aggregationMapping -> runWithTransformation(transformationService.load(identifier, aggregationMapping),
.forEach(this::runWithTransformation); Optional.of(aggregationMapping.getFormIdentifier())));
} }
} }
void runWithTransformation(Transformation transformation) { void runWithTransformation(Transformation transformation, Optional<FormIdentifier> formIdentifier) {
try (Execution execution = new Execution(transformation)) { try (Execution execution = new Execution(transformation)) {
ThreadContext.put(MDC_EXECUTION, execution.id.toString()); ThreadContext.put(MDC_EXECUTION, execution.id.toString());
loadVorgaengeIntoRepository(Stream.concat( loadVorgaengeIntoRepository(Stream.concat(
extractBatchesOfVorgaengeFromDataSource(execution), extractBatchesOfVorgaengeFromDataSource(execution, formIdentifier),
extractBatchesOfDeletedVorgaengeFromDataSource(execution))); extractBatchesOfDeletedVorgaengeFromDataSource(execution, formIdentifier)));
} finally { } finally {
ThreadContext.remove(MDC_EXECUTION); ThreadContext.remove(MDC_EXECUTION);
} }
} }
void loadVorgaengeIntoRepository(Stream<Batch> batches) { void loadVorgaengeIntoRepository(Stream<Batch> batches) {
repository.deleteAll();
batches.map(this::transformBatchToDocumentEntries).forEach(this::loadDocumentEntriesIntoRepository); batches.map(this::transformBatchToDocumentEntries).forEach(this::loadDocumentEntriesIntoRepository);
} }
Stream<Batch> extractBatchesOfVorgaengeFromDataSource(Execution execution) { Stream<Batch> extractBatchesOfVorgaengeFromDataSource(Execution execution, Optional<FormIdentifier> formIdentifier) {
return extractBatchesFromDataSource(execution, this::getVorgaengeFromDataSource); return extractBatchesFromDataSource(execution, page -> getVorgaengeFromDataSource(page, formIdentifier));
} }
List<OzgCloudVorgang> getVorgaengeFromDataSource(Page page) { List<OzgCloudVorgang> getVorgaengeFromDataSource(Page page, Optional<FormIdentifier> formIdentifier) {
return vorgangService.find(buildFindAllQuery(), page).stream() return vorgangService.find(buildFindByFormEngineQuery(formIdentifier), page).stream()
.map(vorgangStub -> vorgangService.getById(vorgangStub.getId())) .map(vorgangStub -> vorgangService.getById(vorgangStub.getId()))
.toList(); .toList();
} }
OzgCloudVorgangQuery buildFindAllQuery() { OzgCloudVorgangQuery buildFindByFormEngineQuery(Optional<FormIdentifier> formIdentifier) {
return OzgCloudVorgangQuery.builder().build(); return OzgCloudVorgangQuery.builder()
.form(mapToFormIdentification(formIdentifier))
.build();
} }
Stream<Batch> extractBatchesOfDeletedVorgaengeFromDataSource(Execution execution) { private Optional<FormIdentification> mapToFormIdentification(Optional<FormIdentifier> formIdentifier) {
return extractBatchesFromDataSource(execution, getPagedDeletedVorgaenge(vorgangService.findDeleted())); return formIdentifier
.map(identifier -> FormIdentification.builder()
.formId(identifier.getFormId())
.formEngineName(identifier.getFormEngineName())
.build());
}
Stream<Batch> extractBatchesOfDeletedVorgaengeFromDataSource(Execution execution, Optional<FormIdentifier> formIdentifier) {
return formIdentifier.isEmpty() ? extractBatchesFromDataSource(execution, getPagedDeletedVorgaenge(vorgangService.findDeleted()))
: Stream.empty();
} }
Function<Page, List<OzgCloudVorgang>> getPagedDeletedVorgaenge(Stream<OzgCloudVorgangStub> allDeletedVorgaenge) { Function<Page, List<OzgCloudVorgang>> getPagedDeletedVorgaenge(Stream<OzgCloudVorgangStub> allDeletedVorgaenge) {
......
src/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerTest.java
+ 117
− 45
View file @ 8e069cd6
...@@ -29,6 +29,7 @@ import static org.mockito.Mockito.*; ...@@ -29,6 +29,7 @@ import static org.mockito.Mockito.*;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import java.util.function.Function; import java.util.function.Function;
import java.util.stream.Stream; import java.util.stream.Stream;
...@@ -48,7 +49,9 @@ import com.thedeanda.lorem.LoremIpsum; ...@@ -48,7 +49,9 @@ import com.thedeanda.lorem.LoremIpsum;
import de.ozgcloud.aggregation.AggregationManagerRunner.Batch; import de.ozgcloud.aggregation.AggregationManagerRunner.Batch;
import de.ozgcloud.aggregation.AggregationManagerRunner.Execution; import de.ozgcloud.aggregation.AggregationManagerRunner.Execution;
import de.ozgcloud.aggregation.transformation.AggregationMapping; import de.ozgcloud.aggregation.transformation.AggregationMapping;
import de.ozgcloud.aggregation.transformation.AggregationMapping.FormIdentifier;
import de.ozgcloud.aggregation.transformation.AggregationMappingTestFactory; import de.ozgcloud.aggregation.transformation.AggregationMappingTestFactory;
import de.ozgcloud.aggregation.transformation.FormIdentifierTestFactory;
import de.ozgcloud.aggregation.transformation.Transformation; import de.ozgcloud.aggregation.transformation.Transformation;
import de.ozgcloud.aggregation.transformation.TransformationService; import de.ozgcloud.aggregation.transformation.TransformationService;
import de.ozgcloud.aggregation.transformation.VorgangMapper; import de.ozgcloud.aggregation.transformation.VorgangMapper;
...@@ -88,7 +91,7 @@ class AggregationManagerRunnerTest { ...@@ -88,7 +91,7 @@ class AggregationManagerRunnerTest {
@BeforeEach @BeforeEach
void mock() { void mock() {
when(transformationProperties.getIdentifier()).thenReturn(identifier); when(transformationProperties.getIdentifier()).thenReturn(identifier);
doNothing().when(runner).runWithTransformation(any()); doNothing().when(runner).runWithTransformation(any(), any());
} }
@Test @Test
...@@ -132,8 +135,8 @@ class AggregationManagerRunnerTest { ...@@ -132,8 +135,8 @@ class AggregationManagerRunnerTest {
void shouldRunWithTransformationForEachTransformation() { void shouldRunWithTransformationForEachTransformation() {
runner.run(); runner.run();
verify(runner).runWithTransformation(firstTransformation); verify(runner).runWithTransformation(firstTransformation, Optional.of(AggregationMappingTestFactory.FORM_IDENTIFIER));
verify(runner).runWithTransformation(secondTransformation); verify(runner).runWithTransformation(secondTransformation, Optional.of(AggregationMappingTestFactory.FORM_IDENTIFIER));
} }
} }
...@@ -159,7 +162,7 @@ class AggregationManagerRunnerTest { ...@@ -159,7 +162,7 @@ class AggregationManagerRunnerTest {
void shouldCallRunWithTransformation() { void shouldCallRunWithTransformation() {
runner.run(); runner.run();
verify(runner).runWithTransformation(transformation); verify(runner).runWithTransformation(transformation, Optional.empty());
} }
} }
...@@ -185,7 +188,7 @@ class AggregationManagerRunnerTest { ...@@ -185,7 +188,7 @@ class AggregationManagerRunnerTest {
void shouldCallRunWithTransformation() { void shouldCallRunWithTransformation() {
runner.run(); runner.run();
verify(runner).runWithTransformation(transformation); verify(runner).runWithTransformation(transformation, Optional.empty());
} }
} }
} }
...@@ -196,6 +199,7 @@ class AggregationManagerRunnerTest { ...@@ -196,6 +199,7 @@ class AggregationManagerRunnerTest {
@Mock @Mock
private Transformation transformation; private Transformation transformation;
private final ArgumentMatcher<Execution> hasTransformation = execution -> execution.getTransformation().equals(transformation); private final ArgumentMatcher<Execution> hasTransformation = execution -> execution.getTransformation().equals(transformation);
private final Optional<FormIdentifier> formIdentifier = Optional.of(FormIdentifierTestFactory.create());
@Mock @Mock
private Batch batchOfVorgaenge; private Batch batchOfVorgaenge;
@Mock @Mock
...@@ -205,28 +209,28 @@ class AggregationManagerRunnerTest { ...@@ -205,28 +209,28 @@ class AggregationManagerRunnerTest {
@BeforeEach @BeforeEach
void init() { void init() {
doReturn(Stream.of(batchOfVorgaenge)).when(runner).extractBatchesOfVorgaengeFromDataSource(any()); doReturn(Stream.of(batchOfVorgaenge)).when(runner).extractBatchesOfVorgaengeFromDataSource(any(), any());
doReturn(Stream.of(batchOfDeletedVorgaenge)).when(runner).extractBatchesOfDeletedVorgaengeFromDataSource(any()); doReturn(Stream.of(batchOfDeletedVorgaenge)).when(runner).extractBatchesOfDeletedVorgaengeFromDataSource(any(), any());
doNothing().when(runner).loadVorgaengeIntoRepository(any()); doNothing().when(runner).loadVorgaengeIntoRepository(any());
} }
@Test @Test
void shouldExtractBatchesOfVorgaengeFromDataSource() { void shouldExtractBatchesOfVorgaengeFromDataSource() {
runner.runWithTransformation(transformation); runner.runWithTransformation(transformation, formIdentifier);
verify(runner).extractBatchesOfVorgaengeFromDataSource(argThat(hasTransformation)); verify(runner).extractBatchesOfVorgaengeFromDataSource(argThat(hasTransformation), eq(formIdentifier));
} }
@Test @Test
void shouldExtractBatchesOfDeletedVorgaengeFromDataSource() { void shouldExtractBatchesOfDeletedVorgaengeFromDataSource() {
runner.runWithTransformation(transformation); runner.runWithTransformation(transformation, formIdentifier);
verify(runner).extractBatchesOfDeletedVorgaengeFromDataSource(argThat(hasTransformation)); verify(runner).extractBatchesOfDeletedVorgaengeFromDataSource(argThat(hasTransformation), eq(formIdentifier));
} }
@Test @Test
void shouldLoadVorgaengeIntoRepository() { void shouldLoadVorgaengeIntoRepository() {
runner.runWithTransformation(transformation); runner.runWithTransformation(transformation, formIdentifier);
verify(runner).loadVorgaengeIntoRepository(batchStreamCaptor.capture()); verify(runner).loadVorgaengeIntoRepository(batchStreamCaptor.capture());
assertThat(batchStreamCaptor.getValue()).containsExactly(batchOfVorgaenge, batchOfDeletedVorgaenge); assertThat(batchStreamCaptor.getValue()).containsExactly(batchOfVorgaenge, batchOfDeletedVorgaenge);
...@@ -250,6 +254,13 @@ class AggregationManagerRunnerTest { ...@@ -250,6 +254,13 @@ class AggregationManagerRunnerTest {
doNothing().when(runner).loadDocumentEntriesIntoRepository(any()); doNothing().when(runner).loadDocumentEntriesIntoRepository(any());
} }
@Test
void shouldDropCollection() {
loadVorgaengeIntoRepository();
verify(repository).deleteAll();
}
@Test @Test
void shouldTransform() { void shouldTransform() {
loadVorgaengeIntoRepository(); loadVorgaengeIntoRepository();
...@@ -273,6 +284,7 @@ class AggregationManagerRunnerTest { ...@@ -273,6 +284,7 @@ class AggregationManagerRunnerTest {
@Nested @Nested
class TestExtractBatchesOfVorgaengeFromDataSource { class TestExtractBatchesOfVorgaengeFromDataSource {
private final Optional<FormIdentifier> formIdentifier = Optional.of(FormIdentifierTestFactory.create());
@Mock @Mock
private Execution execution; private Execution execution;
@Captor @Captor
...@@ -289,23 +301,23 @@ class AggregationManagerRunnerTest { ...@@ -289,23 +301,23 @@ class AggregationManagerRunnerTest {
@Test @Test
void shouldExtract() { void shouldExtract() {
runner.extractBatchesOfVorgaengeFromDataSource(execution); runner.extractBatchesOfVorgaengeFromDataSource(execution, formIdentifier);
verify(runner).extractBatchesFromDataSource(eq(execution), any()); verify(runner).extractBatchesFromDataSource(eq(execution), any());
} }
@Test @Test
void shouldExtractWithDataRetrievalFunction() { void shouldExtractWithDataRetrievalFunction() {
runner.extractBatchesOfVorgaengeFromDataSource(execution); runner.extractBatchesOfVorgaengeFromDataSource(execution, formIdentifier);
verify(runner).extractBatchesFromDataSource(eq(execution), functionToRetrieveDataCaptor.capture()); verify(runner).extractBatchesFromDataSource(eq(execution), functionToRetrieveDataCaptor.capture());
functionToRetrieveDataCaptor.getValue().apply(page); functionToRetrieveDataCaptor.getValue().apply(page);
verify(runner).getVorgaengeFromDataSource(page); verify(runner).getVorgaengeFromDataSource(page, formIdentifier);
} }
@Test @Test
void shouldReturnExtractedBatches() { void shouldReturnExtractedBatches() {
var extracted = runner.extractBatchesOfVorgaengeFromDataSource(execution); var extracted = runner.extractBatchesOfVorgaengeFromDataSource(execution, formIdentifier);
assertThat(extracted).containsExactly(batch); assertThat(extracted).containsExactly(batch);
} }
...@@ -315,15 +327,23 @@ class AggregationManagerRunnerTest { ...@@ -315,15 +327,23 @@ class AggregationManagerRunnerTest {
class TestGetVorgaengeFromDataSource { class TestGetVorgaengeFromDataSource {
private final Page page = Page.builder().offset(10).limit(2).build(); private final Page page = Page.builder().offset(10).limit(2).build();
private final Optional<FormIdentifier> formIdentifier = Optional.of(FormIdentifierTestFactory.create());
private final OzgCloudVorgangQuery query = OzgCloudVorgangQuery.builder().build(); private final OzgCloudVorgangQuery query = OzgCloudVorgangQuery.builder().build();
@BeforeEach @BeforeEach
void init() { void init() {
doReturn(query).when(runner).buildFindAllQuery(); doReturn(query).when(runner).buildFindByFormEngineQuery(any());
when(vorgangService.find(any(), any())).thenReturn(List.of(OzgCloudVorgangStubTestFactory.create())); when(vorgangService.find(any(), any())).thenReturn(List.of(OzgCloudVorgangStubTestFactory.create()));
when(vorgangService.getById(any())).thenReturn(OzgCloudVorgangTestFactory.create()); when(vorgangService.getById(any())).thenReturn(OzgCloudVorgangTestFactory.create());
} }
@Test
void shouldCallBuildFindByFormEngineQuery() {
getVorgaengeFromDataSource();
verify(runner).buildFindByFormEngineQuery(formIdentifier);
}
@Test @Test
void shouldCallVorgangService() { void shouldCallVorgangService() {
getVorgaengeFromDataSource(); getVorgaengeFromDataSource();
...@@ -346,7 +366,42 @@ class AggregationManagerRunnerTest { ...@@ -346,7 +366,42 @@ class AggregationManagerRunnerTest {
} }
private List<OzgCloudVorgang> getVorgaengeFromDataSource() { private List<OzgCloudVorgang> getVorgaengeFromDataSource() {
return runner.getVorgaengeFromDataSource(page); return runner.getVorgaengeFromDataSource(page, formIdentifier);
}
}
@Nested
class TestBuildFindByFormEngineQuery {
@Nested
class TestOnEmptyFormIdentifier {
@Test
void shouldReturnFindAllQueryOnEmptyFormIdentifier() {
var query = runner.buildFindByFormEngineQuery(Optional.empty());
assertThat(query).usingRecursiveComparison().isEqualTo(OzgCloudVorgangQuery.builder().build());
}
}
@Nested
class TestOnFormIdentifierNotEmpty {
private final Optional<FormIdentifier> formIdentifier = Optional.of(FormIdentifierTestFactory.create());
@Test
void shouldSetFormIdInQuery() {
var query = runner.buildFindByFormEngineQuery(formIdentifier);
assertThat(query.getForm()).get().extracting("formId").isEqualTo(FormIdentifierTestFactory.FORM_ID);
}
@Test
void shouldSetFormEngineNameInQuery() {
var query = runner.buildFindByFormEngineQuery(formIdentifier);
assertThat(query.getForm()).get().extracting("formEngineName").isEqualTo(FormIdentifierTestFactory.FORM_ENGINE_NAME);
}
} }
} }
...@@ -363,6 +418,9 @@ class AggregationManagerRunnerTest { ...@@ -363,6 +418,9 @@ class AggregationManagerRunnerTest {
@Mock @Mock
private Batch batch; private Batch batch;
@Nested
class TestOnEmptyFormIdentifier {
@BeforeEach @BeforeEach
void init() { void init() {
when(vorgangService.findDeleted()).thenReturn(deletedVorgaenge.stream()); when(vorgangService.findDeleted()).thenReturn(deletedVorgaenge.stream());
...@@ -372,34 +430,49 @@ class AggregationManagerRunnerTest { ...@@ -372,34 +430,49 @@ class AggregationManagerRunnerTest {
@Test @Test
void shouldFindDeleted() { void shouldFindDeleted() {
runner.extractBatchesOfDeletedVorgaengeFromDataSource(execution); runner.extractBatchesOfDeletedVorgaengeFromDataSource(execution, Optional.empty());
verify(vorgangService).findDeleted(); verify(vorgangService).findDeleted();
} }
@Test @Test
void shouldGetPagedDeletedVorgaenge() { void shouldGetPagedDeletedVorgaenge() {
runner.extractBatchesOfDeletedVorgaengeFromDataSource(execution); runner.extractBatchesOfDeletedVorgaengeFromDataSource(execution, Optional.empty());
verify(runner).getPagedDeletedVorgaenge(deletedVorgaengeCaptor.capture()); verify(runner).getPagedDeletedVorgaenge(deletedVorgaengeCaptor.capture());
assertThat(deletedVorgaengeCaptor.getValue()).usingRecursiveFieldByFieldElementComparator().containsExactlyElementsOf(deletedVorgaenge); assertThat(deletedVorgaengeCaptor.getValue()).usingRecursiveFieldByFieldElementComparator()
.containsExactlyElementsOf(deletedVorgaenge);
} }
@Test @Test
void shouldExtractWithDataRetrievalFunction() { void shouldExtractWithDataRetrievalFunction() {
runner.extractBatchesOfDeletedVorgaengeFromDataSource(execution); runner.extractBatchesOfDeletedVorgaengeFromDataSource(execution, Optional.empty());
verify(runner).extractBatchesFromDataSource(execution, functionToRetrieveData); verify(runner).extractBatchesFromDataSource(execution, functionToRetrieveData);
} }
@Test @Test
void shouldReturnExtractedBatches() { void shouldReturnExtractedBatches() {
var extracted = runner.extractBatchesOfDeletedVorgaengeFromDataSource(execution); var extracted = runner.extractBatchesOfDeletedVorgaengeFromDataSource(execution, Optional.empty());
assertThat(extracted).containsExactly(batch); assertThat(extracted).containsExactly(batch);
} }
} }
@Nested
class TestOnFormIdentifierNotEmpty {
private final Optional<FormIdentifier> formIdentifier = Optional.of(FormIdentifierTestFactory.create());
@Test
void shouldReturnEmptyStream() {
var extracted = runner.extractBatchesOfDeletedVorgaengeFromDataSource(execution, formIdentifier);
assertThat(extracted).isEmpty();
}
}
}
@Nested @Nested
class TestGetPagedDeletedVorgaenge { class TestGetPagedDeletedVorgaenge {
...@@ -483,8 +556,7 @@ class AggregationManagerRunnerTest { ...@@ -483,8 +556,7 @@ class AggregationManagerRunnerTest {
assertThat(batches).hasSize(2).usingRecursiveFieldByFieldElementComparator().containsExactly( assertThat(batches).hasSize(2).usingRecursiveFieldByFieldElementComparator().containsExactly(
new Batch(execution, BATCH_1_UUID, Page.builder().offset(0).limit(BATCH_SIZE).build(), VORGAENGE_1), new Batch(execution, BATCH_1_UUID, Page.builder().offset(0).limit(BATCH_SIZE).build(), VORGAENGE_1),
new Batch(execution, BATCH_2_UUID, Page.builder().offset(BATCH_SIZE).limit(BATCH_SIZE).build(), VORGAENGE_2) new Batch(execution, BATCH_2_UUID, Page.builder().offset(BATCH_SIZE).limit(BATCH_SIZE).build(), VORGAENGE_2));
);
} }
private ArgumentMatcher<Page> hasExpectedOffsetAndConfiguredLimit(int expectedOffset) { private ArgumentMatcher<Page> hasExpectedOffsetAndConfiguredLimit(int expectedOffset) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit