Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

RED-499: Changed prefix for redactions, fixed legalbasis problem

Browse Source
This commit is contained in:
deiflaender 2020-10-28 13:02:18 +01:00
parent 97257a9c08
commit 0015304eea
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ public class Entity {
private int sectionNumber; private int sectionNumber;
public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber) { public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis) {
this.word = word; this.word = word;
this.type = type; this.type = type;
@ -41,6 +41,7 @@ public class Entity {
this.headline = headline; this.headline = headline;
this.matchedRule = matchedRule; this.matchedRule = matchedRule;
this.sectionNumber = sectionNumber; this.sectionNumber = sectionNumber;
this.legalBasis = legalBasis;
} }

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

@ -117,7 +117,7 @@ public class EntityRedactionService {
classifiedDoc.getEntities() classifiedDoc.getEntities()
.computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>()) .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
.add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
.getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber())); .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity.getLegalBasis()));
} }
} }

4
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java
View File

@ -169,7 +169,7 @@ public class AnnotationHighlightService {
} }
if (entity.isRedaction()) { if (entity.isRedaction()) {
return "redaction:" + entity.getType() + ":" + id; return "redaction:" + entity.getType() + ":automatic:" + id;
} }
return "ignore:" + entity.getType() + ":" + id; return "ignore:" + entity.getType() + ":" + id;
} }
@ -235,7 +235,7 @@ public class AnnotationHighlightService {
private String prefixId(ManualRedactionEntry manualRedactionEntry, String id) { private String prefixId(ManualRedactionEntry manualRedactionEntry, String id) {
if (manualRedactionEntry.getStatus().equals(Status.APPROVED)) { if (manualRedactionEntry.getStatus().equals(Status.APPROVED)) {
return "redaction:" + manualRedactionEntry.getType() + ":" + id; return "redaction:" + manualRedactionEntry.getType() + ":manual:" + id;
} }
if (manualRedactionEntry.getStatus().equals(Status.REQUESTED)) { if (manualRedactionEntry.getStatus().equals(Status.REQUESTED)) {