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/filing_notification.py b/queue_services/business-emailer/src/business_emailer/email_processors/filing_notification.py index 219d347cf6..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 @@ -368,7 +368,7 @@ def process(email_info: dict, token: str) -> dict | None: if filing_type == "agmLocationChange": subject = f"{business_name} - {filing_name} approved" elif filing_type in ["consentAmalgamationOut", "consentContinuationOut"]: - subject = f"{business_name} - {filing_name_short} Granted" + subject = f"{business_name} - {filing_name_short}" 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 138fbaad0f..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 @@ -2,7 +2,7 @@ --- -[[business-tombstone-out-filing.md]] +[[business-tombstone.md]] --- 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..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,8 +5,3 @@ **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' -%} -**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 97ba7f5655..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 @@ -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', ], @@ -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', ], ),