From 358ed8176e2d78620f77dc6fdc150d544255d1f1 Mon Sep 17 00:00:00 2001
From: Kilian Schuettler <kilian.schuettler@knecon.com>
Date: Thu, 22 Jun 2023 11:10:55 +0200
Subject: [PATCH] RED-6929: fix acceptance tests/rules

---
 redaction-report-service-image-v1/pom.xml                | 2 +-
 redaction-report-service-v1/pom.xml                      | 2 +-
 .../redaction/report/v1/api/model/rss/ScmAnnotation.java | 2 +-
 .../report/v1/server/service/RSSPoc2Service.java         | 9 +++------
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/redaction-report-service-image-v1/pom.xml b/redaction-report-service-image-v1/pom.xml
index 408155c..d980b08 100644
--- a/redaction-report-service-image-v1/pom.xml
+++ b/redaction-report-service-image-v1/pom.xml
@@ -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>
diff --git a/redaction-report-service-v1/pom.xml b/redaction-report-service-v1/pom.xml
index ff371a1..39223ee 100644
--- a/redaction-report-service-v1/pom.xml
+++ b/redaction-report-service-v1/pom.xml
@@ -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>
 
diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/rss/ScmAnnotation.java b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/rss/ScmAnnotation.java
index 6358764..ada1f76 100644
--- a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/rss/ScmAnnotation.java
+++ b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/rss/ScmAnnotation.java
@@ -16,7 +16,7 @@ public class ScmAnnotation {
     private String type;
     private Set<Integer> pages;
 
-    private int ruleNumber;
+    private String ruleIdentifier;
     private String reason;
 
 }
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java
index bab9372..a7aef0c 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java
@@ -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();
     }