Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-7918 - RM-62: "Last Modified" date not updated after change #223

Merged
corina.olariu.ext1 merged 2 commits from RED-7918-manual-changes into release/1.363.x 2023-11-23 10:14:36 +01:00
Conversation 10 Commits 2 Files Changed 3 +17 -3
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java
View File

@ -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();
}

1
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java
View File

@ -184,7 +184,6 @@ public class ManualRedactionService {
}
@Transactional
public List<ManualAddResponse> addRemoveRedaction(String dossierId, String fileId, List<RemoveRedactionRequest> removeRedactionRequests) {
RedactionLog redactionLog = null;

2
persistence-service-v1/pom.xml
View File

@ -25,7 +25,7 @@
</modules>
<properties>
<redaction-service.version>3.206.0</redaction-service.version>
<redaction-service.version>3.222.8</redaction-service.version>
<search-service.version>2.39.0</search-service.version>
<pdftron-redaction-service.version>3.157.0</pdftron-redaction-service.version>
<redaction-report-service.version>3.63.0</redaction-report-service.version>