Swift code (#146)

Author: srugano

src/hope_country_report/apps/hope/models/_inspect.py

@@ -1536,6 +1536,7 @@ class Financialinstitution(HopeModel):
     country = models.ForeignKey(
         Country, on_delete=models.DO_NOTHING, related_name="financialinstitution_country", blank=True, null=True
     )
+    swift_code = models.CharField(max_length=255, blank=True, null=True)
 
     class Meta:
         managed = False

src/hope_country_report/utils/mail.py

@@ -1,27 +1,35 @@
 from typing import TYPE_CHECKING
 
 from django.conf import settings
+from django.contrib.sites.models import Site
 from django.core.mail import EmailMessage
 
 from constance import config
-
-from hope_country_report.state import state
+from sentry_sdk import capture_exception
 
 if TYPE_CHECKING:
     from hope_country_report.apps.core.models import User
     from hope_country_report.apps.power_query.models import ReportConfiguration, ReportDocument
+    from hope_country_report.types.http import AuthHttpRequest
 
 
-def send_document_password(user: "User", document: "ReportDocument") -> int:
+def send_document_password(user: "User", document: "ReportDocument", request: "AuthHttpRequest | None" = None) -> int:
     if config.CATCH_ALL_EMAIL:
         recipient_list = [config.CATCH_ALL_EMAIL]
     else:
         recipient_list = [user.email]
     if not recipient_list:
         return 0
     url = document.get_absolute_url()
-    if state.request:
-        url = state.request.build_absolute_uri(url)
+    if request:
+        url = request.build_absolute_uri(url)
+    else:
+        try:
+            domain = Site.objects.get_current().domain
+            scheme = "https" if not settings.DEBUG else "http"
+            url = f"{scheme}://{domain}{url}"
+        except Exception as e:
+            capture_exception(e)
 
     message = EmailMessage(to=recipient_list, from_email=settings.DEFAULT_FROM_EMAIL)
 
@@ -46,10 +54,19 @@ def send_document_password(user: "User", document: "ReportDocument") -> int:
     return message.send()
 
 
-def send_request_access(sender: "User", report: "ReportConfiguration", message: str = "") -> int:
+def send_request_access(
+    sender: "User", report: "ReportConfiguration", message: str = "", request: "AuthHttpRequest | None" = None
+) -> int:
     url = report.get_absolute_url()
-    if state.request:
-        url = state.request.build_absolute_uri(url)
+    if request:
+        url = request.build_absolute_uri(url)
+    else:
+        try:
+            domain = Site.objects.get_current().domain
+            scheme = "https" if not settings.DEBUG else "http"
+            url = f"{scheme}://{domain}{url}"
+        except Exception as e:
+            capture_exception(e)
 
     if config.CATCH_ALL_EMAIL:
         recipient_list = [config.CATCH_ALL_EMAIL]
@@ -79,14 +96,21 @@ def send_request_access(sender: "User", report: "ReportConfiguration", message:
     return email.send()
 
 
-def notify_report_completion(report: "ReportConfiguration") -> int:
+def notify_report_completion(report: "ReportConfiguration", request: "AuthHttpRequest | None" = None) -> int:
     url = report.get_absolute_url()
-    if state.request:
-        url = state.request.build_absolute_uri(url)
-
     docs_url = report.get_documents_url()
-    if state.request:
-        docs_url = state.request.build_absolute_uri(docs_url)
+
+    if request:
+        url = request.build_absolute_uri(url)
+        docs_url = request.build_absolute_uri(docs_url)
+    else:
+        try:
+            domain = Site.objects.get_current().domain
+            scheme = "https" if not settings.DEBUG else "http"
+            url = f"{scheme}://{domain}{url}"
+            docs_url = f"{scheme}://{domain}{docs_url}"
+        except Exception as e:
+            capture_exception(e)
 
     if config.CATCH_ALL_EMAIL:
         recipient_list = [config.CATCH_ALL_EMAIL]

src/hope_country_report/web/views/document.py

@@ -132,7 +132,9 @@ def get_object(self, queryset: "QuerySet[AbstractBaseUser] | None" = None) -> "R
         return ReportConfiguration.objects.get(country_office=self.selected_office, pk=self.kwargs["id"])
 
     def form_valid(self, form: "_ModelFormT") -> "HttpResponse":
-        res = send_request_access(self.request.user, self.get_object(), message=form.cleaned_data["message"])
+        res = send_request_access(
+            self.request.user, self.get_object(), message=form.cleaned_data["message"], request=self.request
+        )
         if res == 1:
             messages.success(self.request, _("Request sent."))
         return super().form_valid(form)