From 46e9a278ebb163a34689937ce569c22b189166bf Mon Sep 17 00:00:00 2001 From: aoezyetimoglu Date: Wed, 8 Sep 2021 16:35:17 +0200 Subject: [PATCH] RED-2115: Fixed dossier status report generation --- .../v1/server/controller/StatusReportController.java | 2 +- .../service/StatusReportGenerationService.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java index 97e20ab..a9ca8ea 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java @@ -27,7 +27,7 @@ public class StatusReportController implements StatusReportResource { Dossier dossier = dossierClient.getDossierById(dossierId); byte[] report = statusReportGenerationService.generateReport(dossier); - return new StatusReportResponse(report, dossier.getDossierName()); + return new StatusReportResponse(report, dossier.getDossierName() + ".xlsx"); } } diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java index be1ba19..6cb4d3b 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java @@ -57,7 +57,7 @@ public class StatusReportGenerationService { int headerCounter = 5; Map attributesAssignment = new HashMap<>(); for (FileAttributeConfig fileAttributeConfig : fileAttributeConfigs) { - sheet.setColumnWidth(headerCounter, 8000); + sheet.autoSizeColumn(headerCounter); attributesAssignment.put(fileAttributeConfig.getId(), headerCounter); XSSFCell cell = headerRow.createCell(headerCounter++); cell.setCellValue(fileAttributeConfig.getLabel()); @@ -105,11 +105,11 @@ public class StatusReportGenerationService { private void addHeader(XSSFSheet sheet, XSSFCellStyle style) { - sheet.setColumnWidth(0, 10000); - sheet.setColumnWidth(1, 4000); - sheet.setColumnWidth(2, 8000); - sheet.setColumnWidth(3, 5000); - sheet.setColumnWidth(4, 2000); + sheet.autoSizeColumn(0); + sheet.autoSizeColumn(1); + sheet.autoSizeColumn(2); + sheet.autoSizeColumn(3); + sheet.autoSizeColumn(4); XSSFRow row = sheet.createRow(0);