From 631131a1fbff95317a3bfb08cedf94bd4baf383a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Tue, 14 Sep 2021 09:39:48 +0200 Subject: [PATCH] RED-2125: Enabled possibility to reference annotations in rules --- .../redaction-report-service-server-v1/pom.xml | 2 +- .../v1/server/service/RedactionLogConverterService.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml index 0485afa..cb62607 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml +++ b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml @@ -24,7 +24,7 @@ com.iqser.red.service redaction-service-api-v1 - 2.66.0 + 2.67.0 com.iqser.red.service diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java index aae1ce3..eb826ec 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java @@ -9,6 +9,8 @@ import org.springframework.stereotype.Service; import com.iqser.red.service.configuration.v1.api.model.LegalBasisMapping; import com.iqser.red.service.redaction.report.v1.server.model.ReportRedactionEntry; +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.ManualRedactionType; import com.iqser.red.service.redaction.v1.model.Rectangle; import com.iqser.red.service.redaction.v1.model.RedactionLog; @@ -26,6 +28,10 @@ public class RedactionLogConverterService { if (entry.isRedacted()) { + if(entry.getChanges() != null && entry.getChanges().size() > 1 && entry.getChanges().get(entry.getChanges().size() -1).getType().equals(ChangeType.REMOVED)){ + return; + } + if (entry.isExcluded()) { return; }