Merge pull request #1381 from bcgov/feat/kevin-1224

Feat/kevin 1224

backend/lcfs/web/api/email/services.py

@@ -36,9 +36,12 @@ def __init__(self, repo: CHESEmailRepository = Depends()):
         self._token_expiry = None
         self._validate_configuration()
 
-        # Initialize template environment
+        # Update template directory path to the root templates directory
         template_dir = os.path.join(os.path.dirname(__file__), "templates")
-        self.template_env = Environment(loader=FileSystemLoader(template_dir))
+        self.template_env = Environment(
+            loader=FileSystemLoader(template_dir),
+            autoescape=True  # Enable autoescaping for security
+        )
 
     def _validate_configuration(self):
         """
@@ -63,7 +66,8 @@ async def send_notification_email(
             notification_type, organization_id
         )
         if not recipient_emails:
-            logger.info(f"No subscribers for notification type: {notification_type}")
+            logger.info(f"""No subscribers for notification type: {
+                        notification_type}""")
             return False
 
         # Render the email content
@@ -84,15 +88,16 @@ def _render_email_template(
     ) -> str:
         """
         Render an email template using a predefined mapping of template names to file paths.
+        Raises an exception if template is not found.
         """
-        # Fetch template file path from the imported mapping
-        template_file = TEMPLATE_MAPPING.get(
-            template_name, TEMPLATE_MAPPING["default"]
-        )
-
-        # Render the template
-        template = self.template_env.get_template(template_file)
-        return template.render(context)
+        try:
+            template_file = TEMPLATE_MAPPING[template_name]
+            template = self.template_env.get_template(template_file)
+            return template.render(**context)
+        except Exception as e:
+            logger.error(f"Template rendering error: {str(e)}")
+            raise ValueError(
+                f"Failed to render email template for {template_name}")
 
     def _build_email_payload(
         self, recipients: List[str], context: Dict[str, Any], body: str

backend/lcfs/web/api/email/template_mapping.py

@@ -16,5 +16,4 @@
     "IDIR_DIRECTOR__COMPLIANCE_REPORT__MANAGER_RECOMMENDATION": "idir_director__compliance_report__manager_recommendation.html",
     "IDIR_DIRECTOR__INITIATIVE_AGREEMENT__ANALYST_RECOMMENDATION": "idir_director__initiative_agreement__analyst_recommendation.html",
     "IDIR_DIRECTOR__TRANSFER__ANALYST_RECOMMENDATION": "idir_director__transfer__analyst_recommendation.html",
-    "default": "default.html",
 }

backend/lcfs/web/api/email/templates/bceid__compliance_report__director_assessment.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Credit Record' %}
+{% set url_slug = 'credit-records' %}

backend/lcfs/web/api/email/templates/bceid__initiative_agreement__director_approval.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Initiative Agreement' %}
+{% set url_slug = 'initiative-agreement' %}

backend/lcfs/web/api/email/templates/bceid__transfer__director_decision.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Transfer' %}
+{% set url_slug = 'transfers' %}

backend/lcfs/web/api/email/templates/bceid__transfer__partner_actions.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Transfer' %}
+{% set url_slug = 'transfers' %}

backend/lcfs/web/api/email/templates/idir_analyst__compliance_report__director_decision.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Credit Record' %}
+{% set url_slug = 'credit-records' %}

backend/lcfs/web/api/email/templates/idir_analyst__compliance_report__manager_recommendation.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Credit Record' %}
+{% set url_slug = 'credit-records' %}

backend/lcfs/web/api/email/templates/idir_analyst__compliance_report__submitted_for_review.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Credit Record' %}
+{% set url_slug = 'credit-records' %}

backend/lcfs/web/api/email/templates/idir_analyst__initiative_agreement__returned_to_analyst.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Initiative Agreement' %}
+{% set url_slug = 'initiative-agreements' %}

backend/lcfs/web/api/email/templates/idir_analyst__transfer__director_recorded.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Transfer' %}
+{% set url_slug = 'transfer-requests' %}

backend/lcfs/web/api/email/templates/idir_analyst__transfer__rescinded_action.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Transfer' %}
+{% set url_slug = 'transfer-requests' %}

backend/lcfs/web/api/email/templates/idir_analyst__transfer__submitted_for_review.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Transfer' %}
+{% set url_slug = 'transfer-requests' %}

backend/lcfs/web/api/email/templates/idir_compliance_manager__compliance_report__analyst_recommendation.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Credit Record' %}
+{% set url_slug = 'credit-records' %}

backend/lcfs/web/api/email/templates/idir_compliance_manager__compliance_report__director_assessment.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Credit Record' %}
+{% set url_slug = 'credit-records' %}

backend/lcfs/web/api/email/templates/idir_compliance_manager__compliance_report__submitted_for_review.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Credit Record' %}
+{% set url_slug = 'credit-records' %}

backend/lcfs/web/api/email/templates/idir_director__compliance_report__manager_recommendation.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Credit Record' %}
+{% set url_slug = 'credit-records' %}

backend/lcfs/web/api/email/templates/idir_director__initiative_agreement__analyst_recommendation.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Initiative Agreement' %}
+{% set url_slug = 'initiative-agreements' %}

backend/lcfs/web/api/email/templates/idir_director__transfer__analyst_recommendation.html

@@ -0,0 +1,3 @@
+{% extends 'notification_base.html' %}
+{% set notification_type = 'Transfer' %}
+{% set url_slug = 'transfer-requests' %}