refactor a bit

cds-snc · Jan 14, 2025 · 3a5766d · 3a5766d
1 parent 71519b9
commit 3a5766d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/app/clients/freshdesk.py b/app/clients/freshdesk.py
@@ -146,6 +146,13 @@ def email_freshdesk_ticket_freshdesk_down(self):
             current_app.config["CONTACT_FORM_EMAIL_ADDRESS"], current_app.config["CONTACT_FORM_DIRECT_EMAIL_TEMPLATE_ID"]
         )
 
+    def email_freshdesk_ticket_sensitive_service(self):
+        email_address = current_app.config.get("SENSITIVE_SERVICE_EMAIL")
+        template_id = current_app.config.get("CONTACT_FORM_SENSITIVE_SERVICE_EMAIL_TEMPLATE_ID")
+        if not email_address:
+            current_app.logger.error("Sensitive service email address not set")
+        self.email_freshdesk_ticket(email_address, template_id)
+
     def email_freshdesk_ticket(self, email_address, template_id) -> None:
         content = self._generate_ticket()
         try:

diff --git a/app/user/rest.py b/app/user/rest.py
@@ -491,13 +491,8 @@ def send_contact_request(user_id):
 
         if any(service_id in user_service_ids for service_id in sensitive_service_ids):
             # Send to secure email instead of Freshdesk
-            email_address = current_app.config.get("SENSITIVE_SERVICE_EMAIL")
-            template_id = current_app.config.get("CONTACT_FORM_SENSITIVE_SERVICE_EMAIL_TEMPLATE_ID")
-            if not email_address:
-                current_app.logger.error("Sensitive service email address not set")
-                return jsonify({}), 500
-            status_code = Freshdesk(contact).email_freshdesk_ticket(email_address, template_id)
-            return jsonify({"status_code": status_code}), 204
+            Freshdesk(contact).email_freshdesk_ticket_sensitive_service()
+            return 201
 
     status_code = Freshdesk(contact).send_ticket()
     return jsonify({"status_code": status_code}), 204