From 6da7c23fc2d811f31f57c4d89e1388e37e78f82e Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Wed, 25 Oct 2023 15:51:04 +0300 Subject: [PATCH] RED-7784 - Add section to UnprocessedManualEntity --- .../red/service/redaction/v1/model/UnprocessedManualEntity.java | 1 + .../redaction/v1/server/service/UnprocessedChangesService.java | 2 ++ .../server/service/document/UnprocessedChangesServiceTest.java | 2 ++ 3 files changed, 5 insertions(+) diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/UnprocessedManualEntity.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/UnprocessedManualEntity.java index 48d419bf..8c2851d4 100644 --- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/UnprocessedManualEntity.java +++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/UnprocessedManualEntity.java @@ -21,6 +21,7 @@ public class UnprocessedManualEntity { private int startOffset; private int endOffset; private String closestHeadline; + private String section; private float[] color; private List containingNodeId; } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java index 57ece443..9ebc8baa 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java @@ -49,6 +49,7 @@ public class UnprocessedChangesService { .containingNodeId(textEntity.getDeepestFullyContainingNode().getTreeId()) .textBefore(textEntity.getTextBefore()) .textAfter(textEntity.getTextAfter()) + .section(textEntity.getManualOverwrite().getSection().orElse(textEntity.getDeepestFullyContainingNode().toString())) .build()); }); @@ -62,6 +63,7 @@ public class UnprocessedChangesService { .containingNodeId(Collections.emptyList()) .textAfter("") .textBefore("") + .section("") .build()); }); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/document/UnprocessedChangesServiceTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/document/UnprocessedChangesServiceTest.java index c0e8d2f5..6e9ce5a5 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/document/UnprocessedChangesServiceTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/document/UnprocessedChangesServiceTest.java @@ -142,6 +142,7 @@ public class UnprocessedChangesServiceTest extends AbstractRedactionIntegrationT assertEquals(unprocessedManualEntity.getStartOffset(), 2766); assertEquals(unprocessedManualEntity.getEndOffset(), 2770); assertEquals(unprocessedManualEntity.getClosestHeadline(), "2.6.14 Summary of product exposure and risk assessment "); + assertEquals(unprocessedManualEntity.getSection(), "[1, 1]: Paragraph: A9396G containing 960 g/L"); assertEquals(unprocessedManualEntity.getContainingNodeId().get(0), 1); assertEquals(unprocessedManualEntity.getContainingNodeId().get(1), 1); assertEquals(unprocessedManualEntity.getColor()[0], 0f); @@ -157,6 +158,7 @@ public class UnprocessedChangesServiceTest extends AbstractRedactionIntegrationT assertEquals(unprocessedNotFoundManualEntity.getStartOffset(), -1); assertEquals(unprocessedNotFoundManualEntity.getEndOffset(), -1); assertEquals(unprocessedNotFoundManualEntity.getClosestHeadline(), ""); + assertEquals(unprocessedNotFoundManualEntity.getSection(), ""); assertTrue(unprocessedNotFoundManualEntity.getContainingNodeId().isEmpty()); assertEquals(unprocessedNotFoundManualEntity.getColor()[0], 0f); assertEquals(unprocessedNotFoundManualEntity.getColor()[1], 0f); -- 2.47.2