Merge branch 'RED-7745-fix' into 'master'

RED-7745 - Fix manual redactions not being redacted

Closes RED-7745

See merge request redactmanager/redaction-report-service!14
This commit is contained in:
Andrei Isvoran 2023-10-24 11:12:02 +02:00
commit e5a2dbc9d3

View File

@ -9,7 +9,6 @@ import java.util.Optional;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -21,7 +20,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogLegalBasis;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualRedactionType;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.Type;
import com.iqser.red.service.redaction.report.v1.server.client.DictionaryClient;
@ -109,15 +107,6 @@ public class EntityLogConverterService {
return;
}
if (entry.getManualChanges() != null
&& entry.getManualChanges().size() != 0
&& entry.getManualChanges()
.get(entry.getManualChanges().size() - 1)
.getManualRedactionType()
.equals(ManualRedactionType.ADD_LOCALLY)) {
return;
}
Set<Integer> pages = new HashSet<>();
for (Position position : entry.getPositions()) {