RED-9947: added record for positions list for code readability
This commit is contained in:
parent
11088ddfef
commit
9c0c442eb6
@ -75,14 +75,14 @@ public class SearchTermOccurrencesResponseReceiver {
|
|||||||
|
|
||||||
var dossier = dossierManagementService.getDossierById(response.getDossierId(), false, false);
|
var dossier = dossierManagementService.getDossierById(response.getDossierId(), false, false);
|
||||||
|
|
||||||
Set<AddRedactionRequestModel> addRedactionRequests = response.getPositions()
|
Set<AddRedactionRequestModel> addRedactionRequests = response.getEntityPositions()
|
||||||
.stream()
|
.stream()
|
||||||
.map(positions -> AddRedactionRequestModel.builder()
|
.map(entityPosition -> AddRedactionRequestModel.builder()
|
||||||
.type(response.getType())
|
.type(response.getType())
|
||||||
.value(response.getSearchTerm())
|
.value(response.getSearchTerm())
|
||||||
.reason(response.getReason())
|
.reason(response.getReason())
|
||||||
.legalBasis(response.getLegalBasis())
|
.legalBasis(response.getLegalBasis())
|
||||||
.positions(convertPositions(positions))
|
.positions(convertPositions(entityPosition.positions()))
|
||||||
.section(response.getSection())
|
.section(response.getSection())
|
||||||
.build())
|
.build())
|
||||||
.collect(Collectors.toSet());
|
.collect(Collectors.toSet());
|
||||||
|
|||||||
@ -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.BulkLocalResponse;
|
||||||
import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierRequest;
|
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.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.FileStatus;
|
||||||
import com.iqser.red.service.persistence.service.v1.api.shared.model.PrepareDownloadWithOptionRequest;
|
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;
|
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")
|
.legalBasis("legalBasis")
|
||||||
.reason("reason")
|
.reason("reason")
|
||||||
.section("section")
|
.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());
|
.build());
|
||||||
|
|
||||||
List<ManualRedactionEntryEntity> newEntries = manualRedactionRepository.findByFileIdAndOptions(file.getId(), false, false, false);
|
List<ManualRedactionEntryEntity> newEntries = manualRedactionRepository.findByFileIdAndOptions(file.getId(), false, false, false);
|
||||||
@ -132,7 +133,8 @@ public class SearchTermOccurrencesTest extends AbstractPersistenceServerServiceT
|
|||||||
.build();
|
.build();
|
||||||
EntityLogEntry entityLogEntry = pendingEntryFactory.buildAddRedactionBulkLocalEntry(addRedactionBulkLocalRequestModel);
|
EntityLogEntry entityLogEntry = pendingEntryFactory.buildAddRedactionBulkLocalEntry(addRedactionBulkLocalRequestModel);
|
||||||
List<Position> positions = convertPositions(addRedactionBulkLocalRequestModel.getPositions());
|
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.getValue(), addRedactionBulkLocalRequestModel.getValue());
|
||||||
assertEquals(entityLogEntry.getLegalBasis(), addRedactionBulkLocalRequestModel.getLegalBasis());
|
assertEquals(entityLogEntry.getLegalBasis(), addRedactionBulkLocalRequestModel.getLegalBasis());
|
||||||
assertEquals(entityLogEntry.getReason(), addRedactionBulkLocalRequestModel.getReason());
|
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()))
|
.map(rectangle -> new Position(rectangle.getTopLeftX(), rectangle.getTopLeftY(), rectangle.getWidth(), rectangle.getHeight(), rectangle.getPage()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -38,6 +38,7 @@ public class BulkLocalResponse {
|
|||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Builder.Default
|
@Builder.Default
|
||||||
private List<List<Position>> positions = new ArrayList<>();
|
private List<EntityPosition> entityPositions = new ArrayList<>();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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) {
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user