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-70] Template mapping continuing develop #23

Merged
merged 6 commits into from
Oct 5, 2023
Merged

[PRDP-70] Template mapping continuing develop #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad7ac9e
[PRDP-70] Added IUR to debtor position entity
svariant Oct 4, 2023
0d3d336
[PRDP-130] Template Mapping - User Data Full Name
svariant Oct 4, 2023
b8ae9c3
[PRDP-130] Template Mapping - ID
svariant Oct 4, 2023
115be0c
[PRDP-130] Template Mapping - Rrn
svariant Oct 4, 2023
043f989
[PRDP-70] Reinforced mapping's conditions
svariant Oct 5, 2023
b47ea85
[PRDP-70] Fixed onlyDebtor condition
svariant Oct 5, 2023
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
3 changes: 3 additions & 0 deletions src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/PaymentInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package it.gov.pagopa.receipt.pdf.generator.entity.event;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;

import java.util.List;
Expand All @@ -26,4 +27,6 @@ public class PaymentInfo {
private String remittanceInformation;
private String description;
private List<MapEntry> metadata;
@JsonProperty(value="IUR")
private String IUR;
}
3 changes: 1 addition & 2 deletions src/main/java/it/gov/pagopa/receipt/pdf/generator/model/template/UserData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
@JsonInclude(Include.NON_NULL)
public class UserData {

private String firstName;
private String lastName;
private String fullName;
private String taxCode;
}

11 changes: 6 additions & 5 deletions .../java/it/gov/pagopa/receipt/pdf/generator/service/impl/GenerateReceiptPdfServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ public PdfGeneration generateReceipts(Receipt receipt, BizEvent bizEvent) {
}
}

} else {
pdfGeneration.setGenerateOnlyDebtor(true);
}

//Generate debtor's partial PDF
Expand Down Expand Up @@ -213,7 +215,7 @@ private PdfEngineResponse generatePdf(ReceiptPDFTemplate template) throws PDFRec
return pdfEngineResponse;
}

private ReceiptPDFTemplate buildTemplate(BizEvent bizEvent, boolean onlyDebtor) {
private ReceiptPDFTemplate buildTemplate(BizEvent bizEvent, boolean partialTemplate) {
// TODO build template data
return ReceiptPDFTemplate.builder()
.transaction(Transaction.builder()
Expand All @@ -234,14 +236,13 @@ private ReceiptPDFTemplate buildTemplate(BizEvent bizEvent, boolean onlyDebtor)
.extraFee(BizEventToPdfMapper.getExtraFee(bizEvent))
.build())
.authCode(BizEventToPdfMapper.getAuthCode(bizEvent))
.requestedByDebtor(onlyDebtor)
.requestedByDebtor(partialTemplate)
.build())
.user(onlyDebtor ?
.user(partialTemplate ?
null :
User.builder()
.data(UserData.builder()
.firstName(BizEventToPdfMapper.getUserFullName(bizEvent))
.lastName(null) //TODO only fullname
.fullName(BizEventToPdfMapper.getUserFullName(bizEvent))
.taxCode(BizEventToPdfMapper.getUserTaxCode(bizEvent))
.build())
.email(BizEventToPdfMapper.getUserMail(bizEvent))
Expand Down
30 changes: 17 additions & 13 deletions src/main/java/it/gov/pagopa/receipt/pdf/generator/utils/BizEventToPdfMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ private BizEventToPdfMapper() {
public static String getId(BizEvent event) {
if (
event.getTransactionDetails() != null &&
event.getTransactionDetails().getTransaction() != null
event.getTransactionDetails().getTransaction() != null &&
event.getTransactionDetails().getTransaction().getIdTransaction() != 0L
) {
return String.valueOf(event.getTransactionDetails().getTransaction().getIdTransaction());
}
if (
event.getPaymentInfo() != null
) {
return event.getPaymentInfo().getPaymentToken();
return event.getPaymentInfo().getPaymentToken() != null ? event.getPaymentInfo().getPaymentToken() : event.getPaymentInfo().getIUR();
}

//TODO IUR?
return null;
}

Expand All @@ -36,18 +36,19 @@ public static String getTimestamp(BizEvent event) {
return event.getTransactionDetails().getTransaction().getCreationDate();
}

return event.getPaymentInfo() != null ? event.getPaymentInfo().getPaymentDateTime() : "";
return event.getPaymentInfo() != null ? event.getPaymentInfo().getPaymentDateTime() : null;
}

public static String getAmount(BizEvent event){
if(
event.getTransactionDetails() != null &&
event.getTransactionDetails().getTransaction() != null
event.getTransactionDetails().getTransaction() != null &&
event.getTransactionDetails().getTransaction().getAmount() != 0L
){
return String.valueOf(event.getTransactionDetails().getTransaction().getAmount());
}

return event.getPaymentInfo() != null ? event.getPaymentInfo().getAmount() : "";
return event.getPaymentInfo() != null ? event.getPaymentInfo().getAmount() : null;
}

public static String getPspName(BizEvent event){
Expand All @@ -66,7 +67,8 @@ public static String getPspName(BizEvent event){
public static String getPspFee(BizEvent event){
if(
event.getTransactionDetails() != null &&
event.getTransactionDetails().getTransaction() != null
event.getTransactionDetails().getTransaction() != null &&
event.getTransactionDetails().getTransaction().getFee() != 0L
){
return String.valueOf(event.getTransactionDetails().getTransaction().getFee());
}
Expand All @@ -83,16 +85,19 @@ public static String getRnn(BizEvent event){
return event.getTransactionDetails().getTransaction().getRrn();
}

//TODO ECOMMERCE ANALYSIS
//TODO NODO -> paymentToken / iur?
if (
event.getPaymentInfo() != null
) {
return event.getPaymentInfo().getPaymentToken() != null ? event.getPaymentInfo().getPaymentToken() : event.getPaymentInfo().getIUR();
}

return null;
}

public static String getAuthCode(BizEvent event){
if(
event.getTransactionDetails() != null &&
event.getTransactionDetails().getTransaction() != null &&
event.getTransactionDetails().getTransaction().getAuthorizationCode() != null
event.getTransactionDetails().getTransaction() != null
){
return event.getTransactionDetails().getTransaction().getAuthorizationCode();
}
Expand All @@ -104,8 +109,7 @@ public static String getPaymentMethodName(BizEvent event){
if(
event.getTransactionDetails() != null &&
event.getTransactionDetails().getWallet() != null &&
event.getTransactionDetails().getWallet().getInfo() != null &&
event.getTransactionDetails().getWallet().getInfo().getBrand() != null
event.getTransactionDetails().getWallet().getInfo() != null
){
return event.getTransactionDetails().getWallet().getInfo().getBrand();
}
Expand Down
Loading