RED-8043 - Fix

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java

@@ -21,6 +21,7 @@ import com.iqser.red.service.redaction.v1.server.model.ManualEntity;
 import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
 import com.iqser.red.service.redaction.v1.server.service.document.DocumentGraphMapper;
 import com.iqser.red.service.redaction.v1.server.service.document.ManualEntityCreationService;
+import com.iqser.red.service.redaction.v1.server.service.document.ManualRedactionEntryService;
 import com.iqser.red.service.redaction.v1.server.storage.ObservedStorageService;
 
 import io.micrometer.observation.annotation.Observed;
@@ -38,6 +39,7 @@ public class UnprocessedChangesService {
     ManualEntityCreationService manualEntityCreationService;
     RabbitTemplate rabbitTemplate;
     ObservedStorageService observedStorageService;
+    ManualRedactionEntryService manualRedactionEntryService;
 
 
     @Observed(name = "UnprocessedChangesService", contextualName = "analyse-surrounding-text")
@@ -48,11 +50,9 @@ public class UnprocessedChangesService {
         Set<String> annotationIds = analyzeRequest.getManualRedactions().getEntriesToAdd().stream().map(ManualRedactionEntry::getAnnotationId).collect(Collectors.toSet());
         annotationIds.addAll(analyzeRequest.getManualRedactions().getResizeRedactions().stream().map(ManualResizeRedaction::getAnnotationId).collect(Collectors.toSet()));
 
-        List<ManualEntity> notFoundManualEntities = new ArrayList<>();
-        List<ManualEntity> manualEntities = manualEntitiesConverter(analyzeRequest.getManualRedactions());
-        if (!manualEntities.isEmpty()) {
-            notFoundManualEntities = manualEntityCreationService.toTextEntity(manualEntities, document);
-        }
+        List<ManualEntity> notFoundManualRedactionEntries = manualRedactionEntryService.addManualRedactionEntriesAndReturnNotFoundEntries(analyzeRequest,
+                document,
+                analyzeRequest.getDossierTemplateId());
 
         document.getEntities().forEach(textEntity -> {
             Set<String> processedIds = new HashSet<>();
@@ -75,7 +75,7 @@ public class UnprocessedChangesService {
             }
         });
 
-        notFoundManualEntities.forEach(manualEntity -> unprocessedManualEntities.add(UnprocessedManualEntity.builder()
+        notFoundManualRedactionEntries.forEach(manualEntity -> unprocessedManualEntities.add(UnprocessedManualEntity.builder()
                 .annotationId(manualEntity.getId())
                 .textAfter("")
                 .textBefore("")

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/service/document/UnprocessedChangesServiceTest.java

@@ -3,8 +3,10 @@ package com.iqser.red.service.redaction.v1.server.service.document;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.util.List;
 import java.util.Optional;
@@ -19,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -40,6 +43,7 @@ import com.iqser.red.service.redaction.v1.model.UnprocessedManualEntity;
 import com.iqser.red.service.redaction.v1.server.AbstractRedactionIntegrationTest;
 import com.iqser.red.service.redaction.v1.server.Application;
 import com.iqser.red.service.redaction.v1.server.RedactionIntegrationTest;
+import com.iqser.red.service.redaction.v1.server.service.DictionaryService;
 import com.iqser.red.service.redaction.v1.server.service.UnprocessedChangesService;
 import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.iqser.red.storage.commons.service.StorageService;
@@ -76,6 +80,9 @@ public class UnprocessedChangesServiceTest extends AbstractRedactionIntegrationT
     @Autowired
     UnprocessedChangesService unprocessedChangesService;
 
+    @MockBean
+    DictionaryService dictionaryService;
+
     @Test
     public void testManualSurroundingText() {
 
@@ -130,6 +137,8 @@ public class UnprocessedChangesServiceTest extends AbstractRedactionIntegrationT
         request.setManualRedactions(manualRedactions);
         analyzeDocumentStructure(LayoutParsingType.REDACT_MANAGER, request);
 
+        when(dictionaryService.isHint(anyString(), anyString())).thenReturn(false);
+
         unprocessedChangesService.analyseSurroundingText(request);
 
         verify(rabbitTemplate).convertAndSend(eq(QueueNames.REDACTION_ANALYSIS_RESPONSE_QUEUE), captor.capture());