RED-6009 - Document Tree Structure

* remove Add ManualRedactions handling

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/adapter/NerEntitiesAdapter.java

@@ -47,7 +47,7 @@ public class NerEntitiesAdapter {
     protected Stream<EntityRecognitionEntity> getValidatedEntities(NerEntities nerEntities, DocumentGraph documentGraph) {
 
         return addOffsetsAndFlatten(getStringStartOffsetsForMainSections(documentGraph), nerEntities) //
-                .filter(nerEntity -> nerEntityOffsetMatchesDocumentGraph(nerEntity, documentGraph.buildTextBlock()));
+                .filter(nerEntity -> nerEntityOffsetMatchesDocumentGraphOffsets(nerEntity, documentGraph.buildTextBlock()));
     }
 
 
@@ -116,7 +116,7 @@ public class NerEntitiesAdapter {
     }
 
 
-    private boolean nerEntityOffsetMatchesDocumentGraph(EntityRecognitionEntity nerEntity, TextBlock textBlock) {
+    private boolean nerEntityOffsetMatchesDocumentGraphOffsets(EntityRecognitionEntity nerEntity, TextBlock textBlock) {
 
         return nerEntity.getValue().contentEquals(textBlock.subSequence(nerEntity.getStartOffset(), nerEntity.getEndOffset()));
     }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/analyze/AnalyzeService.java

@@ -164,7 +164,6 @@ public class AnalyzeService {
         Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
 
         sectionsToReAnalyse.forEach(node -> entityRedactionService.addDictionaryEntities(dictionary, node));
-        entityRedactionService.applyManualRedactionEntries(analyzeRequest.getManualRedactions(), documentGraph);
         Set<FileAttribute> addedFileAttributes = entityRedactionService.addRuleEntities(dictionary, documentGraph, sectionsToReAnalyse, kieContainer, analyzeRequest, nerEntities);
 
         List<RedactionLogEntry> newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(documentGraph, analyzeRequest.getDossierTemplateId());

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/analyze/SectionFinder.java

@@ -3,7 +3,6 @@ package com.iqser.red.service.redaction.v1.server.redaction.service.analyze;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -16,7 +15,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualImageRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLog;
@@ -82,11 +80,7 @@ class SectionFinder {
                 Stream.concat(manualRedactions.getLegalBasisChanges().stream().map(ManualLegalBasisChange::getAnnotationId),
                         Stream.concat(manualRedactions.getImageRecategorization().stream().map(ManualImageRecategorization::getAnnotationId),
                                 Stream.concat(manualRedactions.getIdsToRemove().stream().map(IdRemoval::getAnnotationId),
-                                        Stream.concat(manualRedactions.getEntriesToAdd()
+                                        manualRedactions.getForceRedactions().stream().map(ManualForceRedaction::getAnnotationId))))).collect(Collectors.toSet());
-                                                        .stream()
-                                                        .map(ManualRedactionEntry::getSourceId)
-                                                        .filter(sourceId -> !Objects.isNull(sourceId)),
-                                                manualRedactions.getForceRedactions().stream().map(ManualForceRedaction::getAnnotationId)))))).collect(Collectors.toSet());
     }
 
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/entityredaction/EntityRedactionService.java

@@ -1,8 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service.entityredaction;
 
-import java.util.Collection;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -11,18 +9,13 @@ import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
 import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.PageNode;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.textblock.TextBlock;
 import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.EntityCreationService;
-import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.ManualRedactionApplicationService;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
@@ -41,7 +34,6 @@ public class EntityRedactionService {
 
     DroolsExecutionService droolsExecutionService;
     EntityCreationService entityCreationService;
-    ManualRedactionApplicationService manualRedactionApplicationService;
 
 
     public Set<FileAttribute> addRuleEntities(Dictionary dictionary,
@@ -85,53 +77,6 @@ public class EntityRedactionService {
     }
 
 
-    public void applyManualRedactionEntries(ManualRedactions manualRedactions, DocumentGraph documentGraph) {
-
-        if (manualRedactions == null) {
-            return;
-        }
-        manualRedactions.getEntriesToAdd()
-                .stream()
-                .filter(manualRedactionEntry -> Objects.nonNull(manualRedactionEntry.getSourceId()))
-                .forEach(manualRedactionEntry -> applyManualRedactionEntry(manualRedactionEntry, documentGraph));
-
-    }
-
-
-    private void applyManualRedactionEntry(ManualRedactionEntry manualRedactionEntry, DocumentGraph documentGraph) {
-
-        EntityType entityType = parseEntityType(manualRedactionEntry.getReason());
-        documentGraph.getPages()
-                .stream()
-                .filter(page -> isInManualRedactionEntry(manualRedactionEntry, page))
-                .map(PageNode::getEntities)
-                .flatMap(Collection::stream)
-                .filter(entity -> entity.matchesAnnotationId(manualRedactionEntry.getSourceId()))
-                .filter(entity -> entity.getValue().equals(manualRedactionEntry.getValue()))
-                .map(RedactionEntity::getBoundary)
-                .map(bound -> entityCreationService.byBoundary(bound, manualRedactionEntry.getType(), entityType, documentGraph))
-                .peek(entity -> entity.setLegalBasis(manualRedactionEntry.getLegalBasis()))
-                .forEach(entity -> entity.setRedactionReason(manualRedactionEntry.getReason()));
-    }
-
-
-    private EntityType parseEntityType(String reason) {
-
-        return switch (reason.toLowerCase()) {
-            case "false positive" -> EntityType.FALSE_POSITIVE;
-            case "false recommendation" -> EntityType.FALSE_RECOMMENDATION;
-            case "recommendation" -> EntityType.RECOMMENDATION;
-            default -> EntityType.ENTITY;
-        };
-    }
-
-
-    private static boolean isInManualRedactionEntry(ManualRedactionEntry manualRedactionEntry, PageNode page) {
-
-        return manualRedactionEntry.getPositions().stream().map(Rectangle::getPage).collect(Collectors.toSet()).contains(page.getNumber());
-    }
-
-
     public void addDictionaryEntities(Dictionary dictionary, SemanticNode node) {
 
         for (var model : dictionary.getDictionaryModels()) {