30343 use alternate name for sole props chg of reg (#3767)

* 30343 Update to add in alterative name if it matches id

Signed-off-by: Thayne Werdal <thayne.werdal@gov.bc.ca>

* 30343 update to business-emailer. Entity-emailer is no longer used.

Signed-off-by: Thayne Werdal <thayne.werdal@gov.bc.ca>

* 30343 - update to properly grab alternate names for email subject and body

Signed-off-by: Thayne Werdal <thayne.werdal@gov.bc.ca>

* 30343-Lint fixes

Signed-off-by: Thayne Werdal <thayne.werdal@gov.bc.ca>

* Update to address some PR suggestions

Signed-off-by: Thayne Werdal <thayne.werdal@gov.bc.ca>

* 30343-Rebase, update to simplify code as per suggestions

Signed-off-by: Thayne Werdal <thayne.werdal@gov.bc.ca>

* 30343-Updating code as per suggestions

Signed-off-by: Thayne Werdal <thayne.werdal@gov.bc.ca>

* 30343-adding in businessName var lost in rebase

Signed-off-by: Thayne Werdal <thayne.werdal@gov.bc.ca>

* 30343-update to quotes used

Signed-off-by: Thayne Werdal <thayne.werdal@gov.bc.ca>

* 30343-Update to incorporate suggested code fix

Signed-off-by: Thayne Werdal <thayne.werdal@gov.bc.ca>

* Update queue_services/business-emailer/src/business_emailer/email_templates/common/reg-business-info.html

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update queue_services/business-emailer/src/business_emailer/email_templates/common/reg-business-info.html

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Signed-off-by: Thayne Werdal <thayne.werdal@gov.bc.ca>
Co-authored-by: Séverin Beauvais <severinbeauvais@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: 3 people

queue_services/business-emailer/src/business_emailer/email_processors/__init__.py

@@ -36,6 +36,8 @@ def get_filing_info(filing_id: str) -> tuple[Filing, dict, dict, str, str]:
     if filing.business_id:
         business = Business.find_by_internal_id(filing.business_id)
         business_json = business.json()
+        if business.legal_type in ("SP", "GP"):
+            business_json["businessName"] = business.legal_name  # `legalName` in json would be replaced for firms
 
     # payment date if available otherwise filing date
     leg_tmz_filing_date = LegislationDatetime.format_as_report_string(

queue_services/business-emailer/src/business_emailer/email_processors/change_of_registration_notification.py

@@ -120,6 +120,7 @@ def process(email_info: dict, token: str) -> dict:  # pylint: disable=too-many-l
         f'{current_app.config.get("TEMPLATE_PATH")}/CHGREG-{status}.html'
     ).read_text()
     filled_template = substitute_template_parts(template)
+
     # render template with vars
     jnja_template = Template(filled_template, autoescape=True)
     filing_data = (filing.json)["filing"][f"{filing_type}"]
@@ -169,9 +170,8 @@ def process(email_info: dict, token: str) -> dict:  # pylint: disable=too-many-l
     if not subject:  # fallback case - should never happen
         subject = "Notification from the BC Business Registry"
 
-    legal_name = business.get("legalName", None)
+    legal_name = business.get("businessName") or business.get("legalName")
     subject = f"{legal_name} - {subject}" if legal_name else subject
-
     return {
         "recipients": recipients,
         "requestBy": "BCRegistries@gov.bc.ca",

queue_services/business-emailer/src/business_emailer/email_templates/common/reg-business-info.html

@@ -13,7 +13,11 @@
       <div class="value">Unknown</div>
       {% endif %}
     {% else %}
+      {% if business.businessName %}
+      <div class="value">{{ business.businessName }}</div>
+      {% else %}
       <div class="value">{{ business.legalName }}</div>
+      {% endif %}
     {% endif %}
   </div>
 

queue_services/business-emailer/tests/unit/email_processors/test_change_of_registration_notification.py

@@ -54,10 +54,10 @@ def test_change_of_registration_notification(app, session, mocker, status, legal
         email = change_of_registration_notification.process(
             {'filingId': filing.id, 'type': 'changeOfRegistration', 'option': status}, token)
         if status == 'PAID':
-            assert email['content']['subject'] == 'JANE A DOE - Confirmation of Filing from the Business Registry'
+            assert email['content']['subject'] == 'test business - Confirmation of Filing from the Business Registry'
         else:
             assert email['content']['subject'] == \
-                'JANE A DOE - Change of Registration Documents from the Business Registry'
+                'test business - Change of Registration Documents from the Business Registry'
 
         if submitter_role:
             assert f'{submitter_role}@email.com' in email['recipients']