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 9296d42c..b94068eb 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 @@ -25,6 +25,7 @@ public class UnprocessedManualEntity { private int endOffset; private String closestHeadline; private String section; + private String legalBasis; private float[] color; private List containingNodeId; @Builder.Default 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 0b4f80f6..0bf067f8 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 @@ -61,22 +61,31 @@ public class UnprocessedChangesService { .textAfter(textEntity.getTextAfter()) .section(textEntity.getManualOverwrite().getSection().orElse(textEntity.getDeepestFullyContainingNode().toString())) .positions(positions) + .legalBasis(textEntity.legalBasis()) .build()); } }); - notFoundManualEntities.forEach(manualEntity -> unprocessedManualEntities.add(UnprocessedManualEntity.builder() - .annotationId(manualEntity.getId()) - .color(getColor(manualEntity.getType(), dossierTemplateId, manualEntity.applied(), manualEntity.getEntityType().equals(EntityType.HINT))) - .closestHeadline("") - .startOffset(-1) - .endOffset(-1) - .containingNodeId(Collections.emptyList()) - .textAfter("") - .textBefore("") - .section("") - .build())); + notFoundManualEntities.forEach(manualEntity -> { + unprocessedManualEntities.add(UnprocessedManualEntity.builder() + .annotationId(manualEntity.getId()) + .color(getColor(manualEntity.getType(), dossierTemplateId, manualEntity.applied(), manualEntity.getEntityType().equals(EntityType.HINT))) + .closestHeadline("") + .startOffset(-1) + .endOffset(-1) + .containingNodeId(Collections.emptyList()) + .textAfter("") + .textBefore("") + .section("") + .positions(manualEntity.getManualOverwrite() + .getPositions() + .orElse(manualEntity.getEntityPosition()) + .stream() + .map(entityPosition -> new Position(entityPosition.rectangle2D(), entityPosition.pageNumber())) + .toList()) + .build()); + }); return unprocessedManualEntities; } 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 58bfa031..0dab38ff 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 @@ -167,6 +167,10 @@ public class UnprocessedChangesServiceTest extends AbstractRedactionIntegrationT assertEquals(unprocessedNotFoundManualEntity.getColor()[0], 0f); assertEquals(unprocessedNotFoundManualEntity.getColor()[1], 0f); assertEquals(unprocessedNotFoundManualEntity.getColor()[2], 0f); - assertTrue(unprocessedNotFoundManualEntity.getPositions().isEmpty()); + assertEquals(unprocessedNotFoundManualEntity.getPositions().get(0).getPageNumber(), 1); + assertEquals(unprocessedNotFoundManualEntity.getPositions().get(0).getRectangle()[0], 1f); + assertEquals(unprocessedNotFoundManualEntity.getPositions().get(0).getRectangle()[1], 1f); + assertEquals(unprocessedNotFoundManualEntity.getPositions().get(0).getRectangle()[2], 1f); + assertEquals(unprocessedNotFoundManualEntity.getPositions().get(0).getRectangle()[3], 1f); } }