Attempt to cut down on queries

Author: Apexal

poetry.lock

@@ -1,10 +1,13 @@
 import csv
 import logging
 from time import sleep
+from typing import Any
 
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
+from django.db.models.query import QuerySet
 from django.http import HttpResponse
+from django.http.request import HttpRequest
 
 from portal.models import (
     Enrollment,
@@ -117,6 +120,10 @@ class MeetingAttendanceInline(admin.TabularInline):
     classes = ["collapse"]
     model = MeetingAttendance
     extra = 1
+    
+    # def get_queryset(self, request: HttpRequest) -> QuerySet[Any]:
+    #     print(super().get_queryset(request).explain())
+    #     return super().get_queryset(request).select_related()
 
 
 class MeetingAttendanceCodeInline(admin.TabularInline):
@@ -210,6 +217,7 @@ class SemesterAdmin(admin.ModelAdmin):
         ProjectPresentationInline,
         SmallGroupInline,
     )
+    list_select_related = True
 
 
 @admin.register(Organization)
@@ -219,6 +227,7 @@ class OrganizationAdmin(admin.ModelAdmin):
         ("Emails", {"fields": (("email_domain", "email_domain_secondary"),)}),
         ("Discord", {"classes": ("collapse",), "fields": ("discord_role_id",)}),
     )
+    list_select_related = True
 
 
 @admin.register(User)
@@ -270,6 +279,7 @@ class UserAdmin(UserAdmin):
     ordering = ("first_name",)
     inlines = (EnrollmentInline,)
     actions = (make_approved,)
+    list_select_related = True
 
 
 @admin.register(Project)
@@ -294,6 +304,7 @@ class ProjectAdmin(admin.ModelAdmin):
         make_approved,
         sync_discord,
     )
+    list_select_related = True
 
     fieldsets = (
         (
@@ -399,6 +410,7 @@ class EnrollmentAdmin(admin.ModelAdmin):
     )
 
     actions = [export_enrollments_to_csv]
+    list_select_related = True
 
 
 @admin.register(Meeting)
@@ -408,6 +420,7 @@ class MeetingAdmin(admin.ModelAdmin):
     list_filter = ("starts_at", "type", "is_published")
     inlines = (MeetingAttendanceCodeInline, MeetingAttendanceInline)
     actions = (make_published,)
+    list_select_related = True
 
     fieldsets = (
         (
@@ -439,6 +452,9 @@ class MeetingAdmin(admin.ModelAdmin):
         ),
     )
 
+    def get_queryset(self, request: HttpRequest) -> QuerySet[Any]:
+        return super().get_queryset(request).prefetch_related("attendances")
+
 
 @admin.register(SmallGroup)
 class SmallGroupAdmin(admin.ModelAdmin):
@@ -469,6 +485,7 @@ class SmallGroupAdmin(admin.ModelAdmin):
             },
         ),
     )
+    list_select_related = True
 
 
 # @admin.register(StatusUpdate)

portal/admin.py

@@ -0,0 +1,21 @@
+# Generated by Django 5.0.2 on 2024-02-21 22:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('portal', '0045_user_is_name_public'),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name='meetingattendance',
+            index=models.Index(fields=['meeting'], name='portal_meet_meeting_88d7ac_idx'),
+        ),
+        migrations.AddIndex(
+            model_name='meetingattendance',
+            index=models.Index(fields=['user'], name='portal_meet_user_id_40102c_idx'),
+        ),
+    ]

portal/migrations/0046_meetingattendance_portal_meet_meeting_88d7ac_idx_and_more.py

@@ -1352,19 +1352,29 @@ class Meta:
 # post_save.connect(sync_discord, sender=Meeting)
 # post_delete.connect(sync_discord_on_delete, sender=Meeting)
 
+class MeetingAttendanceManager(models.Manager):
+    def get_queryset(self) -> models.QuerySet:
+        return super().get_queryset().select_related("user")
 
 class MeetingAttendance(TimestampedModel):
     meeting = models.ForeignKey(Meeting, on_delete=models.CASCADE)
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     is_verified = models.BooleanField(default=True)
     submitted_by = models.ForeignKey(User, blank=True, null=True, on_delete=models.SET_NULL, help_text="The user that submitted the attendance for user (either them or an administrator).", related_name="submitted_attendances")
 
+
     class Meta:
         constraints = [
             models.UniqueConstraint(
                 fields=["meeting", "user"], name="unique_meeting_attendance"
             )
         ]
+        indexes = [
+            models.Index(fields=["meeting"]),
+            models.Index(fields=["user"]),
+        ]
+
+    objects = MeetingAttendanceManager()
 
 
 class MentorApplication(TimestampedModel):

portal/models.py

@@ -21,7 +21,7 @@ django-magiclink = "^1.2.0"
 django-anymail = "^10.0"
 django-crispy-forms = "^2.0"
 crispy-bulma = "^0.11.0"
-django-debug-toolbar = "^4.1.0"
+django-debug-toolbar = "^4.3.0"
 gql = "^3.4.1"
 requests-toolbelt = "^1.0.0"
 psycopg2-binary = "^2.9.6"