RED-6411 - add tmp log

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

@@ -141,6 +141,7 @@ public class AnalyzeService {
 
         long startTime = System.currentTimeMillis();
 
+        log.info("bla: "+analyzeRequest.toString());
         var redactionLog = redactionStorageService.getRedactionLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
         var text = redactionStorageService.getText(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
 

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

@@ -300,7 +300,7 @@ public class EntityRedactionService {
                             !local,
                             model.isDossierDictionary(),
                             local ? Engine.RULE : Engine.DICTIONARY,
-                            local ? EntityType.RECOMMENDATION : EntityType.ENTITY));
+                            local ? EntityType.RECOMMENDATION : EntityType.ENTITY)).stream().filter(e -> !e.isFalsePositive()).collect(Collectors.toSet());
 
             EntitySearchUtils.addOrAddEngine(found, entities);
         }

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

@@ -273,14 +273,14 @@ public final class EntitySearchUtils {
                 existing.setLegalBasis(found.getLegalBasis());
                 existing.setMatchedRule(found.getMatchedRule());
                 existing.setRedactionReason(found.getRedactionReason());
-                if (existing.getEntityType().equals(EntityType.RECOMMENDATION) && found.getEntityType().equals(EntityType.ENTITY) || existing.getEntityType()
-                        .equals(EntityType.ENTITY) && found.getEntityType().equals(EntityType.RECOMMENDATION)) {
+                if (isOneARecommendationAndTheOtherEntity(found, existing)) {
                     existing.setEntityType(EntityType.ENTITY);
                     if (found.isRedaction()) {
                         existing.setRedaction(true);
                     }
                 }
-            } else if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())) {
+            } else if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType()) &&
+                    !(isOneARecommendationAndTheOtherEntity(found, existing) && existing.isRedaction() && found.isRedaction()) ) {
                 entities.remove(found);
                 entities.add(found);
             }
@@ -289,6 +289,13 @@ public final class EntitySearchUtils {
         }
     }
 
+    private boolean isOneARecommendationAndTheOtherEntity(Entity entityOne, Entity entityTwo) {
+
+        var entityTypeOne = entityOne.getEntityType();
+        var entityTypeTwo = entityTwo.getEntityType();
+        return entityTypeTwo.equals(EntityType.RECOMMENDATION) && entityTypeOne.equals(EntityType.ENTITY)
+                || entityTypeTwo.equals(EntityType.ENTITY) && entityTypeOne.equals(EntityType.RECOMMENDATION);
+    }
 
     public void addEntitiesIgnoreRank(Set<Entity> entities, Set<Entity> found) {
         // HashSet keeps old value but we want the new.