diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml index 0759411..17a116a 100644 --- a/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml +++ b/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml @@ -13,6 +13,10 @@ redaction-report-service-api-v1 1.0-SNAPSHOT + + 1.25.0 + + @@ -29,8 +33,7 @@ com.iqser.red.service persistence-service-api-v1 - 0.151.0 - compile + ${persistence-service.version} 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 2f53c04..ff2c7ed 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 @@ -13,6 +13,11 @@ redaction-report-service-server-v1 1.0-SNAPSHOT + + 1.25.0 + 3.68.0 + + com.iqser.red.service @@ -24,7 +29,7 @@ com.iqser.red.service redaction-service-api-v1 - 3.21.0 + ${redaction-service.version} com.iqser.red.service @@ -33,18 +38,6 @@ - - com.iqser.red.service - persistence-service-api-v1 - 0.83.0 - - - com.iqser.red.service - redaction-service-api-v1 - - - - org.apache.poi poi 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 1e8b3b2..16597f4 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 @@ -30,10 +30,7 @@ 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)) { + if(entry.lastChangeIsRemoved()){ return; } @@ -45,16 +42,6 @@ public class RedactionLogConverterService { return; } - if (entry.isManual() && entry.getManualRedactionType() - .equals(ManualRedactionType.ADD) && !entry.getStatus().equals(AnnotationStatus.APPROVED)) { - return; - } - - if (entry.isManual() && entry.getManualRedactionType() - .equals(ManualRedactionType.REMOVE) && entry.getStatus().equals(AnnotationStatus.APPROVED)) { - return; - } - Set pages = new HashSet<>(); for (Rectangle position : entry.getPositions()) {