diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/AddRedactionRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/AddRedactionRequest.java index 8d5215b9d..03d1bdd26 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/AddRedactionRequest.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/AddRedactionRequest.java @@ -23,6 +23,7 @@ public class AddRedactionRequest { private boolean addToDossierDictionary; private AnnotationStatus status; private String section; + private boolean rectangle; @Builder.Default private List positions = new ArrayList<>(); diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactionEntry.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactionEntry.java index 2134d03cc..2ec1fe50d 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactionEntry.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactionEntry.java @@ -24,6 +24,7 @@ public class ManualRedactionEntry { private String legalBasis; private AnnotationStatus status; private String section; + private boolean rectangle; private boolean addToDictionary; private boolean addToDossierDictionary; private OffsetDateTime requestDate; diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java index 559ee2d2d..c622f2344 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java @@ -38,6 +38,8 @@ public class ManualRedactionEntryEntity { @Column private String section; @Column + private boolean rectangle; + @Column private boolean addToDictionary; @Column private boolean addToDossierDictionary; diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java index 87827ce25..c81b86929 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java @@ -662,6 +662,7 @@ public class MigrationService { .legalBasis(addRedaction.getLegalBasis()) .status(addRedaction.getStatus()) .section(addRedaction.getSection()) + .rectangle(addRedaction.isRectangle()) .addToDictionary(addRedaction.isAddToDictionary()) .addToDossierDictionary(addRedaction.isAddToDossierDictionary()) .requestDate(addRedaction.getRequestDate()) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/model/ManualRedactionEntryRow.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/model/ManualRedactionEntryRow.java index b669e44ba..72e0f0911 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/model/ManualRedactionEntryRow.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/model/ManualRedactionEntryRow.java @@ -26,6 +26,7 @@ public class ManualRedactionEntryRow { private String legalBasis; private String section; + private boolean rectangle; @Builder.Default private List positions = new ArrayList<>(); diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/1-initial-schema.changelog.yaml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/1-initial-schema.changelog.yaml index ea822321c..7564cdc70 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/1-initial-schema.changelog.yaml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/1-initial-schema.changelog.yaml @@ -832,6 +832,9 @@ databaseChangeLog: - column: name: section type: VARCHAR(255) + - column: + name: rectangle + type: BOOLEAN - column: name: soft_deleted_time type: TIMESTAMP WITHOUT TIME ZONE diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java index 0200ff290..8005dedfd 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java @@ -76,11 +76,13 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { .reason("1") .value("test") .legalBasis("1") + .rectangle(true) .build()); var loadedAddRedaction = manualRedactionClient.getAddRedaction(file.getId(), addRedaction.getAnnotationId()); assertThat(loadedAddRedaction.getUser()).isEqualTo("user"); assertThat(loadedAddRedaction.getType()).contains("manual"); assertThat(loadedAddRedaction.getSection()).contains("section test"); + assertThat(loadedAddRedaction.isRectangle()).isEqualTo(true); manualRedactionClient.updateAddRedactionStatus(dossier.getId(), file.getId(), addRedaction.getAnnotationId(), JSONPrimitive.of(AnnotationStatus.APPROVED)); loadedAddRedaction = manualRedactionClient.getAddRedaction(file.getId(), addRedaction.getAnnotationId());