Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Pull request #565: RED-5049 - Allow reports to be downloaded in all document states

Browse Source 
Merge in RED/persistence-service from feature/RED-5049-1 to master

* commit '50f89016d29e0f757885cf1fd1d4f79a6cff4b7f':
  RED-5049 - Allow reports to be downloaded in all document states
This commit is contained in:
Corina Olariu 2022-11-11 09:54:17 +01:00
commit d689acf5b8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java
View File

@ -249,7 +249,9 @@ public class DownloadPreparationService {
private String createFileName(FileEntity fileStatus, ReportTemplateEntity reportTemplate) {
if (fileStatus != null) {
return removeExtension(fileStatus.getFilename()) + getExtension(reportTemplate.getFileName());
var isFileApproved = WorkflowStatus.APPROVED.equals(fileStatus.getWorkflowStatus());
String filename = isFileApproved ? fileStatus.getFilename() : "UNAPPROVED_" + fileStatus.getFilename();
return removeExtension(filename) + getExtension(reportTemplate.getFileName());
} else {
return reportTemplate.getFileName();
}