From 872e1df7508846a561ce3ce8b3d916a274385677 Mon Sep 17 00:00:00 2001
From: imperosol <thgirod@hotmail.com>
Date: Sat, 13 Sep 2025 13:58:33 +0200
Subject: [PATCH] fix: N+1 queries on old club members view

---
 club/templates/club/club_old_members.jinja | 24 ++++++++++++----------
 club/views.py                              |  9 ++++++++
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/club/templates/club/club_old_members.jinja b/club/templates/club/club_old_members.jinja
index 887da079..75603f9e 100644
--- a/club/templates/club/club_old_members.jinja
+++ b/club/templates/club/club_old_members.jinja
@@ -5,20 +5,22 @@
   <h2>{% trans %}Club old members{% endtrans %}</h2>
   <table>
     <thead>
-      <td>{% trans %}User{% endtrans %}</td>
-      <td>{% trans %}Role{% endtrans %}</td>
-      <td>{% trans %}Description{% endtrans %}</td>
-      <td>{% trans %}From{% endtrans %}</td>
-      <td>{% trans %}To{% endtrans %}</td>
+      <tr>
+        <td>{% trans %}User{% endtrans %}</td>
+        <td>{% trans %}Role{% endtrans %}</td>
+        <td>{% trans %}Description{% endtrans %}</td>
+        <td>{% trans %}From{% endtrans %}</td>
+        <td>{% trans %}To{% endtrans %}</td>
+      </tr>
     </thead>
     <tbody>
-      {% for m in club.members.exclude(end_date=None).order_by('-role', 'description', '-end_date').all() %}
+      {% for member in old_members %}
         <tr>
-          <td>{{ user_profile_link(m.user) }}</td>
-          <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
-          <td>{{ m.description }}</td>
-          <td>{{ m.start_date }}</td>
-          <td>{{ m.end_date }}</td>
+          <td>{{ user_profile_link(member.user) }}</td>
+          <td>{{ settings.SITH_CLUB_ROLES[member.role] }}</td>
+          <td>{{ member.description }}</td>
+          <td>{{ member.start_date }}</td>
+          <td>{{ member.end_date }}</td>
         </tr>
       {% endfor %}
     </tbody>
diff --git a/club/views.py b/club/views.py
index fedc88ee..f8b68218 100644
--- a/club/views.py
+++ b/club/views.py
@@ -342,6 +342,15 @@ class ClubOldMembersView(ClubTabsMixin, PermissionRequiredMixin, DetailView):
     current_tab = "elderlies"
     permission_required = "club.view_club"
 
+    def get_context_data(self, **kwargs):
+        return super().get_context_data(**kwargs) | {
+            "old_members": (
+                self.object.members.exclude(end_date=None)
+                .order_by("-role", "description", "-end_date")
+                .select_related("user")
+            )
+        }
+
 
 class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailFormView):
     """Sellings of a club."""