diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/PrecursorEntity.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/PrecursorEntity.java index beb8de15..22416c0e 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/PrecursorEntity.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/PrecursorEntity.java @@ -57,9 +57,12 @@ public class PrecursorEntity implements IEntity { public static PrecursorEntity fromManualRedactionEntry(ManualRedactionEntry manualRedactionEntry, boolean hint) { - List rectangleWithPages = manualRedactionEntry.getPositions().stream().map(RectangleWithPage::fromAnnotationRectangle).toList(); + List rectangleWithPages = manualRedactionEntry.getPositions() + .stream() + .map(RectangleWithPage::fromAnnotationRectangle) + .toList(); var entityType = hint ? EntityType.HINT : EntityType.ENTITY; - var entryType = hint ? EntryType.HINT : EntryType.ENTITY; + var entryType = hint ? EntryType.HINT : (manualRedactionEntry.isRectangle() ? EntryType.AREA : EntryType.ENTITY); ManualChangeOverwrite manualChangeOverwrite = new ManualChangeOverwrite(entityType); manualChangeOverwrite.addChange(manualRedactionEntry); return PrecursorEntity.builder() @@ -85,7 +88,10 @@ public class PrecursorEntity implements IEntity { public static PrecursorEntity fromEntityLogEntry(EntityLogEntry entityLogEntry) { - List rectangleWithPages = entityLogEntry.getPositions().stream().map(RectangleWithPage::fromEntityLogPosition).toList(); + List rectangleWithPages = entityLogEntry.getPositions() + .stream() + .map(RectangleWithPage::fromEntityLogPosition) + .toList(); EntityType entityType = getEntityType(entityLogEntry.getEntryType()); return PrecursorEntity.builder() .id(entityLogEntry.getId()) @@ -108,17 +114,25 @@ public class PrecursorEntity implements IEntity { public static PrecursorEntity fromImportedEntry(ImportedRedaction importedRedaction) { - List rectangleWithPages = importedRedaction.getPositions().stream().map(RectangleWithPage::fromEntityLogPosition).toList(); - EntryType entryType = Optional.ofNullable(importedRedaction.getEntryType()).orElse(EntryType.ENTITY); + List rectangleWithPages = importedRedaction.getPositions() + .stream() + .map(RectangleWithPage::fromEntityLogPosition) + .toList(); + EntryType entryType = Optional.ofNullable(importedRedaction.getEntryType()) + .orElse(EntryType.ENTITY); EntityType entityType = getEntityType(entryType); - String value = Optional.ofNullable(importedRedaction.getValue()).orElse(""); + String value = Optional.ofNullable(importedRedaction.getValue()) + .orElse(""); return PrecursorEntity.builder() .id(importedRedaction.getId()) .value(value) .entityPosition(rectangleWithPages) - .reason(Optional.ofNullable(importedRedaction.getReason()).orElse("")) - .legalBasis(Optional.ofNullable(importedRedaction.getLegalBasis()).orElse("")) - .type(Optional.ofNullable(importedRedaction.getType()).orElse(IMPORTED_REDACTION_TYPE)) + .reason(Optional.ofNullable(importedRedaction.getReason()) + .orElse("")) + .legalBasis(Optional.ofNullable(importedRedaction.getLegalBasis()) + .orElse("")) + .type(Optional.ofNullable(importedRedaction.getType()) + .orElse(IMPORTED_REDACTION_TYPE)) .entityType(entityType) .entryType(entryType) .isDictionaryEntry(false) @@ -132,7 +146,10 @@ public class PrecursorEntity implements IEntity { public static PrecursorEntity fromManualResizeRedaction(ManualResizeRedaction manualResizeRedaction) { - List rectangleWithPages = manualResizeRedaction.getPositions().stream().map(RectangleWithPage::fromAnnotationRectangle).toList(); + List rectangleWithPages = manualResizeRedaction.getPositions() + .stream() + .map(RectangleWithPage::fromAnnotationRectangle) + .toList(); return PrecursorEntity.builder() .id(UUID.randomUUID().toString()) .value(manualResizeRedaction.getValue()) @@ -153,7 +170,8 @@ public class PrecursorEntity implements IEntity { @Override public String type() { - return getManualOverwrite().getType().orElse(type); + return getManualOverwrite().getType() + .orElse(type); }