Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PRDP-148] Removed fiscal code from pdf name #18

Merged
merged 1 commit into from
Oct 4, 2023
Merged

[PRDP-148] Removed fiscal code from pdf name #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/main/java/it/gov/pagopa/receipt/pdf/generator/service/GenerateReceiptPdfService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public PdfGeneration handlePdfsGeneration(boolean generateOnlyDebtor, Receipt re
receipt.getMdAttach().getUrl() == null ||
receipt.getMdAttach().getUrl().isEmpty())
) {
pdfGeneration.setDebtorMetadata(generatePdf(bizEvent, debtorCF, true));
pdfGeneration.setDebtorMetadata(generatePdf(bizEvent, true));
}
} else {
//Generate debtor's partial PDF
Expand All @@ -62,15 +62,15 @@ public PdfGeneration handlePdfsGeneration(boolean generateOnlyDebtor, Receipt re
receipt.getMdAttach().getUrl() == null ||
receipt.getMdAttach().getUrl().isEmpty())
) {
pdfGeneration.setDebtorMetadata(generatePdf(bizEvent, debtorCF, false));
pdfGeneration.setDebtorMetadata(generatePdf(bizEvent, false));
}
//Generate payer's complete PDF
if (payerCF != null &&
(receipt.getMdAttachPayer() == null ||
receipt.getMdAttachPayer().getUrl() == null ||
receipt.getMdAttachPayer().getUrl().isEmpty())
) {
pdfGeneration.setPayerMetadata(generatePdf(bizEvent, payerCF, true));
pdfGeneration.setPayerMetadata(generatePdf(bizEvent, true));
}
}

Expand All @@ -81,11 +81,10 @@ public PdfGeneration handlePdfsGeneration(boolean generateOnlyDebtor, Receipt re
* Handles PDF generation and saving to storage
*
* @param bizEvent Biz-event from queue message
* @param fiscalCode Debtor or payer fiscal code
* @param completeTemplate Boolean that indicates what template to use
* @return PDF metadata retrieved from Blob Storage or relative error message
*/
private PdfMetadata generatePdf(BizEvent bizEvent, String fiscalCode, boolean completeTemplate) {
private PdfMetadata generatePdf(BizEvent bizEvent, boolean completeTemplate) {
PdfEngineRequest request = new PdfEngineRequest();
PdfMetadata response = new PdfMetadata();

Expand All @@ -110,7 +109,7 @@ private PdfMetadata generatePdf(BizEvent bizEvent, String fiscalCode, boolean co

if (pdfEngineResponse.getStatusCode() == HttpStatus.SC_OK) {
//Save the PDF
String pdfFileName = bizEvent.getId() + fiscalCode;
String pdfFileName = bizEvent.getId() + "_" + (completeTemplate ? "p" : "d");

handleSaveToBlobStorage(pdfEngineResponse, response, pdfFileName);

Expand Down
Loading