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

RED-6929: fix acceptance tests/rules

Browse Source
This commit is contained in:
Kilian Schuettler 2023-06-22 11:10:55 +02:00
parent 81b4424605
commit 358ed8176e
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redaction-report-service-image-v1/pom.xml
View File

@ -12,7 +12,7 @@
<artifactId>redaction-report-service-image-v1</artifactId>
<groupId>com.iqser.red.service</groupId>
<version>1.0-SNAPSHOT</version>
<version>4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>

2
redaction-report-service-v1/pom.xml
View File

@ -24,7 +24,7 @@
<properties>
<persistence-service.version>2.1.0</persistence-service.version>
<persistence-service.version>2.79.0</persistence-service.version>
<apache-poi.version>5.2.3</apache-poi.version>
</properties>

2
redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/rss/ScmAnnotation.java
View File

@ -16,7 +16,7 @@ public class ScmAnnotation {
private String type;
private Set<Integer> pages;
private int ruleNumber;
private String ruleIdentifier;
private String reason;
}

9
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java
View File

@ -4,7 +4,6 @@ import java.text.BreakIterator;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
@ -23,12 +22,11 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.component.C
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileModel;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.ChangeType;
import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLog;
import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
import com.iqser.red.service.redaction.report.v1.api.model.rss.DetailedRSSFileResponse;
import com.iqser.red.service.redaction.report.v1.api.model.rss.DetailedRSSResponse;
import com.iqser.red.service.redaction.report.v1.api.model.rss.RSSFileResponse;
import com.iqser.red.service.redaction.report.v1.api.model.rss.RSSResponse;
import com.iqser.red.service.redaction.report.v1.api.model.rss.SCMComponent;
import com.iqser.red.service.redaction.report.v1.api.model.rss.ScmAnnotation;
import com.iqser.red.service.redaction.report.v1.server.client.FileAttributesConfigClient;
@ -599,7 +597,6 @@ public class RSSPoc2Service {
.sorted(Comparator.comparing(s -> s.getValue().length()))
.collect(Collectors.toList());
if (!entries.isEmpty()) {
var firstEntry = entries.get(entries.size() - 1);
@ -790,8 +787,8 @@ public class RSSPoc2Service {
private ScmAnnotation toScmAnnotations(RedactionLogEntry entry) {
Set<Integer> pages = entry.getPositions().stream().map(e -> e.getPage()).collect(Collectors.toSet());
return ScmAnnotation.builder().type(entry.getType()).reason(entry.getReason()).pages(pages).ruleNumber(entry.getMatchedRule()).build();
Set<Integer> pages = entry.getPositions().stream().map(Rectangle::getPage).collect(Collectors.toSet());
return ScmAnnotation.builder().type(entry.getType()).reason(entry.getReason()).pages(pages).ruleIdentifier(entry.getMatchedRule()).build();
}