Enhance admin queryset performance with select_related and annotations

Author: alexsierro

invoicing/admin.py

@@ -40,6 +40,9 @@ def queryset(self, request, queryset):
 class InvoiceAdmin(admin.ModelAdmin):
     change_list_template = "admin/invoice_change_list.html"
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related('member')
+
     def invoice_actions(self, obj):
         if obj.member is not None:
             color = 'orange'
@@ -212,6 +215,9 @@ class ResourceAdmin(admin.ModelAdmin):
 
     ordering = ['category', 'name']
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related('account', 'widget', 'category', 'unit')
+
 
 admin.site.register(Resource, ResourceAdmin)
 
@@ -237,6 +243,19 @@ def queryset(self, request, queryset):
 
 class UsageAdmin(admin.ModelAdmin):
 
+    def get_queryset(self, request):
+        queryset = super().get_queryset(request)
+        queryset = queryset.select_related(
+            'member',
+            'project',
+            'project__member',
+            'resource',
+            'resource__unit',
+            'invoice',
+            'invoice__member',
+        )
+        return queryset
+
     def export_as_csv(self, request, queryset):
 
         response = HttpResponse(content_type='text/csv')
@@ -285,6 +304,9 @@ def has_delete_permission(self, request, obj=None):
 class AccountEntryAdmin(admin.ModelAdmin):
     list_display = ['date', 'member', 'amount_machine', 'amount_cash', 'comment', 'invoice']
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related('member', 'invoice', 'invoice__member')
+
 
 class ExpenseAdmin(admin.ModelAdmin):
     list_display = ['member', 'date', 'amount', 'topaye', 'processed']

members/admin.py

@@ -1,9 +1,9 @@
 from django.contrib import admin
+from django.db.models import Count, Q
 from django.urls import reverse
 from django.utils.html import format_html
 
 from .models import Member, Project, ProjectCard
-from invoicing.models import Invoice
 from django.http import HttpResponse
 import csv
 
@@ -12,24 +12,41 @@ class ProjectAdmin(admin.ModelAdmin):
     list_display = ['name', 'member']
     search_fields = ['name', 'member__name', 'member__surname']
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related('member')
+
 
 admin.site.register(Project, ProjectAdmin)
 
 
 class ProjectCardAdmin(admin.ModelAdmin):
     list_display = ['project', 'rfid']
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related('project', 'project__member')
+
 
 admin.site.register(ProjectCard, ProjectCardAdmin)
 
 
 class MemberAdmin(admin.ModelAdmin):
     actions = ['export_as_mail_list', 'export_as_mail_csv']
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).annotate(
+            open_invoices_count=Count(
+                'invoice',
+                filter=~Q(invoice__status__in=('paid', 'cancelled'))
+            )
+        )
+
+    @staticmethod
+    def _get_mail_list(queryset):
+        return queryset.in_mail_list().values_list('mail', flat=True)
+
     def export_as_mail_list(self, request, queryset):
         response = HttpResponse()
-
-        mails = [member.mail for member in queryset if member.mail and member.is_in_mail_list]
+        mails = self._get_mail_list(queryset)
         response.write(';'.join(mails))
         return response
 
@@ -42,17 +59,15 @@ def export_as_mail_csv(self, request, queryset):
         )
 
         writer = csv.writer(response)
-
-        mails = [member.mail for member in queryset if member.mail and member.is_in_mail_list]
-        for mail in mails:
+        for mail in self._get_mail_list(queryset):
             writer.writerow([mail])
 
         return response
 
     export_as_mail_csv.short_description = "Export Email as CSV"
 
     def members_actions(self, obj):
-        open_invoices = Invoice.objects.filter(member=obj).exclude(status__in=('paid', 'cancelled')).count()
+        open_invoices = obj.open_invoices_count
         color = 'darkgreen'
         if open_invoices > 0:
             color = 'darkorange'
@@ -69,7 +84,6 @@ def formatted_name(self, member):
             return member.name
 
 
-
     list_display = ['members_actions', 'formatted_name', 'surname', 'rfid', 'is_staff', 'is_committee']
     list_display_links = ['formatted_name', 'surname']
     search_fields = ['name', 'surname', 'rfid', 'visa']

members/models.py

@@ -12,6 +12,25 @@ class ProjectCard(models.Model):
     def __str__(self):
         return f'{self.project} {self.rfid}'
 
+
+MAIL_LIST_EXCLUDED_STATUSES = ['resigned']
+MAIL_LIST_EXCLUDED_TYPES = ['no_member']
+
+
+class MemberQuerySet(models.QuerySet):
+    def in_mail_list(self):
+        return self.exclude(
+            subscription_status__in=MAIL_LIST_EXCLUDED_STATUSES,
+        ).exclude(
+            member_type__in=MAIL_LIST_EXCLUDED_TYPES,
+        ).filter(
+            date_resigned__isnull=True,
+            mail__isnull=False,
+        ).exclude(
+            mail='',
+        )
+
+
 class Member(models.Model):
     INSCRIPTION_STATE = [
         ('not member', 'not member'),
@@ -70,6 +89,8 @@ class Member(models.Model):
     swiss_engineering_number = models.CharField('Numéro de membre Swiss Engineering', max_length=200, default=None, null=True, blank=True)
     comment = models.TextField('Commentaire', max_length=2000, default=None, null=True, blank=True)
 
+    objects = MemberQuerySet.as_manager()
+
     @property
     def get_tariff(self):
         if self.subscription_status not in ['resigned']:
@@ -83,9 +104,10 @@ def get_tariff(self):
 
     @property
     def is_in_mail_list(self):
-        return self.subscription_status not in ['resigned'] \
-            and self.member_type not in['no_member'] \
-            and not self.is_resigned
+        return self.subscription_status not in MAIL_LIST_EXCLUDED_STATUSES \
+            and self.member_type not in MAIL_LIST_EXCLUDED_TYPES \
+            and not self.is_resigned \
+            and bool(self.mail)
 
     @property
     def is_resigned(self):