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 76444fd11..85ba46dae 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 @@ -27,6 +27,7 @@ public class AddRedactionRequest { private AnnotationStatus status; private String section; private boolean rectangle; + private String sourceId; @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/entitymapped/ManualRedactionEntry.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualRedactionEntry.java index 4c175b2d5..612700066 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualRedactionEntry.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualRedactionEntry.java @@ -27,6 +27,7 @@ public class ManualRedactionEntry extends BaseAnnotation { private List positions = new ArrayList<>(); private String textBefore; private String textAfter; + private String sourceId; @Builder public ManualRedactionEntry(String annotationId, String fileId, @@ -37,7 +38,7 @@ public class ManualRedactionEntry extends BaseAnnotation { boolean rectangle, boolean addToDictionary, boolean addToDossierDictionary, String legalBasis, String section, String reason, String type, - List positions) { + List positions, String sourceId) { super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime); this.textBefore = textBefore; this.textAfter = textAfter; @@ -50,6 +51,7 @@ public class ManualRedactionEntry extends BaseAnnotation { this.reason = reason; this.type = type; this.positions = positions != null ? positions : new ArrayList<>(); + this.sourceId = sourceId; } } 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 57ff599c4..f9f5b6bbc 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 @@ -70,5 +70,8 @@ public class ManualRedactionEntryEntity implements IBaseAnnotation { @Column private String textAfter; + @Column + private String sourceId; + } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/14-add-redaction-source-id.changelog.yaml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/14-add-redaction-source-id.changelog.yaml new file mode 100644 index 000000000..d9be958bc --- /dev/null +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/14-add-redaction-source-id.changelog.yaml @@ -0,0 +1,11 @@ +databaseChangeLog: + - changeSet: + id: add-redaction-source-id-column + author: corina + changes: + - addColumn: + columns: + - column: + name: source_id + type: VARCHAR(255) + tableName: manual_redaction diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml index 612244206..8d1934348 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml @@ -29,3 +29,5 @@ databaseChangeLog: file: db/changelog/12-dossier-visibility.changelog.yaml - include: file: db/changelog/13-file-manual-change-date.changelog.yaml + - include: + file: db/changelog/14-add-redaction-source-id.changelog.yaml 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 4ee2fe167..32c03b0e5 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 @@ -71,6 +71,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { .rectangle(true) .textAfter("Text After") .textBefore("Text Before") + .sourceId("SourceId") .build())).iterator().next(); var loadedAddRedaction = manualRedactionClient.getAddRedaction(file.getId(), addRedaction.getAnnotationId()); assertThat(loadedAddRedaction.getUser()).isEqualTo("user"); @@ -79,6 +80,7 @@ public class ManualRedactionTest extends AbstractPersistenceServerServiceTest { assertThat(loadedAddRedaction.isRectangle()).isEqualTo(true); assertThat(loadedAddRedaction.getTextAfter()).isEqualTo("Text After"); assertThat(loadedAddRedaction.getTextBefore()).isEqualTo("Text Before"); + assertThat(loadedAddRedaction.getSourceId()).isEqualTo("SourceId"); manualRedactionClient.updateAddRedactionStatus(dossier.getId(), file.getId(), UpdateRedactionRequest.builder()