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

Merge branch 'DM-357' into 'master'

Browse Source 
DM-357 - no longer save all manualRedactionLogEntries here -> they will be...

Closes DM-357

See merge request redactmanager/persistence-service!63
This commit is contained in:
Timo Bejan 2023-08-08 17:16:46 +02:00
commit e454533758
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/redactionlog/RedactionLogMergeService.java
View File

@ -1,6 +1,5 @@
package com.iqser.red.service.persistence.management.v1.processor.service.redactionlog; package com.iqser.red.service.persistence.management.v1.processor.service.redactionlog;
import java.awt.Color;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -66,12 +65,8 @@ public class RedactionLogMergeService {
throw new NotFoundException("RedactionLog not present"); throw new NotFoundException("RedactionLog not present");
} }
var sectionGrid = fileManagementStorageService.getSectionGrid(redactionRequest.getDossierId(), redactionRequest.getFileId());
log.debug("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion()); log.debug("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
var merged = mergeRedactionLogData(redactionLog, var merged = mergeRedactionLogData(redactionLog,
sectionGrid,
redactionRequest.getManualRedactions(), redactionRequest.getManualRedactions(),
redactionRequest.getExcludedPages(), redactionRequest.getExcludedPages(),
redactionRequest.getTypes(), redactionRequest.getTypes(),
@ -84,7 +79,6 @@ public class RedactionLogMergeService {
private RedactionLog mergeRedactionLogData(RedactionLog redactionLog, private RedactionLog mergeRedactionLogData(RedactionLog redactionLog,
SectionGrid sectionGrid,
ManualRedactions manualRedactions, ManualRedactions manualRedactions,
Set<Integer> excludedPages, Set<Integer> excludedPages,
List<Type> types, List<Type> types,
@ -94,15 +88,6 @@ public class RedactionLogMergeService {
log.info("Merging Redaction log with manual redactions"); log.info("Merging Redaction log with manual redactions");
if (manualRedactions != null) { if (manualRedactions != null) {
var manualRedactionLogEntries = addManualAddEntries(sectionGrid,
manualRedactions.getEntriesToAdd(),
manualRedactions.getComments(),
colors,
types,
redactionLog.getAnalysisNumber());
redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);
var manualRedactionWrappers = createManualRedactionWrappers(manualRedactions); var manualRedactionWrappers = createManualRedactionWrappers(manualRedactions);
for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) { for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {