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

feat(PN-12551): added template for aar bilingual #1019

Draft
wants to merge 10 commits into
base: develop
Choose a base branch
from
Draft

feat(PN-12551): added template for aar bilingual #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
53d18a8
feat(PN-12552): wip on new aar template
SarahDonvito Aug 30, 2024
61ccd2d
feat(PN-12552): wip on aar
SarahDonvito Sep 2, 2024
2b476d9
feat(PN-12552): wip on aar second page
SarahDonvito Sep 3, 2024
26df4a2
feat(PN-12552): wip on aar second page
SarahDonvito Sep 3, 2024
782b7f9
feat(PN-12552): aar second page
SarahDonvito Sep 3, 2024
c68071f
feat(PN-12551): wip on bilingual aar
SarahDonvito Sep 6, 2024
71f80d7
feat(PN-12552): add new test for new template
SarahDonvito Sep 6, 2024
5dd9945
Merge branch 'feat/PN-12552' of github.com:pagopa/pn-delivery-push in…
SarahDonvito Sep 6, 2024
5230bd3
feat(PN-12551): bilingual template
SarahDonvito Sep 9, 2024
c3052cb
feat(PN-12551): wip on new aar template
SarahDonvito Sep 16, 2024
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
2 changes: 1 addition & 1 deletion config/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ pn.delivery-push.raddExperimentationStoresName[4]=radd-experimentation-zip-5

#Configuration for send notification attachment, AAR, and AAR type. Comma separated list made up by:
# "Configuration start time" (UTC);"Send attachment mode for analog";"Send attachment mode for simple registered letter";"Send attachment mode for legal mail";"AAR template type" - if <RADD_TEMPLATE_DEFINITION> is last parameter value ("AAR template type") it means that the AAR template type need to be obtained dynamically, used for RADD experimentation
pn.delivery-push.pn-send-mode=1970-01-01T00:00:00Z;AAR-DOCUMENTS-PAYMENTS;AAR;AAR;AAR_NOTIFICATION,2024-05-22T22:00:00Z;AAR-DOCUMENTS-PAYMENTS;AAR;AAR-DOCUMENTS-PAYMENTS;AAR_NOTIFICATION,2024-05-22T22:00:00Z;AAR-DOCUMENTS-PAYMENTS;AAR;AAR-DOCUMENTS-PAYMENTS;<RADD_TEMPLATE_DEFINITION>,2024-06-26T22:00:00Z;AAR-DOCUMENTS-PAYMENTS;AAR;AAR-DOCUMENTS-PAYMENTS;AAR_NOTIFICATION_RADD_ALT
pn.delivery-push.pn-send-mode=1970-01-01T00:00:00Z;AAR-DOCUMENTS-PAYMENTS;AAR;AAR;AAR_NOTIFICATION,2024-05-22T22:00:00Z;AAR-DOCUMENTS-PAYMENTS;AAR;AAR-DOCUMENTS-PAYMENTS;AAR_NOTIFICATION,2024-05-22T22:00:00Z;AAR-DOCUMENTS-PAYMENTS;AAR;AAR-DOCUMENTS-PAYMENTS;<RADD_TEMPLATE_DEFINITION>,2024-06-26T22:00:00Z;AAR-DOCUMENTS-PAYMENTS;AAR;AAR-DOCUMENTS-PAYMENTS;AAR_NOTIFICATION_RADD_ALT;AAR_NOTIFICATION_RADD_ALT_ITA;

# Attachment retention after validation.
# Note: This number is defined on safeStorage, so a change to these properties does not imply a change to effective file retention
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/it/pagopa/pn/deliverypush/legalfacts/AarTemplateType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
public enum AarTemplateType {
AAR_NOTIFICATION(false, DocumentComposition.TemplateType.AAR_NOTIFICATION),
AAR_NOTIFICATION_RADD(true, DocumentComposition.TemplateType.AAR_NOTIFICATION_RADD),
AAR_NOTIFICATION_RADD_ALT(true, DocumentComposition.TemplateType.AAR_NOTIFICATION_RADD_ALT);
AAR_NOTIFICATION_RADD_ALT(true, DocumentComposition.TemplateType.AAR_NOTIFICATION_RADD_ALT),
AAR_NOTIFICATION_RADD_ALT_bilingual(true, DocumentComposition.TemplateType.AAR_NOTIFICATION_RADD_ALT_bilingual),
AAR_NOTIFICATION_RADD_ALT_ITA(true,DocumentComposition.TemplateType.AAR_NOTIFICATION_RADD_ALT_ITA);

private final boolean aarRADD;
private final DocumentComposition.TemplateType templateType;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/it/pagopa/pn/deliverypush/legalfacts/DocumentComposition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ public enum TemplateType {
AAR_NOTIFICATION("documents_composition_templates/NotificationAAR.html"),
AAR_NOTIFICATION_RADD("documents_composition_templates/NotificationAAR_RADD.html"),
AAR_NOTIFICATION_RADD_ALT("documents_composition_templates/NotificationAAR_RADDalt.html"),
AAR_NOTIFICATION_RADD_ALT_bilingual("documents_composition_templates/NotificationAAR_RADDalt_bilingual.html"),
AAR_NOTIFICATION_RADD_ALT_ITA("documents_composition_templates/NotificationAAR_RADDalt_ITA.html"),
AAR_NOTIFICATION_EMAIL("documents_composition_templates/NotificationAARForEMAIL.html"),
AAR_NOTIFICATION_PEC("documents_composition_templates/NotificationAARForPEC.html"),
AAR_NOTIFICATION_SUBJECT("documents_composition_templates/NotificationAARSubject.txt"),
Expand Down
3 changes: 2 additions & 1 deletion ...agopa/pn/deliverypush/middleware/dao/timelinedao/dynamo/entity/AarTemplateTypeEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
public enum AarTemplateTypeEntity {
AAR_NOTIFICATION("AAR_NOTIFICATION"),
AAR_NOTIFICATION_RADD("AAR_NOTIFICATION_RADD"),
AAR_NOTIFICATION_RADD_ALT("AAR_NOTIFICATION_RADD_ALT");
AAR_NOTIFICATION_RADD_ALT("AAR_NOTIFICATION_RADD_ALT"),
AAR_NOTIFICATION_RADD_ALT_ITA("AAR_NOTIFICATION_RADD_ALT_ITA");

private final String value;

Expand Down
Loading