Compare commits

...

8 Commits

2 changed files with 13 additions and 2 deletions

View File

@ -54,7 +54,7 @@ public class EntityLogCreatorService {
RedactionStorageService redactionStorageService;
private static boolean notFalsePositiveOrFalseRecommendation(TextEntity textEntity) {
public static boolean notFalsePositiveOrFalseRecommendation(TextEntity textEntity) {
return !(textEntity.getEntityType().equals(EntityType.FALSE_POSITIVE) || textEntity.getEntityType().equals(EntityType.FALSE_RECOMMENDATION));
}
@ -148,6 +148,7 @@ public class EntityLogCreatorService {
List<EntityLogEntry> entries = new ArrayList<>();
Set<String> processedIds = new HashSet<>();
log.info("NotFound: {}", notFoundManualRedactionEntries);
document.getEntities()
.stream()
.filter(EntityLogCreatorService::notFalsePositiveOrFalseRecommendation)
@ -155,6 +156,7 @@ public class EntityLogCreatorService {
.forEach(entityNode -> entries.addAll(toEntityLogEntries(entityNode, dossierTemplateId, processedIds)));
document.streamAllImages().filter(entity -> !entity.removed()).forEach(imageNode -> entries.add(createEntityLogEntry(imageNode, dossierTemplateId)));
notFoundManualRedactionEntries.stream().filter(entity -> !entity.removed()).forEach(manualEntity -> entries.add(createEntityLogEntry(manualEntity, dossierTemplateId)));
log.info("Found legal basis: {}", entries.stream().filter(entry -> entry.getValue().contains("Sternebral")).findFirst().get().getLegalBasis());
return entries;
}
@ -213,6 +215,8 @@ public class EntityLogCreatorService {
private EntityLogEntry createEntityLogEntry(ManualEntity manualEntity, String dossierTemplateId) {
log.info("Manual Entity: {}", manualEntity);
log.info("LegalBasis for manual entity: {}", manualEntity.legalBasis());
String type = manualEntity.getManualOverwrite().getType().orElse(manualEntity.getType());
boolean isHint = isHint(manualEntity.getEntityType());
return EntityLogEntry.builder()
@ -249,6 +253,7 @@ public class EntityLogCreatorService {
private EntityLogEntry createEntityLogEntry(TextEntity entity, String dossierTemplateId) {
log.info("textEntity: {}, legalBasis: {}", entity, entity.legalBasis());
Set<String> referenceIds = new HashSet<>();
entity.references().stream().filter(TextEntity::active).forEach(ref -> ref.getPositionsOnPagePerPage().forEach(pos -> referenceIds.add(pos.getId())));
boolean isHint = isHint(entity.getEntityType());

View File

@ -41,7 +41,10 @@ public class UnprocessedChangesService {
List<ManualEntity> notFoundManualEntities = manualEntityCreationService.toTextEntity(manualEntitiesConverter(manualRedactions), document);
document.getEntities().forEach(textEntity -> {
document.getEntities().stream()
.filter(EntityLogCreatorService::notFalsePositiveOrFalseRecommendation)
.filter(entity -> !entity.removed())
.forEach(textEntity -> {
Set<String> processedIds = new HashSet<>();
for (var positionsOnPerPage : textEntity.getPositionsOnPagePerPage()) {
if (processedIds.contains(positionsOnPerPage.getId())) {
@ -50,6 +53,7 @@ public class UnprocessedChangesService {
processedIds.add(positionsOnPerPage.getId());
List<Position> positions = positionsOnPerPage.getRectanglePerLine().stream().map(rectangle2D -> new Position(rectangle2D, positionsOnPerPage.getPage().getNumber()))
.toList();
log.info("UnprocessedTextEntity: {}, legalBasis: {}", textEntity, textEntity.legalBasis());
unprocessedManualEntities.add(UnprocessedManualEntity.builder()
.annotationId(annotationIds.stream().filter(textEntity::matchesAnnotationId).findFirst().orElse(""))
.closestHeadline(textEntity.getDeepestFullyContainingNode().getHeadline().getTextBlock().getSearchText())
@ -68,6 +72,7 @@ public class UnprocessedChangesService {
});
notFoundManualEntities.forEach(manualEntity -> {
log.info("COuldn't find! {}, legalBasis: {}", manualEntity, manualEntity.getLegalBasis());
unprocessedManualEntities.add(UnprocessedManualEntity.builder()
.annotationId(manualEntity.getId())
.color(getColor(manualEntity.getType(), dossierTemplateId, manualEntity.applied(), manualEntity.getEntityType().equals(EntityType.HINT)))
@ -84,6 +89,7 @@ public class UnprocessedChangesService {
.stream()
.map(entityPosition -> new Position(entityPosition.rectangle2D(), entityPosition.pageNumber()))
.toList())
.legalBasis(manualEntity.getLegalBasis())
.build());
});