From 164c3003d92b161485711a039c6bf5c6cfd37103 Mon Sep 17 00:00:00 2001 From: mruff-aeq Date: Thu, 17 Sep 2026 23:02:27 -0400 Subject: [PATCH 1/2] 34506-amalgamation-out-email-qa --- queue_services/business-emailer/pyproject.toml | 2 +- .../src/business_emailer/email_processors/__init__.py | 1 + .../email_processors/filing_notification.py | 4 +++- .../business_emailer/email_templates/amalgamationOut.md | 4 ++-- .../email_templates/common/amalgamation-out-details.md | 2 ++ .../common/business-tombstone-out-filing.md | 4 +--- .../unit/email_processors/test_filing_notification.py | 8 ++++---- 7 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 queue_services/business-emailer/src/business_emailer/email_templates/common/amalgamation-out-details.md diff --git a/queue_services/business-emailer/pyproject.toml b/queue_services/business-emailer/pyproject.toml index 5becd615ef..3f459aac21 100644 --- a/queue_services/business-emailer/pyproject.toml +++ b/queue_services/business-emailer/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "business-emailer" -version = "0.1.19" +version = "0.1.20" description = "This module is the service worker for sending emails about entity related events." authors = ["Hrvoje Fekete "] license = "BSD-3-Clause" diff --git a/queue_services/business-emailer/src/business_emailer/email_processors/__init__.py b/queue_services/business-emailer/src/business_emailer/email_processors/__init__.py index 4eb919c690..973d8aead1 100644 --- a/queue_services/business-emailer/src/business_emailer/email_processors/__init__.py +++ b/queue_services/business-emailer/src/business_emailer/email_processors/__init__.py @@ -176,6 +176,7 @@ def substitute_template_parts(template_code: str, file_type = "html") -> str: """ if file_type == "md": template_parts = [ + "amalgamation-out-details", "attachments", "business-number", "business-registry-footer", diff --git a/queue_services/business-emailer/src/business_emailer/email_processors/filing_notification.py b/queue_services/business-emailer/src/business_emailer/email_processors/filing_notification.py index 219d347cf6..159f3f5c43 100644 --- a/queue_services/business-emailer/src/business_emailer/email_processors/filing_notification.py +++ b/queue_services/business-emailer/src/business_emailer/email_processors/filing_notification.py @@ -367,7 +367,9 @@ def process(email_info: dict, token: str) -> dict | None: subject = get_subject(is_future_effective_paid, business_name, legal_type, filing_name, filing_name_short) if filing_type == "agmLocationChange": subject = f"{business_name} - {filing_name} approved" - elif filing_type in ["consentAmalgamationOut", "consentContinuationOut"]: + elif filing_type == "consentAmalgamationOut": + subject = f"{business_name} - {filing_name_short}" + elif filing_type == "consentContinuationOut": subject = f"{business_name} - {filing_name_short} Granted" elif filing_type == "changeOfReceivers": subject = f"{business_name} - Confirmation of Receiver Change" diff --git a/queue_services/business-emailer/src/business_emailer/email_templates/amalgamationOut.md b/queue_services/business-emailer/src/business_emailer/email_templates/amalgamationOut.md index 138fbaad0f..c20efcc120 100644 --- a/queue_services/business-emailer/src/business_emailer/email_templates/amalgamationOut.md +++ b/queue_services/business-emailer/src/business_emailer/email_templates/amalgamationOut.md @@ -2,11 +2,11 @@ --- -[[business-tombstone-out-filing.md]] +[[business-tombstone.md]] --- -[[out-details.md]] +[[amalgamation-out-details.md]] --- diff --git a/queue_services/business-emailer/src/business_emailer/email_templates/common/amalgamation-out-details.md b/queue_services/business-emailer/src/business_emailer/email_templates/common/amalgamation-out-details.md new file mode 100644 index 0000000000..4b40dada07 --- /dev/null +++ b/queue_services/business-emailer/src/business_emailer/email_templates/common/amalgamation-out-details.md @@ -0,0 +1,2 @@ +## Details +{{ business_name }} - {{ business_identifier }} has been made **historical** in British Columbia as of {{ out_date }} after having successfully {{ out_action }} into {{ new_jurisdiction }} under the name {{ out_name | upper }}. diff --git a/queue_services/business-emailer/src/business_emailer/email_templates/common/business-tombstone-out-filing.md b/queue_services/business-emailer/src/business_emailer/email_templates/common/business-tombstone-out-filing.md index 0c39c34d25..95d2b8ebb1 100644 --- a/queue_services/business-emailer/src/business_emailer/email_templates/common/business-tombstone-out-filing.md +++ b/queue_services/business-emailer/src/business_emailer/email_templates/common/business-tombstone-out-filing.md @@ -5,8 +5,6 @@ **Effective Until:** {{ consent_expiry_date }} {% endif -%} **New Jurisdiction:** {{ new_jurisdiction }} -{% if out_date and filing_type == 'amalgamationOut' -%} -**Amalgamate Out Effective Date:** {{ out_date }} -{% elif out_date and filing_type == 'continuationOut' -%} +{% if out_date and filing_type == 'continuationOut' -%} **Continue Out Effective Date:** {{ out_date }} {% endif %} diff --git a/queue_services/business-emailer/tests/unit/email_processors/test_filing_notification.py b/queue_services/business-emailer/tests/unit/email_processors/test_filing_notification.py index 97ba7f5655..7cf3872a0c 100644 --- a/queue_services/business-emailer/tests/unit/email_processors/test_filing_notification.py +++ b/queue_services/business-emailer/tests/unit/email_processors/test_filing_notification.py @@ -791,7 +791,7 @@ def test_maintenance_filing_attachments(session, config, mock_recipients, mock_u None, 'COMPLETED', 'Your request for consent to amalgamate out of B.C. has been granted for 6 months', - 'test business - Consent to Amalgamate Out Granted', + 'test business - Consent to Amalgamate Out', [ '**Effective Until:** October 30, 2025', '**New Jurisdiction:** Alberta, Canada', @@ -807,9 +807,9 @@ def test_maintenance_filing_attachments(session, config, mock_recipients, mock_u 'You have successfully amalgamated out of B.C.', 'test business - Successful Amalgamation Out', [ - '**New Jurisdiction:** Alberta, Canada', - '**Amalgamate Out Effective Date:** April 29, 2025', - 'made historical in British Columbia as of April 29, 2025', + '**Filed Date and Time:**', + '## Details', + 'test business - BC1234567 has been made **historical** in British Columbia as of April 29, 2025', 'successfully completed its amalgamation into Alberta, Canada', 'under the name NEW TEST BUSINESS', ], From ef9b5a67e58e7a1929ae8ee2689e51e7735c7707 Mon Sep 17 00:00:00 2001 From: mruff-aeq Date: Thu, 17 Sep 2026 23:11:34 -0400 Subject: [PATCH 2/2] 34506-amalgamation-out-email-qa --- .../src/business_emailer/email_processors/__init__.py | 1 - .../email_processors/filing_notification.py | 4 +--- .../business_emailer/email_templates/amalgamationOut.md | 2 +- .../email_templates/common/amalgamation-out-details.md | 2 -- .../common/business-tombstone-out-filing.md | 3 --- .../email_templates/common/out-details.md | 3 ++- .../business_emailer/email_templates/continuationOut.md | 2 +- .../unit/email_processors/test_filing_notification.py | 9 +++++---- 8 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 queue_services/business-emailer/src/business_emailer/email_templates/common/amalgamation-out-details.md diff --git a/queue_services/business-emailer/src/business_emailer/email_processors/__init__.py b/queue_services/business-emailer/src/business_emailer/email_processors/__init__.py index 973d8aead1..4eb919c690 100644 --- a/queue_services/business-emailer/src/business_emailer/email_processors/__init__.py +++ b/queue_services/business-emailer/src/business_emailer/email_processors/__init__.py @@ -176,7 +176,6 @@ def substitute_template_parts(template_code: str, file_type = "html") -> str: """ if file_type == "md": template_parts = [ - "amalgamation-out-details", "attachments", "business-number", "business-registry-footer", diff --git a/queue_services/business-emailer/src/business_emailer/email_processors/filing_notification.py b/queue_services/business-emailer/src/business_emailer/email_processors/filing_notification.py index 159f3f5c43..8bd0b3cae1 100644 --- a/queue_services/business-emailer/src/business_emailer/email_processors/filing_notification.py +++ b/queue_services/business-emailer/src/business_emailer/email_processors/filing_notification.py @@ -367,10 +367,8 @@ def process(email_info: dict, token: str) -> dict | None: subject = get_subject(is_future_effective_paid, business_name, legal_type, filing_name, filing_name_short) if filing_type == "agmLocationChange": subject = f"{business_name} - {filing_name} approved" - elif filing_type == "consentAmalgamationOut": + elif filing_type in ["consentAmalgamationOut", "consentContinuationOut"]: subject = f"{business_name} - {filing_name_short}" - elif filing_type == "consentContinuationOut": - subject = f"{business_name} - {filing_name_short} Granted" elif filing_type == "changeOfReceivers": subject = f"{business_name} - Confirmation of Receiver Change" elif filing_type == "noticeOfWithdrawal": diff --git a/queue_services/business-emailer/src/business_emailer/email_templates/amalgamationOut.md b/queue_services/business-emailer/src/business_emailer/email_templates/amalgamationOut.md index c20efcc120..a2dc2827e0 100644 --- a/queue_services/business-emailer/src/business_emailer/email_templates/amalgamationOut.md +++ b/queue_services/business-emailer/src/business_emailer/email_templates/amalgamationOut.md @@ -6,7 +6,7 @@ --- -[[amalgamation-out-details.md]] +[[out-details.md]] --- diff --git a/queue_services/business-emailer/src/business_emailer/email_templates/common/amalgamation-out-details.md b/queue_services/business-emailer/src/business_emailer/email_templates/common/amalgamation-out-details.md deleted file mode 100644 index 4b40dada07..0000000000 --- a/queue_services/business-emailer/src/business_emailer/email_templates/common/amalgamation-out-details.md +++ /dev/null @@ -1,2 +0,0 @@ -## Details -{{ business_name }} - {{ business_identifier }} has been made **historical** in British Columbia as of {{ out_date }} after having successfully {{ out_action }} into {{ new_jurisdiction }} under the name {{ out_name | upper }}. diff --git a/queue_services/business-emailer/src/business_emailer/email_templates/common/business-tombstone-out-filing.md b/queue_services/business-emailer/src/business_emailer/email_templates/common/business-tombstone-out-filing.md index 95d2b8ebb1..4ab8e04ace 100644 --- a/queue_services/business-emailer/src/business_emailer/email_templates/common/business-tombstone-out-filing.md +++ b/queue_services/business-emailer/src/business_emailer/email_templates/common/business-tombstone-out-filing.md @@ -5,6 +5,3 @@ **Effective Until:** {{ consent_expiry_date }} {% endif -%} **New Jurisdiction:** {{ new_jurisdiction }} -{% if out_date and filing_type == 'continuationOut' -%} -**Continue Out Effective Date:** {{ out_date }} -{% endif %} diff --git a/queue_services/business-emailer/src/business_emailer/email_templates/common/out-details.md b/queue_services/business-emailer/src/business_emailer/email_templates/common/out-details.md index f3af042d09..4b40dada07 100644 --- a/queue_services/business-emailer/src/business_emailer/email_templates/common/out-details.md +++ b/queue_services/business-emailer/src/business_emailer/email_templates/common/out-details.md @@ -1 +1,2 @@ -Your business {{ business_name }} - {{ business_identifier }} has been made historical in British Columbia as of {{ out_date }} after having successfully {{ out_action }} into {{ new_jurisdiction }} under the name {{ out_name | upper }}. \ No newline at end of file +## Details +{{ business_name }} - {{ business_identifier }} has been made **historical** in British Columbia as of {{ out_date }} after having successfully {{ out_action }} into {{ new_jurisdiction }} under the name {{ out_name | upper }}. diff --git a/queue_services/business-emailer/src/business_emailer/email_templates/continuationOut.md b/queue_services/business-emailer/src/business_emailer/email_templates/continuationOut.md index 621f69c991..98e44b649f 100644 --- a/queue_services/business-emailer/src/business_emailer/email_templates/continuationOut.md +++ b/queue_services/business-emailer/src/business_emailer/email_templates/continuationOut.md @@ -2,7 +2,7 @@ --- -[[business-tombstone-out-filing.md]] +[[business-tombstone.md]] --- diff --git a/queue_services/business-emailer/tests/unit/email_processors/test_filing_notification.py b/queue_services/business-emailer/tests/unit/email_processors/test_filing_notification.py index 7cf3872a0c..c3b69f3d9c 100644 --- a/queue_services/business-emailer/tests/unit/email_processors/test_filing_notification.py +++ b/queue_services/business-emailer/tests/unit/email_processors/test_filing_notification.py @@ -819,7 +819,7 @@ def test_maintenance_filing_attachments(session, config, mock_recipients, mock_u None, 'COMPLETED', 'Your request for consent to continue out of B.C. has been granted for 6 months', - 'test business - Consent to Continue Out Granted', + 'test business - Consent to Continue Out', [ '**Effective Until:** October 30, 2025', '**New Jurisdiction:** Alberta, Canada', @@ -835,9 +835,10 @@ def test_maintenance_filing_attachments(session, config, mock_recipients, mock_u 'You have successfully continued out of B.C.', 'test business - Successful Continuation Out', [ - '**New Jurisdiction:** Alberta, Canada', - '**Continue Out Effective Date:** April 29, 2025', - 'made historical in British Columbia as of April 29, 2025', + '**Filed Date and Time:**', + '## Details', + 'test business - BC1234567 has been made **historical** in British Columbia as of April 29, 2025', + 'successfully continued into Alberta, Canada', 'under the name NEW TEST BUSINESS', ], ),