diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityLogCreatorService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityLogCreatorService.java index ca0a87c2..fa64944b 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityLogCreatorService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/EntityLogCreatorService.java @@ -33,6 +33,7 @@ import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntit import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document; import com.iqser.red.service.redaction.v1.server.model.document.nodes.Image; import com.iqser.red.service.redaction.v1.server.model.document.nodes.ImageType; +import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode; import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService; import lombok.AccessLevel; @@ -201,7 +202,7 @@ public class EntityLogCreatorService { .containingNodeId(image.getTreeId()) .closestHeadline(image.getHeadline().getTextBlock().getSearchText()) .section(image.getManualOverwrite().getSection() - .orElse(image.getParent().toString())) + .orElse(this.buildSectionString(image.getParent()))) .imageHasTransparency(image.isTransparent()) .manualChanges(ManualChangeFactory.toLocalManualChangeList(image.getManualOverwrite().getManualChangeLog(), true)) .state(buildEntryState(image)) @@ -267,7 +268,7 @@ public class EntityLogCreatorService { .orElse(entity.getMatchedRule().isWriteValueWithLineBreaks() ? entity.getValueWithLineBreaks() : entity.getValue())) .type(entity.type()) .section(entity.getManualOverwrite().getSection() - .orElse(entity.getDeepestFullyContainingNode().toString())) + .orElse(this.buildSectionString(entity.getDeepestFullyContainingNode()))) .containingNodeId(entity.getDeepestFullyContainingNode().getTreeId()) .closestHeadline(entity.getDeepestFullyContainingNode().getHeadline().getTextBlock().getSearchText()) .matchedRule(entity.getMatchedRule().getRuleIdentifier().toString()) @@ -355,4 +356,10 @@ public class EntityLogCreatorService { .collect(Collectors.toList()); } + + private String buildSectionString(SemanticNode node) { + + return node.getType().toString() + ": " + node.getTextBlock().buildSummary(); + } + } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionAcceptanceTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionAcceptanceTest.java index 08aa7f2e..b475bcbe 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionAcceptanceTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionAcceptanceTest.java @@ -138,8 +138,10 @@ public class RedactionAcceptanceTest extends AbstractRedactionIntegrationTest { var publishedInformationEntry1 = findEntityByTypeAndValue(entityLog, "published_information", "Oxford University Press").findFirst() .orElseThrow(); + assertThat(publishedInformationEntry1.getSection().startsWith("Paragraph:")); var asyaLyon1 = findEntityByTypeAndValueAndSectionNumber(entityLog, "CBI_author", "Asya Lyon", publishedInformationEntry1.getContainingNodeId()).findFirst() .orElseThrow(); + assertThat(publishedInformationEntry1.getSection().startsWith("Paragraph:")); assertEquals(EntryState.SKIPPED, asyaLyon1.getState());