Fix n+1 on judgment detail page

laws-africa · Sep 12, 2023 · 11902a1 · 11902a1
1 parent 13e05df
commit 11902a1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/peachjam/templates/peachjam/layouts/document_detail.html b/peachjam/templates/peachjam/layouts/document_detail.html
@@ -207,20 +207,18 @@ <h1>{{ document.title }}</h1>
                             </dd>
                           {% endif %}
                         {% endwith %}
-                        {% with document.bench.all as judges %}
-                          {% if judges %}
-                            <dt>
-                              {% trans 'Judges' %}
-                            </dt>
-                            <dd class="text-muted">
-                              {% for bench in judges %}
-                                {# djlint:off #}
-                                {{ bench.judge.name }}{% if not forloop.last %},{% endif %}
-                                {# djlint:on #}
-                              {% endfor %}
-                            </dd>
-                          {% endif %}
-                        {% endwith %}
+                        {% if judges %}
+                          <dt>
+                            {% trans 'Judges' %}
+                          </dt>
+                          <dd class="text-muted">
+                            {% for judge in judges %}
+                              {# djlint:off #}
+                              {{ judge }}{% if not forloop.last %},{% endif %}
+                              {# djlint:on #}
+                            {% endfor %}
+                          </dd>
+                        {% endif %}
                       {% endblock %}
                       {% block document-metadata-content-date %}
                         {% if document.doc_type == "judgment" %}

diff --git a/peachjam/views/judgment.py b/peachjam/views/judgment.py
@@ -23,3 +23,14 @@ def get_context_data(self, **kwargs):
 class JudgmentDetailView(BaseDocumentDetailView):
     model = Judgment
     template_name = "peachjam/judgment_detail.html"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context.update(
+            {
+                "judges": self.get_object()
+                .bench.prefetch_related("judge")
+                .values_list("judge__name", flat=True)
+            }
+        )
+        return context