From b735760ebaa026a7dc5dad26a9d807971ae7ac47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?=
 <deiflaender@dominiques-mbp.speedport.ip>
Date: Mon, 22 Feb 2021 13:08:05 +0100
Subject: [PATCH] Removed ruleSetId from ReportRequestMessage as it is in
 redactionlog

---
 .../redaction-report-service-api-v1/pom.xml                | 5 -----
 .../report/v1/api/model/ReportRequestMessage.java          | 2 --
 .../redaction-report-service-server-v1/pom.xml             | 5 +++++
 .../report/v1/server/service/ReportGenerationService.java  | 7 +++++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
index 720e510..6add97d 100644
--- a/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
+++ b/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
@@ -14,11 +14,6 @@
     <version>1.0-SNAPSHOT</version>
 
     <dependencies>
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>redaction-service-api-v1</artifactId>
-            <version>1.5.8</version>
-        </dependency>
         <dependency>
             <!-- This dependency contains annotations that are used in specifying REST endpoints. -->
             <!-- It is optional since not all users of this API might use Feign. -->
diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportRequestMessage.java b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportRequestMessage.java
index ac4c3da..a5992d5 100644
--- a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportRequestMessage.java
+++ b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/ReportRequestMessage.java
@@ -18,8 +18,6 @@ public class ReportRequestMessage {
 
     private String userId;
 
-    private String ruleSetId;
-
     private String downloadId;
 
     private String projectId;
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
index cc5e2ae..02c7c15 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
@@ -19,6 +19,11 @@
             <artifactId>redaction-report-service-api-v1</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.iqser.red.service</groupId>
+            <artifactId>redaction-service-api-v1</artifactId>
+            <version>2.3.2</version>
+        </dependency>
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>configuration-service-api-v1</artifactId>
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
index a78f831..e819047 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
@@ -34,8 +34,7 @@ public class ReportGenerationService {
 
     public List<StoredFileInformation> generateReport(ReportRequestMessage reportMessage) {
 
-        List<LegalBasisMapping> legalBasisMappings = legalBasisMappingClient.getLegalBasisMapping(reportMessage.getRuleSetId());
-
+        List<LegalBasisMapping> legalBasisMappings = null;
         XSSFWorkbook excelMultiFileWorkbook = null;
         XSSFSheet excelMultiFileSheet = null;
         AtomicInteger excelRowIndex = new AtomicInteger(1);
@@ -52,6 +51,10 @@ public class ReportGenerationService {
 
             long start = System.currentTimeMillis();
             RedactionLog redactionLog = reportStorageService.getRedactionLog(reportMessage.getProjectId(), fileId);
+            if(legalBasisMappings == null){
+                legalBasisMappings = legalBasisMappingClient.getLegalBasisMapping(redactionLog.getRuleSetId());
+            }
+
             List<ReportRedactionEntry> reportEntries = redactionLogConverterService.convertAndSort(redactionLog, legalBasisMappings);
 
             if (reportMessage.getReportTypes().contains(ReportType.EXCEL_MULTI_FILE)) {