Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-2861: Added isRectangle to manual add redaction

Browse Source
This commit is contained in:
deiflaender 2021-11-26 12:42:33 +01:00
parent 35c7593919
commit b0fa8f1dd5
7 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/AddRedactionRequest.java
View File

@ -23,6 +23,7 @@ public class AddRedactionRequest {
private boolean addToDossierDictionary;
private AnnotationStatus status;
private String section;
private boolean rectangle;
@Builder.Default
private List<Rectangle> positions = new ArrayList<>();

1
persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactionEntry.java
View File

@ -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;

2
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualRedactionEntryEntity.java
View File

@ -38,6 +38,8 @@ public class ManualRedactionEntryEntity {
@Column
private String section;
@Column
private boolean rectangle;
@Column
private boolean addToDictionary;
@Column
private boolean addToDossierDictionary;

1
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java
View File

@ -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())

1
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/model/ManualRedactionEntryRow.java
View File

@ -26,6 +26,7 @@ public class ManualRedactionEntryRow {
private String legalBasis;
private String section;
private boolean rectangle;
@Builder.Default
private List<Rectangle> positions = new ArrayList<>();

3
persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/1-initial-schema.changelog.yaml
View File

@ -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

2
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java
View File

@ -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());