[Improvements] Migrate to Django 5

backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM pennlabs/django-base:a142aa6975ee293bbc8a09ef0b81998ce7063dd3
+FROM pennlabs/django-base:b269ea1613686b1ac6370154debbb741b012de1a-3.11
 
 LABEL maintainer="Penn Labs"
 

backend/Pipfile

@@ -20,7 +20,7 @@ dj-database-url = "*"
 djangorestframework = "*"
 psycopg2 = "*"
 sentry-sdk = "*"
-django = "==3.1.7"
+django = "~=5.0.3"
 django-cors-headers = "*"
 pyyaml = "*"
 uritemplate = "*"
@@ -36,7 +36,7 @@ celery = "*"
 redis = "*"
 django-auto-prefetching = "*"
 django-rest-live = ">=0.7.0"
-channels = "<3"
+channels = "==3.0.5"
 channels-redis = "*"
 uvicorn = {extras = ["standard"],version = "*"}
 gunicorn = "*"
@@ -45,4 +45,4 @@ typing-extensions = "*"
 drf-excel = "*"
 
 [requires]
-python_version = "3"
+python_version = "3.11"

backend/officehoursqueue/settings/base.py

@@ -31,9 +31,9 @@
 
 ALLOWED_HOSTS = ["*"]
 
+CSRF_TRUSTED_ORIGINS = ["http://127.0.0.1:3000", "https://ohq.io"]
 
 # Application definition
-
 INSTALLED_APPS = [
     "django.contrib.admin",
     "django.contrib.auth",

backend/ohq/routing.py

@@ -4,5 +4,5 @@
 
 
 websocket_urlpatterns = [
-    path("api/ws/subscribe/", realtime_router.as_consumer(), name="subscriptions"),
+    path("api/ws/subscribe/", realtime_router.as_consumer().as_asgi(), name="subscriptions"),
 ]

backend/ohq/statistics.py

@@ -1,5 +1,5 @@
 from django.contrib.auth import get_user_model
-from django.db.models import Avg, Case, Count, F, Sum, When
+from django.db.models import Avg, Case, Count, F, Sum, When, FloatField, ExpressionWrapper
 from django.db.models.functions import TruncDate
 from django.utils import timezone
 
@@ -217,10 +217,10 @@ def queue_calculate_questions_per_ta_heatmap(queue, weekday, hour):
             questions=Count("date", distinct=False),
             tas=Count("responded_to_by", distinct=True),
         )
-        .annotate(
-            q_per_ta=Case(When(tas=0, then=F("questions")), default=1.0 * F("questions") / F("tas"))
+       .annotate(
+            q_per_ta=Case(When(tas=0, then=ExpressionWrapper(F("questions"), output_field=FloatField())), default=1.0 * F("questions") / F("tas")),
         )
-        .aggregate(avg=Avg(F("q_per_ta")))
+        .aggregate(avg=Avg(F("q_per_ta"), output_field=FloatField()))
     )
 
     statistic = interval_stats["avg"]

backend/tests/ohq/test_commands.py

@@ -609,12 +609,14 @@ def test_questions_per_ta_computation(self):
             self.ta_1_questions_8_week_1 / self.num_tas_8
             + self.ta_1_questions_8_week_2 / self.num_tas_8
         ) / 2
+
         actual_8 = QueueStatistic.objects.get(
             queue=self.queue,
             metric=QueueStatistic.METRIC_HEATMAP_QUESTIONS_PER_TA,
             day=(yesterday_weekday + 1) % 7 + 1,
             hour=8,
         ).value
+
         self.assertEqual(expected_8, actual_8)
 
         expected_17 = (self.ta_1_questions_17 + self.ta_2_questions_17) / self.num_tas_17

backend/tests/ohq/test_live.py

@@ -8,11 +8,12 @@
 from django.urls import reverse
 from djangorestframework_camel_case.util import camelize
 from rest_framework.test import APIClient
-from rest_live.testing import APICommunicator, async_test, get_headers_for_user
+from rest_live.testing import async_test, get_headers_for_user
 
 from ohq.models import Announcement, Course, Membership, Question, Queue, Semester
 from ohq.serializers import AnnouncementSerializer
 from ohq.urls import realtime_router
+from channels.testing import WebsocketCommunicator
 
 
 User = get_user_model()
@@ -44,9 +45,7 @@ async def asyncSetUp(self):
         )
 
         headers = await get_headers_for_user(self.student2)
-        self.client = APICommunicator(
-            AuthMiddlewareStack(realtime_router.as_consumer()), "/api/ws/subscribe/", headers
-        )
+        self.client = WebsocketCommunicator(AuthMiddlewareStack(realtime_router.as_consumer().as_asgi()), "/ws/subscribe/", headers)
         connected, _ = await self.client.connect()
         self.assertTrue(connected)
 
@@ -120,9 +119,7 @@ async def asyncSetUp(self):
         )
 
         headers = await get_headers_for_user(self.student)
-        self.client = APICommunicator(
-            AuthMiddlewareStack(realtime_router.as_consumer()), "/api/ws/subscribe/", headers
-        )
+        self.client = WebsocketCommunicator(AuthMiddlewareStack(realtime_router.as_consumer().as_asgi()), "/ws/subscribe/", headers)
         connected, _ = await self.client.connect()
         self.assertTrue(connected)