From df09ec0f380f855401581ff5cd448c0e5e95edef Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Wed, 31 Aug 2022 19:06:02 +0100
Subject: [PATCH] Ensure request is passed into the singleton URL cache

This removes needing extra queries
---
 website/common/templates/common/navbar.html |  2 +-
 website/common/templatetags/footer_tags.py  |  7 ++++---
 website/common/templatetags/navbar_tags.py  | 11 ++++++-----
 website/common/tests/test_pages.py          |  2 +-
 website/common/tests/test_views.py          |  2 +-
 website/home/models.py                      |  2 +-
 website/search/tests.py                     |  2 +-
 website/well_known/views.py                 |  2 +-
 8 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/website/common/templates/common/navbar.html b/website/common/templates/common/navbar.html
index 757a3bf..fb3e76b 100644
--- a/website/common/templates/common/navbar.html
+++ b/website/common/templates/common/navbar.html
@@ -2,7 +2,7 @@
 
 <nav class="navbar is-family-code" role="navigation" aria-label="main navigation">
   <div class="navbar-brand">
-    <a class="navbar-item home-link" href="{% pageurl homepage %}">
+    <a class="navbar-item home-link" href="{{ homepage_url }}">
       /home/theorangeone
     </a>
 
diff --git a/website/common/templatetags/footer_tags.py b/website/common/templatetags/footer_tags.py
index 822fdfb..8e4b478 100644
--- a/website/common/templatetags/footer_tags.py
+++ b/website/common/templatetags/footer_tags.py
@@ -6,8 +6,9 @@ from website.home.models import HomePage
 register = Library()
 
 
-@register.inclusion_tag("common/footer.html")
-def footer() -> dict:
+@register.inclusion_tag("common/footer.html", takes_context=True)
+def footer(context: dict) -> dict:
+    request = context["request"]
     return {
-        "homepage_url": SingletonPageCache.get_url(HomePage),
+        "homepage_url": SingletonPageCache.get_url(HomePage, request),
     }
diff --git a/website/common/templatetags/navbar_tags.py b/website/common/templatetags/navbar_tags.py
index ea09b32..cc6fc7f 100644
--- a/website/common/templatetags/navbar_tags.py
+++ b/website/common/templatetags/navbar_tags.py
@@ -7,15 +7,16 @@ from website.search.models import SearchPage
 register = Library()
 
 
-@register.inclusion_tag("common/navbar.html")
-def navbar() -> dict:
-    homepage = HomePage.objects.live().get()
+@register.inclusion_tag("common/navbar.html", takes_context=True)
+def navbar(context: dict) -> dict:
+    request = context["request"]
+    homepage = HomePage.objects.get()
     return {
-        "homepage": homepage,
+        "homepage_url": SingletonPageCache.get_url(HomePage, request),
         "nav_pages": homepage.get_children()
         .live()
         .public()
         .filter(show_in_menus=True)
         .order_by("title"),
-        "search_page_url": SingletonPageCache.get_url(SearchPage),
+        "search_page_url": SingletonPageCache.get_url(SearchPage, request),
     }
diff --git a/website/common/tests/test_pages.py b/website/common/tests/test_pages.py
index a5246e5..de1e9c0 100644
--- a/website/common/tests/test_pages.py
+++ b/website/common/tests/test_pages.py
@@ -52,7 +52,7 @@ class ListingPageTestCase(TestCase):
         ContentPageFactory(parent=cls.page)
 
     def test_accessible(self) -> None:
-        with self.assertNumQueries(33):
+        with self.assertNumQueries(32):
             response = self.client.get(self.page.url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.context["listing_pages"]), 2)
diff --git a/website/common/tests/test_views.py b/website/common/tests/test_views.py
index ca98711..7451237 100644
--- a/website/common/tests/test_views.py
+++ b/website/common/tests/test_views.py
@@ -16,7 +16,7 @@ class Error404PageTestCase(TestCase):
         )
 
     def test_queries(self) -> None:
-        with self.assertNumQueries(17):
+        with self.assertNumQueries(16):
             self.client.get(self.url)
 
 
diff --git a/website/home/models.py b/website/home/models.py
index 03a3370..95dfd35 100644
--- a/website/home/models.py
+++ b/website/home/models.py
@@ -49,5 +49,5 @@ class HomePage(BasePage, WagtailImageMetadataMixin):
             .order_by("-date")
             .first()
         )
-        context["search_page_url"] = SingletonPageCache.get_url(SearchPage)
+        context["search_page_url"] = SingletonPageCache.get_url(SearchPage, request)
         return context
diff --git a/website/search/tests.py b/website/search/tests.py
index 860c6ca..2bd554b 100644
--- a/website/search/tests.py
+++ b/website/search/tests.py
@@ -89,7 +89,7 @@ class SearchPageResultsTestCase(TestCase):
         )
 
     def test_too_high_page(self) -> None:
-        with self.assertNumQueries(48):
+        with self.assertNumQueries(46):
             response = self.client.get(
                 self.url, {"q": "post", "page": 3}, HTTP_HX_REQUEST="true"
             )
diff --git a/website/well_known/views.py b/website/well_known/views.py
index 6fc08b0..710b5dd 100644
--- a/website/well_known/views.py
+++ b/website/well_known/views.py
@@ -24,7 +24,7 @@ class SecurityView(TemplateView):
     def get_context_data(self, **kwargs: dict) -> dict:
         context = super().get_context_data(**kwargs)
         context["security_txt"] = self.request.build_absolute_uri(self.request.path)
-        contact_page_path = SingletonPageCache.get_url(ContactPage)
+        contact_page_path = SingletonPageCache.get_url(ContactPage, self.request)
         context["contact_page_url"] = (
             self.request.build_absolute_uri(contact_page_path)
             if contact_page_path