Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Merge branch 'RED-9947' into 'master'

Browse Source 
RED-9947: added record for positions list for code readability

Closes RED-9947

See merge request redactmanager/persistence-service!718
This commit is contained in:
Maverick Studer 2024-09-04 10:51:28 +02:00
commit 149ce5144d
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/SearchTermOccurrencesResponseReceiver.java
View File

@ -75,14 +75,14 @@ public class SearchTermOccurrencesResponseReceiver {
var dossier = dossierManagementService.getDossierById(response.getDossierId(), false, false);
Set<AddRedactionRequestModel> addRedactionRequests = response.getPositions()
Set<AddRedactionRequestModel> 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());

7
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/SearchTermOccurrencesTest.java
View File

@ -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<ManualRedactionEntryEntity> newEntries = manualRedactionRepository.findByFileIdAndOptions(file.getId(), false, false, false);
@ -132,7 +133,8 @@ public class SearchTermOccurrencesTest extends AbstractPersistenceServerServiceT
.build();
EntityLogEntry entityLogEntry = pendingEntryFactory.buildAddRedactionBulkLocalEntry(addRedactionBulkLocalRequestModel);
List<Position> 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());
}
}

3
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/BulkLocalResponse.java
View File

@ -38,6 +38,7 @@ public class BulkLocalResponse {
@NonNull
@Builder.Default
private List<List<Position>> positions = new ArrayList<>();
private List<EntityPosition> entityPositions = new ArrayList<>();
}

9
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/EntityPosition.java Normal file
View File

@ -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<Position> positions) {
}