Use FQDN when sending issues to asana

DemocracyClub · Jun 18, 2024 · 5ff094f · 5ff094f
1 parent 7dbd30a
commit 5ff094f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/polling_stations/apps/bug_reports/models.py b/polling_stations/apps/bug_reports/models.py
@@ -1,3 +1,4 @@
+import os
 from urllib.parse import urljoin
 
 from django.conf import settings
@@ -33,15 +34,15 @@ class BugReport(TimeStampedModel):
 
     def as_asana_object(self):
         desc = truncatechars(self.description, 30)
+        fqdn = os.environ.get("FQDN", "wheredoivote.co.uk")
+        base_url = f"https://{fqdn}"
         return {
             "name": f"""{self.pk}: "{desc}" """,
             "projects": [settings.ASANA_PROJECT_ID],
             "custom_fields": {
-                settings.ASANA_SITE_LINK_FIELD_ID: urljoin(
-                    "https://wheredoivote.co.uk", self.source_url
-                ),
+                settings.ASANA_SITE_LINK_FIELD_ID: urljoin(base_url, self.source_url),
                 settings.ASANA_REPORT_LINK_FIELD_ID: urljoin(
-                    "https://wheredoivote.co.uk",
+                    base_url,
                     reverse(
                         "admin:bug_reports_bugreport_change",
                         kwargs={"object_id": self.pk},

diff --git a/polling_stations/apps/feedback/models.py b/polling_stations/apps/feedback/models.py
@@ -1,3 +1,4 @@
+import os
 from urllib.parse import urljoin
 
 from django.conf import settings
@@ -25,15 +26,15 @@ class Feedback(TimeStampedModel):
 
     def as_asana_object(self):
         desc = truncatechars(self.comments, 30)
+        fqdn = os.environ.get("FQDN", "wheredoivote.co.uk")
+        base_url = f"https://{fqdn}"
         return {
             "name": f"""{self.pk}: "{desc}" """,
             "projects": [settings.ASANA_PROJECT_ID],
             "custom_fields": {
-                settings.ASANA_SITE_LINK_FIELD_ID: urljoin(
-                    "https://wheredoivote.co.uk", self.source_url
-                ),
+                settings.ASANA_SITE_LINK_FIELD_ID: urljoin(base_url, self.source_url),
                 settings.ASANA_REPORT_LINK_FIELD_ID: urljoin(
-                    "https://wheredoivote.co.uk",
+                    base_url,
                     reverse(
                         "admin:feedback_feedback_change",
                         kwargs={"object_id": self.pk},