From 920277c20ba536ba45b8a442e1cf2d438dd499c5 Mon Sep 17 00:00:00 2001 From: Timo Date: Mon, 26 Apr 2021 15:44:05 +0300 Subject: [PATCH] filename is no longer stored in redactionlog --- .../v1/api/model/StoredFileInformation.java | 1 - .../service/ReportGenerationService.java | 30 +++++++++---------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/StoredFileInformation.java b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/StoredFileInformation.java index a35f247..3ce1008 100644 --- a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/StoredFileInformation.java +++ b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/StoredFileInformation.java @@ -12,7 +12,6 @@ import lombok.NoArgsConstructor; public class StoredFileInformation { private String fileId; - private String originalFilename; private String storageId; private ReportType reportType; 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 6f136fb..be37011 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 @@ -1,13 +1,5 @@ package com.iqser.red.service.redaction.report.v1.server.service; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; - -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.stereotype.Service; - import com.iqser.red.service.configuration.v1.api.model.LegalBasisMapping; import com.iqser.red.service.redaction.report.v1.api.model.ReportRequestMessage; import com.iqser.red.service.redaction.report.v1.api.model.ReportType; @@ -16,9 +8,15 @@ import com.iqser.red.service.redaction.report.v1.server.client.LegalBasisMapping import com.iqser.red.service.redaction.report.v1.server.model.ReportRedactionEntry; import com.iqser.red.service.redaction.report.v1.server.storage.ReportStorageService; import com.iqser.red.service.redaction.v1.model.RedactionLog; - import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; @Slf4j @Service @@ -51,7 +49,7 @@ public class ReportGenerationService { long start = System.currentTimeMillis(); RedactionLog redactionLog = reportStorageService.getRedactionLog(reportMessage.getProjectId(), fileId); - if(legalBasisMappings == null){ + if (legalBasisMappings == null) { legalBasisMappings = legalBasisMappingClient.getLegalBasisMapping(redactionLog.getRuleSetId()); } @@ -64,21 +62,21 @@ public class ReportGenerationService { if (reportMessage.getReportTypes().contains(ReportType.EXCEL_SINGLE_FILE)) { byte[] excelSingleReport = excelReportService.generateSingleFileReport(reportEntries, redactionLog.getFilename()); String storageId = reportStorageService.storeObject(reportMessage.getDownloadId(), excelSingleReport); - storedFileInformation.add(new StoredFileInformation(fileId, redactionLog.getFilename(), storageId, ReportType.EXCEL_SINGLE_FILE)); + storedFileInformation.add(new StoredFileInformation(fileId, storageId, ReportType.EXCEL_SINGLE_FILE)); } if (reportMessage.getReportTypes().contains(ReportType.WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE)) { byte[] wordEFSATemplate = wordReportGenerationService.generateReport(ReportType.WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE, reportEntries, redactionLog .getFilename()); String storageId = reportStorageService.storeObject(reportMessage.getDownloadId(), wordEFSATemplate); - storedFileInformation.add(new StoredFileInformation(fileId, redactionLog.getFilename(), storageId, ReportType.WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE)); + storedFileInformation.add(new StoredFileInformation(fileId, storageId, ReportType.WORD_SINGLE_FILE_APPENDIX_A1_TEMPLATE)); } if (reportMessage.getReportTypes().contains(ReportType.WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE)) { byte[] wordSyngentaTemplate = wordReportGenerationService.generateReport(ReportType.WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE, reportEntries, redactionLog .getFilename()); String storageId = reportStorageService.storeObject(reportMessage.getDownloadId(), wordSyngentaTemplate); - storedFileInformation.add(new StoredFileInformation(fileId, redactionLog.getFilename(), storageId, ReportType.WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE)); + storedFileInformation.add(new StoredFileInformation(fileId, storageId, ReportType.WORD_SINGLE_FILE_APPENDIX_A2_TEMPLATE)); } long end = System.currentTimeMillis(); @@ -87,11 +85,11 @@ public class ReportGenerationService { i++; } - if (reportMessage.getReportTypes().contains(ReportType.EXCEL_MULTI_FILE)) { + if (excelMultiFileWorkbook != null) { long start = System.currentTimeMillis(); byte[] multifileExcelReport = excelReportService.toByteArray(excelMultiFileWorkbook); String storageId = reportStorageService.storeObject(reportMessage.getDownloadId(), multifileExcelReport); - storedFileInformation.add(new StoredFileInformation(null, null, storageId, ReportType.EXCEL_MULTI_FILE)); + storedFileInformation.add(new StoredFileInformation(null, storageId, ReportType.EXCEL_MULTI_FILE)); long end = System.currentTimeMillis(); log.info("Successfully stored multiFileExcelReport for downloadId {}, took {}", reportMessage.getDownloadId(), end - start); } @@ -99,4 +97,4 @@ public class ReportGenerationService { return storedFileInformation; } -} \ No newline at end of file +}