Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

RED-4891: Rectangle redactions not listed in DELTA view

Browse Source
This commit is contained in:
Ali Oezyetimoglu 2022-08-15 09:27:23 +02:00
parent 4f66f5acf7
commit a6a17f3621
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/RedactionLogMergeService.java
View File

@ -25,6 +25,8 @@ import com.iqser.red.service.persistence.service.v1.api.model.annotations.entity
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
import com.iqser.red.service.redaction.v1.model.Change;
import com.iqser.red.service.redaction.v1.model.ChangeType;
import com.iqser.red.service.redaction.v1.model.ManualChange; import com.iqser.red.service.redaction.v1.model.ManualChange;
import com.iqser.red.service.redaction.v1.model.ManualRedactionType; import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
import com.iqser.red.service.redaction.v1.model.Point; import com.iqser.red.service.redaction.v1.model.Point;
@ -225,6 +227,8 @@ public class RedactionLogMergeService {
.add(ManualChange.from(imageRecategorization) .add(ManualChange.from(imageRecategorization)
.withManualRedactionType(ManualRedactionType.RECATEGORIZE) .withManualRedactionType(ManualRedactionType.RECATEGORIZE)
.withChange("type", imageRecategorization.getType())); .withChange("type", imageRecategorization.getType()));
redactionLogEntry.getChanges().add(new Change(0, ChangeType.ADDED, imageRecategorization.getRequestDate()));
} }
if (mrw.getItem() instanceof IdRemoval) { if (mrw.getItem() instanceof IdRemoval) {
@ -251,6 +255,8 @@ public class RedactionLogMergeService {
redactionLogEntry.getManualChanges() redactionLogEntry.getManualChanges()
.add(ManualChange.from(manualRemoval) .add(ManualChange.from(manualRemoval)
.withManualRedactionType(manualRemoval.isRemoveFromDictionary() ? ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE_LOCALLY)); .withManualRedactionType(manualRemoval.isRemoveFromDictionary() ? ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE_LOCALLY));
redactionLogEntry.getChanges().add(new Change(0, ChangeType.ADDED, manualRemoval.getRequestDate()));
} }
} }
@ -283,6 +289,8 @@ public class RedactionLogMergeService {
redactionLogEntry.getManualChanges().add(manualChange); redactionLogEntry.getManualChanges().add(manualChange);
redactionLogEntry.getChanges().add(new Change(0, ChangeType.ADDED, manualForceRedact.getRequestDate()));
} }
if (mrw.getItem() instanceof ManualLegalBasisChange) { if (mrw.getItem() instanceof ManualLegalBasisChange) {
@ -317,6 +325,8 @@ public class RedactionLogMergeService {
manualChange.withChange("value", manualLegalBasisChange.getValue()); manualChange.withChange("value", manualLegalBasisChange.getValue());
} }
redactionLogEntry.getManualChanges().add(manualChange); redactionLogEntry.getManualChanges().add(manualChange);
redactionLogEntry.getChanges().add(new Change(0, ChangeType.ADDED, manualLegalBasisChange.getRequestDate()));
} }
if (mrw.getItem() instanceof ManualResizeRedaction) { if (mrw.getItem() instanceof ManualResizeRedaction) {
@ -350,6 +360,8 @@ public class RedactionLogMergeService {
.add(ManualChange.from(manualResizeRedact) .add(ManualChange.from(manualResizeRedact)
.withManualRedactionType(ManualRedactionType.RESIZE) .withManualRedactionType(ManualRedactionType.RESIZE)
.withChange("value", manualResizeRedact.getValue())); .withChange("value", manualResizeRedact.getValue()));
redactionLogEntry.getChanges().add(new Change(0, ChangeType.ADDED, manualResizeRedact.getRequestDate()));
} }
}); });
@ -445,6 +457,7 @@ public class RedactionLogMergeService {
.sectionNumber(-1) .sectionNumber(-1)
.rectangle(manualRedactionEntry.isRectangle()) .rectangle(manualRedactionEntry.isRectangle())
.manualChanges(changeList) .manualChanges(changeList)
.changes(List.of(new Change(0, ChangeType.ADDED, manualRedactionEntry.getRequestDate())))
.build(); .build();
} }