32958 Business Emailer - updates for reg and cor

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

@@ -48,27 +48,42 @@ def get_filing_info(filing_id: str) -> tuple[Filing, dict, dict, str, str]:
     return filing, business_json, leg_tmz_filing_date, leg_tmz_effective_date
 
 
+def get_party_emails(parties: list[dict], roles: list[str]) -> list[str]:
+    """Return the emails for the specified party types."""
+    recipients = []
+    for party in parties:
+        for role in party["roles"]:
+            if role["roleType"] in roles and (email := party["officer"].get("email")):
+                recipients.append(email)
+                break
+
+    return recipients
+
+
 def get_recipients(option: str, filing_json: dict, token: str | None = None, filing_type: str | None = None) -> str:
     """Get the recipients for the email output."""
     recipients = ""
-    filing_type = filing_type if filing_type else "incorporationApplication"
-    if filing_json["filing"].get(filing_type):
-        recipients = filing_json["filing"][filing_type].get("contactPoint", {}).get("email", "")
-        if option in [Filing.Status.PAID.value, "bn"] and \
-            filing_json["filing"]["header"]["name"] == filing_type:
-            parties = filing_json["filing"][filing_type].get("parties")
-            comp_party_email = None
-            for party in parties:
-                for role in party["roles"]:
-                    if role["roleType"] == "Completing Party" and \
-                        (comp_party_email := party["officer"].get("email")):
-                        recipients = f"{recipients}, {comp_party_email}"
-                        break
-    else:
-        identifier = filing_json["filing"]["business"]["identifier"]
-        if identifier[:2] != "CP":
-            # only add recipients if not coop
-            recipients = get_recipient_from_auth(identifier, token)
+    identifier = filing_json["filing"]["business"]["identifier"]
+    is_coop = identifier.startswith("CP")
+
+    if filing_type and (filing_data := filing_json["filing"].get(filing_type)):
+        # add filing contact point email
+        recipients = filing_data.get("contactPoint", {}).get("email", "") or ""
+
+        # add relevant party emails
+        # FUTURE: after amalg and continuation have completing party removed 'temp_logic' can be removed
+        temp_logic = filing_type in ["amalgamationApplication", "continuationIn"] and option in ["PAID", "bn"]
+        is_coop_incorp_paid = is_coop and filing_type == "incorporationApplication" and option == "PAID"
+        is_valid_filing = filing_type in ["changeOfRegistration", "registration", "correction", "dissolution"]
+        if ((temp_logic or is_coop_incorp_paid or is_valid_filing)
+            and (parties := filing_data.get("parties"))
+            and (party_emails := get_party_emails(parties, ["Completing Party", "Custodian", "Partner", "Proprietor"]))
+        ):
+            recipients = f"{recipients}, {', '.join(party_emails)}"
+
+    elif not is_coop:
+        # only add business email recipient for non-coop
+        recipients = get_recipient_from_auth(identifier, token)
 
     return recipients
 
@@ -298,6 +313,8 @@ def _add_filing_document_pdf(  # noqa: PLR0913
         file_name = "Address Change"
     elif document_type == "changeOfDirectors":
         file_name = "Director Change"
+    elif document_type == "registration":
+        file_name = "Statement of Registration"
 
     # Get pdf and add it to the list
     filing_pdf_encoded = get_filing_document(business["identifier"], filing.id, document_type, token)

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

@@ -33,7 +33,7 @@
     OFFICE_NAME,
     get_legal_type_key,
 )
-from business_model.models import Business, Filing, UserRoles
+from business_model.models import Business, CorpType, Filing, UserRoles
 
 
 def _get_additional_info(filing: Filing) -> dict:
@@ -78,7 +78,7 @@
     return attachments, extra_pdf_types
 
 
-def process(email_info: dict, token: str) -> dict:
+def process(email_info: dict, token: str) -> dict | None:
     """Build the email the filing notification."""
     current_app.logger.debug("filing_notification: %s", email_info)
     filing_type, status = email_info["type"], email_info["option"]
@@ -92,7 +92,8 @@
     new_business_filings = ["amalgamationApplication", "continuationIn", "incorporationApplication", "registration"]
     filing_data = filing.json.get("filing", {}).get(filing_type, {})
     if filing_type in new_business_filings and not business:
-        # For new business filings, the business record is not created yet. So we get the business info from the nameRequest.
+        # For new business filings, the nameRequest contains relevant business details.
+        # We overwrite the business info from the nameRequest and then set the identifier back to the temp reg id.
         name_request = filing_data.get("nameRequest")
         business = name_request
         business["identifier"] = filing.temp_reg
@@ -103,6 +104,7 @@
     if not legal_type or not filing_name or not business_identifier:
         # Should never happen - log and return. It will be skipped.
         current_app.logger.error("Missing legal_type, identifier and/or filing_name. Email: %s", email_info)
+        return
 
     skipped_coop_filing_types = ["changeOfDirectors", "changeOfAddress"]
     if legal_type == Business.LegalTypes.COOP.value and filing_type in skipped_coop_filing_types:
@@ -118,6 +120,9 @@
     business_name = business.get("legalName") or NOT_AVAILABLE
     filing_name_short = FILING_TITLE_SHORT.get(filing_type)
     legal_type_key = get_legal_type_key(legal_type)
+    business_description = "Business"
+    if corp_type := CorpType.find_by_id(legal_type):
+        business_description: str = corp_type.full_desc.replace("BC ", "")
 
     business_number = None
     if len(business.get("taxId", "")) > 9:  # noqa: PLR2004
@@ -145,18 +150,25 @@
         entity_dashboard_url=dashboard_url,
         filing_type=filing_type,
         attachments_list=attachments_list,
+        business_description=business_description,
         business_name=business_name,
         business_identifier=business_identifier,
         business_number=business_number,
         filing_name=filing_name,
         filing_name_short=filing_name_short,
         future_attachments_list=future_attachments,
         office_name=OFFICE_NAME.get(legal_type_key),
+        number_description="Registration" if legal_type_key == "FIRM" else "Incorporation",
         show_effective_date=show_effective_date,
     )
 
     # get recipients
-    recipients = get_recipients(status, filing.filing_json, token)
+    recipient_filing_type = None
+    if filing_type in ["incorporationApplication", "registration", "changeOfRegistration"]:
+        recipient_filing_type = filing_type
+
+    recipients = get_recipients(status, filing.filing_json, token, recipient_filing_type)
+
     if additional_recipients := _get_additional_recipients(filing, token):
         recipients = f"{recipients}, {additional_recipients}"