Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

adjusted for new redaction service

Browse Source
This commit is contained in:
Timo Bejan 2022-01-27 16:55:17 +02:00
parent fdcf58aa3e
commit 8f208957bb
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java
View File

@ -226,16 +226,10 @@ public class MigrationService {
.redacted(oldRedactionLogEntry.isRedacted())
.isHint(oldRedactionLogEntry.isHint())
.isRecommendation(oldRedactionLogEntry.isRecommendation())
.hasBeenResized(false) // Will be added during merge of manual
.hasBeenRecategorized(false) // Will be added during merge of manual
.section(oldRedactionLogEntry.getSection())
.color(oldRedactionLogEntry.getColor())
.positions(oldRedactionLogEntry.getPositions())
.sectionNumber(oldRedactionLogEntry.getSectionNumber())
.manual(oldRedactionLogEntry.isManual())
.status(oldRedactionLogEntry.getStatus())
.manualRedactionType(oldRedactionLogEntry.getManualRedactionType())
.manualRedactionUserId(null) // Will be added during merge of manual
.isDictionaryEntry(oldRedactionLogEntry.isDictionaryEntry())
.textBefore(oldRedactionLogEntry.getTextBefore())
.textAfter(oldRedactionLogEntry.getTextAfter())
@ -249,8 +243,6 @@ public class MigrationService {
.imageHasTransparency(oldRedactionLogEntry.isImageHasTransparency())
.isDossierDictionaryEntry(oldRedactionLogEntry.isDictionaryEntry())
.excluded(oldRedactionLogEntry.isExcluded())
.recategorizationType(oldRedactionLogEntry.getRecategorizationType())
.legalBasisChangeValue(oldRedactionLogEntry.getLegalBasisChangeValue())
.changes(List.of(new Change(analysisNumber, ChangeType.ADDED, lastProcessed)))
.engines(getEngine(oldRedactionLogEntry))
.reference(null)

5
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/AnalysisFlagsCalculationService.java
View File

@ -53,8 +53,7 @@ public class AnalysisFlagsCalculationService {
String type = getType(entry.getType());
if (!hasRedactions && (entry.isRedacted() && !entry.isManual() || entry.isManual() && entry.getStatus()
.equals(AnnotationStatus.APPROVED))) {
if (!hasRedactions && entry.isRedacted()) {
hasRedactions = true;
}
@ -66,7 +65,7 @@ public class AnalysisFlagsCalculationService {
hasImages = true;
}
if (!hasSuggestions && entry.isManual() && entry.getStatus().equals(AnnotationStatus.REQUESTED)) {
if (!hasSuggestions && entry.getManualChanges().stream().anyMatch(e -> e.getAnnotationStatus() == AnnotationStatus.REQUESTED)) {
hasSuggestions = true;
}

2
persistence-service-v1/pom.xml
View File

@ -25,7 +25,7 @@
</modules>
<properties>
<redaction-service.version>3.56.0</redaction-service.version>
<redaction-service.version>3.67.0</redaction-service.version>
<search-service.version>2.18.0</search-service.version>
<pdftron-redaction-service.version>3.28.0</pdftron-redaction-service.version>
<redaction-report-service.version>3.19.0</redaction-report-service.version>