added db indexes for upcoming events

Author: tonyqiu123

backend/apps/events/migrations/0017_alter_eventsubmission_submitted_by.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.7 on 2025-11-03 06:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("events", "0016_remove_events_events_dtstart_89a1ed_idx_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="eventsubmission",
+            name="submitted_by",
+            field=models.CharField(
+                help_text="Clerk user ID who submitted this event", max_length=255
+            ),
+        ),
+    ]

backend/apps/events/migrations/0018_remove_events_events_school_status_dtstart_utc_added_at_idx_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.7 on 2025-11-03 06:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("events", "0017_alter_eventsubmission_submitted_by"),
+    ]
+
+    operations = [
+        migrations.RemoveIndex(
+            model_name="events",
+            name="events_school_status_dtstart_utc_added_at_idx",
+        ),
+        migrations.AddIndex(
+            model_name="events",
+            index=models.Index(
+                fields=["school", "status", "dtstart_utc", "dtend_utc", "added_at"],
+                name="events_school_status_dtstart_utc_dtend_utc_added_at_idx",
+            ),
+        ),
+    ]

backend/apps/events/migrations/0019_remove_events_events_school_status_dtstart_utc_dtend_utc_added_at_idx_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.2.7 on 2025-11-03 06:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "events",
+            "0018_remove_events_events_school_status_dtstart_utc_added_at_idx_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.RemoveIndex(
+            model_name="events",
+            name="events_school_status_dtstart_utc_dtend_utc_added_at_idx",
+        ),
+        migrations.AddIndex(
+            model_name="events",
+            index=models.Index(
+                fields=["school", "status", "dtend_utc"],
+                name="events_school_status_dtend_idx",
+            ),
+        ),
+        migrations.AddIndex(
+            model_name="events",
+            index=models.Index(
+                condition=models.Q(("dtend_utc__isnull", True)),
+                fields=["school", "status", "dtstart_utc"],
+                name="events_school_status_dtstart_nullend_idx",
+            ),
+        ),
+    ]

backend/apps/events/models.py

@@ -131,8 +131,12 @@ class Events(models.Model):
     class Meta:
         db_table = "events"
         indexes = [
-            # Composite index for school, status, dtstart_utc (used for ordering), and added_at
-            models.Index(fields=["school", "status", "dtstart_utc", "added_at"], name="events_school_status_dtstart_utc_added_at_idx"),
+            models.Index(fields=["school", "status", "dtend_utc"], name="events_school_status_dtend_idx"),
+            models.Index(
+                fields=["school", "status", "dtstart_utc"],
+                condition=models.Q(dtend_utc__isnull=True),
+                name="events_school_status_dtstart_nullend_idx",
+            ),
         ]
 
     def __str__(self):

backend/apps/events/views.py

@@ -37,9 +37,13 @@ def get_events(request):
             school="University of Waterloo"
         )
 
-        # Apply default dtstart_utc filter only if not provided in request
+        # Apply default upcoming events filter only if not provided in request
         if not dtstart_utc_param:
-            queryset = queryset.filter(dtstart_utc__gte=timezone.now() - timedelta(hours=1))
+            now = timezone.now()
+            one_hour_ago = now - timedelta(hours=1)
+            queryset = queryset.filter(
+                Q(dtend_utc__gte=now) | (Q(dtend_utc__isnull=True) & Q(dtstart_utc__gte=one_hour_ago))
+            )
 
         queryset = queryset.order_by("dtstart_utc")