From 9c0c442eb61db6f8e8edb729bf39714a92d9bf65 Mon Sep 17 00:00:00 2001 From: maverickstuder Date: Wed, 4 Sep 2024 10:38:51 +0200 Subject: [PATCH] RED-9947: added record for positions list for code readability --- .../queue/SearchTermOccurrencesResponseReceiver.java | 6 +++--- .../integration/tests/SearchTermOccurrencesTest.java | 7 +++++-- .../service/v1/api/shared/model/BulkLocalResponse.java | 3 ++- .../service/v1/api/shared/model/EntityPosition.java | 9 +++++++++ 4 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/EntityPosition.java diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/SearchTermOccurrencesResponseReceiver.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/SearchTermOccurrencesResponseReceiver.java index 7bd41629c..c9a3c129c 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/SearchTermOccurrencesResponseReceiver.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/SearchTermOccurrencesResponseReceiver.java @@ -75,14 +75,14 @@ public class SearchTermOccurrencesResponseReceiver { var dossier = dossierManagementService.getDossierById(response.getDossierId(), false, false); - Set addRedactionRequests = response.getPositions() + Set addRedactionRequests = response.getEntityPositions() .stream() - .map(positions -> AddRedactionRequestModel.builder() + .map(entityPosition -> AddRedactionRequestModel.builder() .type(response.getType()) .value(response.getSearchTerm()) .reason(response.getReason()) .legalBasis(response.getLegalBasis()) - .positions(convertPositions(positions)) + .positions(convertPositions(entityPosition.positions())) .section(response.getSection()) .build()) .collect(Collectors.toSet()); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/SearchTermOccurrencesTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/SearchTermOccurrencesTest.java index 1693343fc..789e8440e 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/SearchTermOccurrencesTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/SearchTermOccurrencesTest.java @@ -42,6 +42,7 @@ import com.iqser.red.service.persistence.management.v1.processor.service.queue.S import com.iqser.red.service.persistence.service.v1.api.shared.model.BulkLocalResponse; import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierTemplateModel; +import com.iqser.red.service.persistence.service.v1.api.shared.model.EntityPosition; import com.iqser.red.service.persistence.service.v1.api.shared.model.FileStatus; import com.iqser.red.service.persistence.service.v1.api.shared.model.PrepareDownloadWithOptionRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry; @@ -105,7 +106,7 @@ public class SearchTermOccurrencesTest extends AbstractPersistenceServerServiceT .legalBasis("legalBasis") .reason("reason") .section("section") - .positions(List.of(List.of(new Position(new float[]{1f, 2f, 3f, 4f}, 1)))) + .entityPositions(List.of(new EntityPosition(List.of(new Position(new float[]{1f, 2f, 3f, 4f}, 1))))) .build()); List newEntries = manualRedactionRepository.findByFileIdAndOptions(file.getId(), false, false, false); @@ -132,7 +133,8 @@ public class SearchTermOccurrencesTest extends AbstractPersistenceServerServiceT .build(); EntityLogEntry entityLogEntry = pendingEntryFactory.buildAddRedactionBulkLocalEntry(addRedactionBulkLocalRequestModel); List positions = convertPositions(addRedactionBulkLocalRequestModel.getPositions()); - assertEquals(entityLogEntry.getPositions().get(0), positions.get(0)); + assertEquals(entityLogEntry.getPositions() + .get(0), positions.get(0)); assertEquals(entityLogEntry.getValue(), addRedactionBulkLocalRequestModel.getValue()); assertEquals(entityLogEntry.getLegalBasis(), addRedactionBulkLocalRequestModel.getLegalBasis()); assertEquals(entityLogEntry.getReason(), addRedactionBulkLocalRequestModel.getReason()); @@ -147,4 +149,5 @@ public class SearchTermOccurrencesTest extends AbstractPersistenceServerServiceT .map(rectangle -> new Position(rectangle.getTopLeftX(), rectangle.getTopLeftY(), rectangle.getWidth(), rectangle.getHeight(), rectangle.getPage())) .collect(Collectors.toList()); } + } diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/BulkLocalResponse.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/BulkLocalResponse.java index f0c770d1a..725b1ef49 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/BulkLocalResponse.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/BulkLocalResponse.java @@ -38,6 +38,7 @@ public class BulkLocalResponse { @NonNull @Builder.Default - private List> positions = new ArrayList<>(); + private List entityPositions = new ArrayList<>(); + } diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/EntityPosition.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/EntityPosition.java new file mode 100644 index 000000000..3001a7e25 --- /dev/null +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/EntityPosition.java @@ -0,0 +1,9 @@ +package com.iqser.red.service.persistence.service.v1.api.shared.model; + +import java.util.List; + +import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position; + +public record EntityPosition(List positions) { + +}