Added isDossierDictionaryEntry to manualRedactions and redactionLog

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionEntry.java

@@ -27,4 +27,6 @@ public class ManualRedactionEntry {
     private String section;
     private int sectionNumber;
 
+    private boolean addToDossierDictionary;
+
 }

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionChangeLogEntry.java

@@ -42,4 +42,6 @@ public class RedactionChangeLogEntry {
 
     private ChangeType changeType;
 
+    private boolean isDossierDictionaryEntry;
+
 }

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java

@@ -45,4 +45,6 @@ public class RedactionLogEntry {
 
     private boolean isImage;
 
+    private boolean isDossierDictionaryEntry;
+
 }

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

@@ -21,6 +21,7 @@ public class DictionaryModel implements Serializable {
     private boolean recommendation;
     private Set<DictionaryEntry> entries;
     private Set<String> localEntries;
+    private boolean isDossierDictionary;
 
     public Set<String> getValues(boolean local) {
         return local ? localEntries : entries.stream().filter(e -> !e.isDeleted()).map(e -> e.getValue()).collect(Collectors

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

@@ -37,8 +37,10 @@ public class Entity {
     private String textBefore;
     private String textAfter;
 
+    private boolean isDossierDictionaryEntry;
 
-    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter, Integer start, Integer end) {
+
+    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter, Integer start, Integer end, boolean isDossierDictionaryEntry) {
 
         this.word = word;
         this.type = type;
@@ -54,10 +56,11 @@ public class Entity {
         this.textAfter = textAfter;
         this.start = start;
         this.end = end;
+        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
     }
 
 
-    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber, boolean isDictionaryEntry) {
+    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber, boolean isDictionaryEntry, boolean isDossierDictionaryEntry) {
 
         this.word = word;
         this.type = type;
@@ -66,6 +69,7 @@ public class Entity {
         this.headline = headline;
         this.sectionNumber = sectionNumber;
         this.isDictionaryEntry = isDictionaryEntry;
+        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
     }
 
 }

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

@@ -411,7 +411,7 @@ public class Section {
         String text = caseInsensitive ? searchText.toLowerCase() : searchText;
         String searchValue = caseInsensitive ? value.toLowerCase() : value;
 
-        Set<Entity> found = EntitySearchUtils.find(text, Set.of(searchValue), asType, headline, sectionNumber, true);
+        Set<Entity> found = EntitySearchUtils.find(text, Set.of(searchValue), asType, headline, sectionNumber, true, false);
 
         found.forEach(entity -> {
             if (redacted) {
@@ -437,7 +437,7 @@ public class Section {
         } else {
             String word = value.toString();
 
-            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false);
+            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false, false);
             entity.setRedaction(redact);
             entity.setMatchedRule(ruleNumber);
             entity.setRedactionReason(reason);

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

@@ -94,7 +94,7 @@ public class DictionaryService {
                 List<DictionaryModel> dictionary = typeResponse.getTypes()
                         .stream()
                         .map(t -> new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
-                                .isHint(), t.isRecommendation(), convertEntries(t, dossierId), new HashSet<>()))
+                                .isHint(), t.isRecommendation(), convertEntries(t, dossierId), new HashSet<>(),dossierId.equals(GLOBAL_DOSSIER) ? false : true))
                         .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                         .collect(Collectors.toList());
 

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

@@ -71,7 +71,7 @@ public class EntityRedactionService {
                         .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
                                 .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
                                 .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd()));
+                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
             }
         }
 
@@ -371,9 +371,9 @@ public class EntityRedactionService {
         String lowercaseInputString = searchableString.toLowerCase();
         for (DictionaryModel model : dictionary.getDictionaryModels()) {
             if (model.isCaseInsensitive()) {
-                found.addAll(EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local));
+                found.addAll(EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local, model.isDossierDictionary()));
             } else {
-                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local));
+                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local, model.isDossierDictionary()));
             }
         }
 

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

@@ -216,7 +216,7 @@ public class ReanalyzeService {
                         .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
                                 .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
                                 .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd()));
+                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
             }
         }
 

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

@@ -86,6 +86,7 @@ public class RedactionChangeLogService {
                 .textAfter(entry.getTextAfter())
                 .comments(entry.getComments())
                 .changeType(changeType)
+                .isDossierDictionaryEntry(entry.isDossierDictionaryEntry())
                 .build();
     }
 

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

@@ -355,6 +355,7 @@ public class RedactionLogCreatorService {
                 .status(manualRedactionEntry.getStatus())
                 .manualRedactionType(ManualRedactionType.ADD)
                 .isDictionaryEntry(false)
+                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
                 .build();
     }
 
@@ -378,6 +379,7 @@ public class RedactionLogCreatorService {
                 .textBefore(entity.getTextBefore())
                 .startOffset(entity.getStart())
                 .endOffset(entity.getEnd())
+                .isDossierDictionaryEntry(entity.isDossierDictionaryEntry())
                 .build();
     }
 

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

@@ -49,7 +49,7 @@ public class EntitySearchUtils {
 
 
     public Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber,
-                            boolean local) {
+                            boolean local, boolean isDossierDictionary) {
 
         Set<Entity> found = new HashSet<>();
 
@@ -69,7 +69,7 @@ public class EntitySearchUtils {
 
                 if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
                         .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
-                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber, !local));
+                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber, !local, isDossierDictionary));
                 }
             } while (startIndex > -1);
         }

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

@@ -114,8 +114,8 @@ public class EntityRedactionServiceTest {
     public void testNestedEntitiesRemoval() {
 
         Set<Entity> entities = new HashSet<>();
-        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0, false);
+        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0, false, false);
-        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false);
+        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false, false);
         entities.add(nested);
         entities.add(nesting);
         EntitySearchUtils.removeEntitiesContainedInLarger(entities);