From a1a8e144191d6eeff9e302727e8ab6d5760fc1a4 Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Wed, 3 Jan 2024 14:13:47 +0100 Subject: [PATCH] RED-8043 - General fixes --- .../service/manualredactions/ManualRedactionService.java | 8 ++++---- .../service/queue/RedactionAnalysisResponseReceiver.java | 1 - 2 files changed, 4 insertions(+), 5 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 7f847d340..8ec8048ac 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 @@ -117,12 +117,12 @@ public class ManualRedactionService { .entriesToAdd(convertEntriesToAdd(manualRedactionEntryEntities)) .build(); entityLogMergeService.sendToAnalyseQueue(fileId, dossierEntity, fileStatusService.getStatus(fileId), manualRedactions); - } else { - reprocess(dossierId, fileId); } analysisFlagsCalculationService.calculateFlags(dossierId, fileId); + reprocess(dossierId, fileId); + return response; } @@ -300,12 +300,12 @@ public class ManualRedactionService { .resizeRedactions(MagicConverter.convert(manualResizeRedactionEntities, ManualResizeRedaction.class)) .build(); entityLogMergeService.sendToAnalyseQueue(fileId, dossierPersistenceService.getAndValidateDossier(dossierId), fileStatusService.getStatus(fileId), manualRedactions); - } else { - reprocess(dossierId, fileId); } analysisFlagsCalculationService.calculateFlags(dossierId, fileId); + reprocess(dossierId, fileId); + return response; } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/RedactionAnalysisResponseReceiver.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/RedactionAnalysisResponseReceiver.java index 581e4462b..5e75a3b70 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/RedactionAnalysisResponseReceiver.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/queue/RedactionAnalysisResponseReceiver.java @@ -53,7 +53,6 @@ public class RedactionAnalysisResponseReceiver { ManualRedactionEntryEntity manualRedactionEntry = optionalManualRedactionEntry.get(); manualRedactionEntry.setTextBefore(unprocessedManualEntity.getTextBefore()); manualRedactionEntry.setTextAfter(unprocessedManualEntity.getTextAfter()); - manualRedactionEntry.setSection(unprocessedManualEntity.getSection()); manualRedactionEntry.setPositions(convertPositions(unprocessedManualEntity.getPositions())); addRedactionPersistenceService.update(manualRedactionEntry); }