test all entries in dict
This commit is contained in:
parent
c1317ee521
commit
5db6db52e5
@ -277,7 +277,6 @@ public class RedactionLogMergeService {
|
|||||||
|
|
||||||
for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
|
for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
|
||||||
|
|
||||||
if (!approvedAndShouldBeInDictionary(manualRedactionEntry)) {
|
|
||||||
RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), dossierTemplateId);
|
RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), dossierTemplateId);
|
||||||
redactionLogEntry.setPositions(convertPositions(manualRedactionEntry.getPositions()));
|
redactionLogEntry.setPositions(convertPositions(manualRedactionEntry.getPositions()));
|
||||||
redactionLogEntry.setComments(comments.get(manualRedactionEntry.getAnnotationId()));
|
redactionLogEntry.setComments(comments.get(manualRedactionEntry.getAnnotationId()));
|
||||||
@ -288,7 +287,6 @@ public class RedactionLogMergeService {
|
|||||||
|
|
||||||
redactionLogEntries.add(redactionLogEntry);
|
redactionLogEntries.add(redactionLogEntry);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return redactionLogEntries;
|
return redactionLogEntries;
|
||||||
}
|
}
|
||||||
@ -302,14 +300,6 @@ public class RedactionLogMergeService {
|
|||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
|
|
||||||
|
|
||||||
return manualRedactionEntry.getStatus().equals(AnnotationStatus.APPROVED) &&
|
|
||||||
(manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
|
private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
|
||||||
String dossierTemplateId) {
|
String dossierTemplateId) {
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user