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

Merge branch 'RED-7784' into 'master'

Browse Source 
RED-7784 - Add state for unprocessed redactions

Closes RED-7784

See merge request redactmanager/persistence-service!210
This commit is contained in:
Andrei Isvoran 2023-11-02 09:34:17 +01:00
commit 3c374baf94
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogService.java
View File

@ -161,13 +161,15 @@ public class EntityLogService {
.dateTime(OffsetDateTime.now())
.type(ChangeType.ADDED)
.build());
boolean isHint = isHint(manualRedactionEntry.getType(), dossierTemplateId);
entityLog.getEntityLogEntry().add(EntityLogEntry.builder()
.id(manualRedactionEntry.getAnnotationId())
.type(manualRedactionEntry.getType())
.value(manualRedactionEntry.getValue())
.legalBasis(manualRedactionEntry.getLegalBasis())
.reason(manualRedactionEntry.getReason())
.entryType(isHint(manualRedactionEntry.getType(), dossierTemplateId) ? EntryType.HINT : EntryType.ENTITY)
.entryType(isHint ? EntryType.HINT : EntryType.ENTITY)
.state(isHint ? EntryState.SKIPPED : EntryState.APPLIED)
.imported(false)
.matchedRule("")
.section(manualRedactionEntry.getSection())

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

@ -132,7 +132,7 @@ public class EntityLogTest {
var entityLogEntry = optionalEntityLogEntry.get();
assertEquals(entityLogEntry.getType(), "manual");
assertEquals(entityLogEntry.getEntryType(), EntryType.ENTITY);
assertNull(entityLogEntry.getState());
assertEquals(entityLogEntry.getState(), EntryState.APPLIED);
assertEquals(entityLogEntry.getValue(), "Test");
assertEquals(entityLogEntry.getReason(), "Reason");
assertEquals(entityLogEntry.getTextAfter(), "textAfter");