From badbc08c2ec1a3d9e38858b20c98855c60259420 Mon Sep 17 00:00:00 2001
From: Andrei Isvoran <andrei.isvoran.ext@knecon.com>
Date: Thu, 20 Jun 2024 17:26:04 +0300
Subject: [PATCH] RED-9378 - Don't create UnprocessedManualEntities for
 non-manual entities

---
 .../v1/server/service/UnprocessedChangesService.java   | 10 +++++++---
 .../v1/server/storage/RedactionStorageService.java     |  6 ++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java
index 0accaa89..0e3e1ef9 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java
@@ -13,7 +13,8 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLog;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.BaseAnnotation;
@@ -61,7 +62,9 @@ public class UnprocessedChangesService {
 
         dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
 
-        EntityLog previousEntityLog = redactionStorageService.getEntityLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        List<String> annotationIds = analyzeRequest.getManualRedactions().buildAll().stream().map(BaseAnnotation::getAnnotationId).toList();
+
+        List<EntityLogEntry> entityLogEntries = redactionStorageService.getEntityLogEntriesById(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), annotationIds);
         Document document = DocumentGraphMapper.toDocumentGraph(observedStorageService.getDocumentData(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
 
         Set<String> allAnnotationIds = analyzeRequest.getManualRedactions().getEntriesToAdd()
@@ -77,9 +80,10 @@ public class UnprocessedChangesService {
         List<ManualResizeRedaction> manualResizeRedactions = analyzeRequest.getManualRedactions().getResizeRedactions()
                 .stream()
                 .toList();
-        List<PrecursorEntity> manualEntitiesToBeResized = previousEntityLog.getEntityLogEntry()
+        List<PrecursorEntity> manualEntitiesToBeResized = entityLogEntries
                 .stream()
                 .filter(entityLogEntry -> resizeIds.contains(entityLogEntry.getId()))
+                .filter(entityLogEntry -> entityLogEntry.getEngines().contains(Engine.MANUAL))
                 .toList()
                 .stream()
                 .map(PrecursorEntity::fromEntityLogEntry)
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java
index 15a32eee..6f641017 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/storage/RedactionStorageService.java
@@ -109,6 +109,12 @@ public class RedactionStorageService {
     }
 
 
+    public List<EntityLogEntry> getEntityLogEntriesById(String dossierId, String fileId, List<String> ids) {
+
+        return entityLogMongoService.findEntityLogEntriesByIds(dossierId, fileId, ids);
+    }
+
+
     @Timed("redactmanager_getImportedRedactions")
     public ImportedRedactions getImportedRedactions(String dossierId, String fileId) {
 
-- 
2.47.2