From 14c7f2ee4579a110a561a4bdbe33eca611dbf224 Mon Sep 17 00:00:00 2001
From: Andrei Isvoran <andrei.isvoran.ext@knecon.com>
Date: Thu, 20 Jun 2024 17:24:07 +0300
Subject: [PATCH] RED-9378 - Small improvements

---
 .../v1/processor/service/EntityLogMergeService.java           | 4 +---
 .../v1/processor/service/EntityLogMongoWrapperService.java    | 2 +-
 .../service/manualredactions/ManualRedactionMapper.java       | 1 -
 3 files changed, 2 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/EntityLogMergeService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java
index 6aad3f7c5..5db08274b 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMergeService.java
@@ -82,15 +82,13 @@ public class EntityLogMergeService {
 
 
     @Observed(name = "EntityLogMergeService", contextualName = "merge-entity-log-entries")
-    public List<EntityLogEntry> mergeEntityLogEntries(ManualRedactions unprocessedManualRedactions, List<String> entityLogEntryIds, DossierEntity dossier, String fileId) {
+    public List<EntityLogEntry> mergeEntityLogEntries(ManualRedactions unprocessedManualRedactions, List<EntityLogEntry> entityLogEntries, DossierEntity dossier, String fileId) {
 
         final int analysisNumber = entityLogMongoService.findLatestAnalysisNumber(dossier.getId(), fileId)
                 .orElseThrow(() -> new BadRequestException("Can't load analysis number"));
 
         Map<String, List<BaseAnnotation>> allManualChanges = groupManualChanges(unprocessedManualRedactions);
 
-        List<EntityLogEntry> entityLogEntries = entityLogMongoService.findEntityLogEntriesByIds(dossier.getId(), fileId, entityLogEntryIds);
-
         merge(unprocessedManualRedactions, entityLogEntries, dossier, analysisNumber, entityLogEntries, allManualChanges);
 
         return entityLogEntries;
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMongoWrapperService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMongoWrapperService.java
index b9aa028f9..abba7e82d 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMongoWrapperService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/EntityLogMongoWrapperService.java
@@ -37,7 +37,7 @@ public class EntityLogMongoWrapperService {
         if (includeUnprocessed) {
             DossierEntity dossier = dossierService.getDossierById(dossierId);
             ManualRedactions unprocessedManualRedactions = manualRedactionProviderService.getManualRedactions(fileId, ManualChangesQueryOptions.unprocessedOnly());
-            entityLogEntries = entityLogMergeService.mergeEntityLogEntries(unprocessedManualRedactions, entityLogEntries.stream().map(EntityLogEntry::getId).toList(), dossier, fileId);
+            entityLogEntries = entityLogMergeService.mergeEntityLogEntries(unprocessedManualRedactions, entityLogEntries, dossier, fileId);
         }
         return entityLogEntries;
     }
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
index 40d1ce928..a37dd0bba 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java
@@ -304,7 +304,6 @@ public class ManualRedactionMapper {
                     && !request.isAddToAllDossiers()
                     && !request.getUpdateDictionary()
                     && entryIsEntityType(entityLogEntry)) {
-                    entityLogEntry.setValue(resizeRedactionRequest.getValue());
                     manualRedactionEntryConsumer.accept(entityLogEntry);
                 }