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

Pull request #11: RED-811: Added possiblity to select template, changed current template

Browse Source 
Merge in RED/redaction-report-service from RED-811 to master

* commit '0b98ed81f8c6e873bc2358ca31c0a9d8b1779996':
  RED-811: Added possiblity to select template, changed current template
This commit is contained in:
Dominique Eiflaender 2020-12-14 11:40:29 +01:00
commit e170e6327f
7 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
<dependency>
<groupId>com.iqser.red.service</groupId>
<artifactId>redaction-service-api-v1</artifactId>
<version>1.5.4</version>
<version>1.5.8</version>
</dependency>
<dependency>
<!-- This dependency contains annotations that are used in specifying REST endpoints. -->

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

@ -16,4 +16,6 @@ public class MultiFileRedactionLog {
private List<RedactionLog> redactionLogs = new ArrayList<>();
private String template;
}

37
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

@ -15,6 +15,7 @@ import org.apache.poi.xwpf.usermodel.XWPFRun;
import org.apache.poi.xwpf.usermodel.XWPFTable;
import org.apache.poi.xwpf.usermodel.XWPFTableCell;
import org.apache.poi.xwpf.usermodel.XWPFTableRow;
import org.apache.xmlbeans.XmlCursor;
import org.springframework.stereotype.Service;
import com.iqser.red.service.configuration.v1.api.model.LegalBasisMapping;
@ -32,18 +33,30 @@ import lombok.RequiredArgsConstructor;
public class ReportGenerationService {
private final LegalBasisMappingClient legalBasisMappingClient;
private byte[] template;
private byte[] efsaTemplate;
private byte[] syngentaTemplate;
@PostConstruct
public void init() {
template = ResourceLoader.load("templates/EFSA Template 1.docx");
efsaTemplate = ResourceLoader.load("templates/EFSA Template.docx");
syngentaTemplate = ResourceLoader.load("templates/Syngenta Template.docx");
}
public byte[] generateReport(MultiFileRedactionLog multiFileRedactionLog) {
byte[] template;
if(multiFileRedactionLog.getTemplate().equals("EFSA Template")){
template = efsaTemplate;
} else if(multiFileRedactionLog.getTemplate().equals("Syngenta Template")){
template = syngentaTemplate;
} else {
template = syngentaTemplate;
}
try (ByteArrayInputStream is = new ByteArrayInputStream(template)) {
XWPFDocument doc = new XWPFDocument(is);
LegalBasisMapping legalBasisMapping = legalBasisMappingClient.getLegalBasisMapping();
@ -60,13 +73,13 @@ public class ReportGenerationService {
XWPFTable table = doc.getTables().get(0);
multiFileRedactionLog.getRedactionLogs().forEach(fileRedactionLog -> {
XmlCursor cursor = table.getCTTbl().newCursor();
XWPFParagraph newParagraph = doc.insertNewParagraph(cursor);
XWPFRun run = newParagraph.createRun();
run.setText("Applied rules: EFSA 1 (Vertebrate Authors)");
run.setFontSize(10);
XWPFTableRow singelColumnRow = table.createRow();
singelColumnRow.getCell(3).getCTTc().newCursor().removeXml();
singelColumnRow.getCell(2).getCTTc().newCursor().removeXml();
singelColumnRow.getCell(1).getCTTc().newCursor().removeXml();
setText(singelColumnRow.getCell(0), fileRedactionLog.getFilename());
multiFileRedactionLog.getRedactionLogs().forEach(fileRedactionLog -> {
fileRedactionLog.getRedactionLogEntry().forEach(entry -> {
@ -94,10 +107,10 @@ public class ReportGenerationService {
.collect(Collectors.toList());
pages.forEach(page -> {
XWPFTableRow row = table.createRow();
setText(row.getCell(0), String.valueOf(page));
setText(row.getCell(1), entry.getSection());
setText(row.getCell(2), entry.getLegalBasis());
setText(row.getCell(3), reasonByLegalBasis.get(entry.getLegalBasis()));
setText(row.getCell(0), fileRedactionLog.getFilename());
setText(row.getCell(1), String.valueOf(page));
setText(row.getCell(2), entry.getSection());
setText(row.getCell(3), entry.getLegalBasis() + " " + reasonByLegalBasis.get(entry.getLegalBasis()));
});
}
});

BIN
redaction-report-service-v1/redaction-report-service-server-v1/src/main/resources/templates/EFSA Template 1.docx
View File

Binary file not shown.

BIN
redaction-report-service-v1/redaction-report-service-server-v1/src/main/resources/templates/EFSA Template.docx Normal file
View File

Binary file not shown.

BIN
redaction-report-service-v1/redaction-report-service-server-v1/src/main/resources/templates/Syngenta Template.docx Normal file
View File

Binary file not shown.

2
redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java
View File

@ -51,7 +51,7 @@ public class RedactionReportIntegrationTest {
RedactionLog redactionLog = objectMapper.readValue(redactionLogResource.getInputStream(), RedactionLog.class);
redactionLog.setFilename("TestFile");
MultiFileRedactionLog multiFileRedactionLog = new MultiFileRedactionLog(List.of(redactionLog));
MultiFileRedactionLog multiFileRedactionLog = new MultiFileRedactionLog(List.of(redactionLog), "EFSA Template");
ReportResult reportResult = redactionReportController.generateReport(multiFileRedactionLog);