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

Removed ruleSetId from ReportRequestMessage as it is in redactionlog

Browse Source
This commit is contained in:
Dominique Eifländer 2021-02-22 13:08:05 +01:00
parent e29a5b91f5
commit b735760eba
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
View File

@ -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. -->

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

@ -18,8 +18,6 @@ public class ReportRequestMessage {
private String userId;
private String ruleSetId;
private String downloadId;
private String projectId;

5
redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
View File

@ -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>

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

@ -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)) {