From dd359282cf17c1898afd92e6c3e3a7efc991be3b Mon Sep 17 00:00:00 2001
From: Kilian Schuettler <kilian.schuettler@knecon.com>
Date: Thu, 14 Sep 2023 19:25:19 +0200
Subject: [PATCH] RED-7599: schedule reanalysis for any manual redaction

---
 .../ManualRedactionService.java               | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java
index 3203bd38c..176420e6c 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionService.java
@@ -26,7 +26,6 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.ResizeRedactionPersistenceService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AddRedactionRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.BaseManualRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ForceRedactionRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.LegalBasisChangeRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualAddResponse;
@@ -97,9 +96,7 @@ public class ManualRedactionService {
 
         analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
 
-        if (addRedactionRequests.stream().anyMatch(BaseManualRequest::isApproved)) {
-            reprocess(dossierId, fileId);
-        }
+        reprocess(dossierId, fileId);
 
         return response;
     }
@@ -157,7 +154,6 @@ public class ManualRedactionService {
 
         var response = new ArrayList<ManualAddResponse>();
         dossierPersistenceService.getAndValidateDossier(dossierId);
-        var requiresReanalysis = false;
 
         for (var forceRedactionRequest : forceRedactionRequests) {
             forceRedactionPersistenceService.insert(fileId, forceRedactionRequest);
@@ -167,13 +163,10 @@ public class ManualRedactionService {
                     forceRedactionRequest.getComment(),
                     forceRedactionRequest.getUser());
 
-            requiresReanalysis = requiresReanalysis || forceRedactionRequest.isApproved();
             response.add(ManualAddResponse.builder().annotationId(forceRedactionRequest.getAnnotationId()).commentId(commentId).build());
         }
 
-        if (requiresReanalysis) {
-            reprocess(dossierId, fileId);
-        }
+        reprocess(dossierId, fileId);
 
         analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
 
@@ -208,7 +201,6 @@ public class ManualRedactionService {
     public List<ManualAddResponse> addRecategorization(String dossierId, String fileId, List<RecategorizationRequest> recategorizationRequests) {
 
         var response = new ArrayList<ManualAddResponse>();
-        var requiresReanalysis = false;
         for (var recategorizationRequest : recategorizationRequests) {
             manualRedactionDictionaryUpdateHandler.validateDictionariesForAdd(recategorizationRequest, recategorizationRequest.getValue());
             manualRedactionDictionaryUpdateHandler.validateDictionariesForDelete(recategorizationRequest,
@@ -235,13 +227,9 @@ public class ManualRedactionService {
                     recategorizationRequest.getComment(),
                     recategorizationRequest.getUser());
 
-            requiresReanalysis = true;
-
             response.add(ManualAddResponse.builder().annotationId(recategorizationRequest.getAnnotationId()).commentId(commentId).build());
         }
-        if (requiresReanalysis) {
-            reprocess(dossierId, fileId);
-        }
+        reprocess(dossierId, fileId);
 
         analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
 
@@ -279,9 +267,7 @@ public class ManualRedactionService {
                     typeIdsOfModifiedDictionaries);
         }
 
-        if (resizeRedactionRequests.stream().anyMatch(BaseManualRequest::isApproved)) {
-            reprocess(dossierId, fileId);
-        }
+        reprocess(dossierId, fileId);
 
         analysisFlagsCalculationService.calculateFlags(dossierId, fileId);
 
-- 
2.47.2