From 1cb593e245e2980678b3bf3c44a11f895ce4f7d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Thu, 5 Aug 2021 11:52:18 +0200 Subject: [PATCH] RED-1910: Ignore not exisiting report templates --- .../service/ReportGenerationService.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) 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 d810b96..3956076 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 @@ -62,18 +62,22 @@ public class ReportGenerationService { List singleFilesTemplates = new ArrayList<>(); List multiFileWorkbooks = new ArrayList<>(); for (String templateId : reportMessage.getTemplateIds()) { - ReportTemplate reportTemplate = reportTemplateClient.getReportTemplate(reportMessage.getDossierTemplateId(), templateId); - if (reportTemplate.isMultiFileReport()) { - byte[] excelTemplate = reportStorageService.getReportTemplate(reportTemplate.getStorageId()); - try (ByteArrayInputStream is = new ByteArrayInputStream(excelTemplate)) { - XSSFWorkbook workbook = new XSSFWorkbook(is); - MultiFileWorkbook multiFileWorkbook = new MultiFileWorkbook(workbook, templateId); - multiFileWorkbooks.add(multiFileWorkbook); - } catch (IOException e) { - e.printStackTrace(); + try { + ReportTemplate reportTemplate = reportTemplateClient.getReportTemplate(reportMessage.getDossierTemplateId(), templateId); + if (reportTemplate.isMultiFileReport()) { + byte[] excelTemplate = reportStorageService.getReportTemplate(reportTemplate.getStorageId()); + try (ByteArrayInputStream is = new ByteArrayInputStream(excelTemplate)) { + XSSFWorkbook workbook = new XSSFWorkbook(is); + MultiFileWorkbook multiFileWorkbook = new MultiFileWorkbook(workbook, templateId); + multiFileWorkbooks.add(multiFileWorkbook); + } catch (IOException e) { + e.printStackTrace(); + } + } else { + singleFilesTemplates.add(reportTemplate); } - } else { - singleFilesTemplates.add(reportTemplate); + } catch (Exception e){ + log.warn("Skipping reportTemplate with id {}", templateId); } }