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

RED-2125: Enabled possibility to reference annotations in rules

Browse Source
This commit is contained in:
Dominique Eifländer 2021-09-14 09:39:48 +02:00
parent 4921937360
commit 631131a1fb
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
View File

@ -24,7 +24,7 @@
<dependency> <dependency>
<groupId>com.iqser.red.service</groupId> <groupId>com.iqser.red.service</groupId>
<artifactId>redaction-service-api-v1</artifactId> <artifactId>redaction-service-api-v1</artifactId>
<version>2.66.0</version> <version>2.67.0</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.iqser.red.service</groupId> <groupId>com.iqser.red.service</groupId>

6
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java
View File

@ -9,6 +9,8 @@ import org.springframework.stereotype.Service;
import com.iqser.red.service.configuration.v1.api.model.LegalBasisMapping; 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.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.ManualRedactionType;
import com.iqser.red.service.redaction.v1.model.Rectangle; import com.iqser.red.service.redaction.v1.model.Rectangle;
import com.iqser.red.service.redaction.v1.model.RedactionLog; import com.iqser.red.service.redaction.v1.model.RedactionLog;
@ -26,6 +28,10 @@ public class RedactionLogConverterService {
if (entry.isRedacted()) { 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()) { if (entry.isExcluded()) {
return; return;
} }