diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java index 11c1ad320..0a3cf149d 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java @@ -63,10 +63,11 @@ public class AnalysisFlagsCalculationService { if (entry.getManualChanges() != null && !entry.getManualChanges().isEmpty()) { for (var manualChange : entry.getManualChanges()) { - if (!entry.isHint() && !entry.isRecommendation() && StringUtils.isNotEmpty(entry.getReason()) && (manualChange.getManualRedactionType() + if (!entry.isHint() && !entry.isRecommendation() && (manualChange.getManualRedactionType() .equals(ManualRedactionType.ADD_LOCALLY) || manualChange.getManualRedactionType() .equals(ManualRedactionType.RECATEGORIZE) || manualChange.getManualRedactionType() .equals(ManualRedactionType.REMOVE_LOCALLY) || manualChange.getManualRedactionType() + .equals(ManualRedactionType.REMOVE_FROM_DICTIONARY) || manualChange.getManualRedactionType() .equals(ManualRedactionType.FORCE_REDACT) || manualChange.getManualRedactionType() .equals(ManualRedactionType.FORCE_HINT) || manualChange.getManualRedactionType() .equals(ManualRedactionType.LEGAL_BASIS_CHANGE) || manualChange.getManualRedactionType() @@ -75,6 +76,20 @@ public class AnalysisFlagsCalculationService { lastRedactionModification = manualChange.getProcessedDate(); } + if (!entry.isHint() && !entry.isRecommendation() && (manualChange.getManualRedactionType() + .equals(ManualRedactionType.ADD_LOCALLY) || manualChange.getManualRedactionType() + .equals(ManualRedactionType.RECATEGORIZE) || manualChange.getManualRedactionType() + .equals(ManualRedactionType.REMOVE_LOCALLY) || manualChange.getManualRedactionType() + .equals(ManualRedactionType.REMOVE_FROM_DICTIONARY) || manualChange.getManualRedactionType() + .equals(ManualRedactionType.FORCE_REDACT) || manualChange.getManualRedactionType() + .equals(ManualRedactionType.FORCE_HINT) || manualChange.getManualRedactionType() + .equals(ManualRedactionType.LEGAL_BASIS_CHANGE) || manualChange.getManualRedactionType() + .equals(ManualRedactionType.RESIZE)) && manualChange.getProcessedDate() == null && (lastRedactionModification == null || manualChange.getRequestedDate() + .isAfter(lastRedactionModification))) { + lastRedactionModification = manualChange.getRequestedDate(); + } + + if (manualChange.getProcessedDate() != null && (lastManualChangeDate == null || manualChange.getProcessedDate().isAfter(lastManualChangeDate))) { lastManualChangeDate = manualChange.getProcessedDate(); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java index 2d2495c80..2ee4fc66a 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java @@ -184,7 +184,6 @@ public class ManualRedactionService { } - @Transactional public List addRemoveRedaction(String dossierId, String fileId, List removeRedactionRequests) { RedactionLog redactionLog = null; diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml index 0bbe4f946..ee2a76abb 100755 --- a/persistence-service-v1/pom.xml +++ b/persistence-service-v1/pom.xml @@ -25,7 +25,7 @@ - 3.206.0 + 3.222.8 2.39.0 3.157.0 3.63.0