Commit 78625c29 authored by Enriko Käsper's avatar Enriko Käsper
Browse files

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Enriko Käsper

See merge request teis/riskassessments-service!148
parents c89116f5 0afbae0d
# Changelog
## [1.6.0] - 2021-10-11
* TEIS-2487: keep EST characters in generated pdf file name
## [1.5.1] - 2021-10-01
* TEIS-2461: generated pdf file is now cleared of special characters
......
theGroup=ee.sm.ti.teis
theVersion=1.5.1
theVersion=1.6.0
commonsVersion=1.27.0
officeApiGatewayVersion=1.27.1
filesVersion=1.21.0
......
......@@ -252,7 +252,7 @@ public class RiskAssessmentPDFService {
String jsonData = jsonUtil.writeObjectAsString(riskAssessmentPdf);
PreviewDocumentMsRequest request = getMsPreviewDocumentRequest(requestMetaDTO, jsonData);
GeneratedDocumentDto extractedMessagesDocument = docGenServiceClient.getDocument(request, requestMetaDTO);
String clearedFileName = riskAssessmentPdf.getTitle().replaceAll("[^A-Za-z0-9\\p{IsCyrillic} ]", "").trim();
String clearedFileName = riskAssessmentPdf.getTitle().replaceAll("[^A-Za-z0-9 &öäüõÖÄÜÕ\\p{IsCyrillic}]", "").trim();
SignFileStream documentToSign = SignFileStream.builder()
.content(extractedMessagesDocument.getContent())
.fileName(clearedFileName + FILE_EXTENSION)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment