From c187fbf981c467f663b0ebfab7548987ed5359c2 Mon Sep 17 00:00:00 2001
From: Kevin Zhang <54437031+kzdev420@users.noreply.github.com>
Date: Sat, 28 Dec 2024 08:04:44 +0800
Subject: [PATCH] 24225 debug emaler (#1644)

---
 .../src/namex_emailer/email_processors/nr_result.py        | 7 ++++++-
 services/emailer/src/namex_emailer/resources/worker.py     | 1 +
 services/emailer/src/namex_emailer/services/helpers.py     | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/services/emailer/src/namex_emailer/email_processors/nr_result.py b/services/emailer/src/namex_emailer/email_processors/nr_result.py
index 7d75f7892..e59897f9e 100644
--- a/services/emailer/src/namex_emailer/email_processors/nr_result.py
+++ b/services/emailer/src/namex_emailer/email_processors/nr_result.py
@@ -98,8 +98,12 @@ def email_report(email_info: SimpleCloudEvent):
         recipients = ','.join(recipient_emails)
         template_path = current_app.config.get('REPORT_TEMPLATE_PATH')
         email_template = Path(f'{template_path}/rejected.md').read_text()
+        structured_log(request, "DEBUG", f"NR_notification: {nr_model}")
         if nr_model['stateCd'] in [State.APPROVED, State.CONDITIONAL]:
-            instruction_group = ReportResource._get_instruction_group(nr_model['entity_type_cd'], nr_model["request_action_cd"])
+            legal_type = nr_model['entity_type_cd']
+            request_action = nr_model["request_action_cd"]
+            corpNum = nr_model["corpNum"]
+            instruction_group = ReportResource._get_instruction_group(legal_type, request_action, corpNum)
             file_name=''
             if nr_model['consentFlag'] in ['Y', 'R']:
                 file_name = 'conditional'
@@ -112,6 +116,7 @@ def email_report(email_info: SimpleCloudEvent):
 
             email_template = Path(f'{template_path}/{file_name}.md').read_text()
 
+        structured_log(request, "DEBUG", f"NR_notification: {file_name}")
         email_body = _build_email_body(email_template, nr_model, recipient_emails[0], recipient_phones[0])
 
         email = {
diff --git a/services/emailer/src/namex_emailer/resources/worker.py b/services/emailer/src/namex_emailer/resources/worker.py
index b4cd54c92..5b5a6ba44 100644
--- a/services/emailer/src/namex_emailer/resources/worker.py
+++ b/services/emailer/src/namex_emailer/resources/worker.py
@@ -133,6 +133,7 @@ def process_email(email_msg: SimpleCloudEvent):  # pylint: disable=too-many-bran
 
 def send_email(email: dict, token: str):
     """Send the email"""
+    structured_log(request, "INFO", f"Send Email: {email}")
     return requests.post(
         f'{current_app.config.get("NOTIFY_API_URL", "")}',
         json=email,
diff --git a/services/emailer/src/namex_emailer/services/helpers.py b/services/emailer/src/namex_emailer/services/helpers.py
index add5e6263..31eeccc25 100644
--- a/services/emailer/src/namex_emailer/services/helpers.py
+++ b/services/emailer/src/namex_emailer/services/helpers.py
@@ -61,4 +61,4 @@ def query_nr_number(identifier: str):
 def get_magic_link(nr_number, email, phone):
     """Return a magic link."""
     auth_web_url = current_app.config.get("AUTH_WEB_URL")
-    return f'{auth_web_url}incorporateNow/?nr={nr_number}&email={email}&phone={phone}'
+    return f'{auth_web_url}incorporateNow?nr={nr_number}&email={email}&phone={phone}'