Merge branch 'development' into portal-frontend-51

Pipfile

@@ -23,7 +23,7 @@ name = "pypi"
 # 5. Run `pipenv install --dev` in your terminal.
 
 [packages]
-codeforlife = {ref = "v0.18.7", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
+codeforlife = {ref = "v0.18.12", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
 # 🚫 Don't add [packages] below that are inherited from the CFL package.
 pyjwt = "==2.6.0" # TODO: upgrade to latest version
 # TODO: Needed by RR. Remove when RR has moved to new system.
@@ -32,9 +32,9 @@ django-sekizai = "==2.0.0"
 django-classy-tags = "==2.0.0"
 
 [dev-packages]
-codeforlife = {ref = "v0.18.7", git = "https://github.com/ocadotechnology/codeforlife-package-python.git", extras = ["dev"]}
+codeforlife = {ref = "v0.18.12", git = "https://github.com/ocadotechnology/codeforlife-package-python.git", extras = ["dev"]}
 # codeforlife = {file = "../codeforlife-package-python", editable = true, extras = ["dev"]}
 # 🚫 Don't add [dev-packages] below that are inherited from the CFL package.
 
 [requires]
-python_version = "3.8"
+python_version = "3.12"

settings.py

@@ -9,6 +9,7 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/3.2/ref/settings/
 """
+
 import os
 from pathlib import Path
 

src/api/serializers/auth_factor.py

@@ -49,8 +49,8 @@ def to_representation(self, instance):
             self.view.action == "create"
             and instance.type == AuthFactor.Type.OTP
         ):
-            representation[
-                "totp_provisioning_uri"
-            ] = self.request.auth_user.totp_provisioning_uri
+            representation["totp_provisioning_uri"] = (
+                self.request.auth_user.totp_provisioning_uri
+            )
 
         return representation

src/api/serializers/auth_factor_test.py

@@ -81,4 +81,5 @@ def test_to_representation(self):
                     user=self.multi_auth_factor_teacher_user
                 ),
             },
+            non_model_fields={"totp_provisioning_uri"},
         )

src/api/serializers/teacher.py

@@ -2,6 +2,7 @@
 © Ocado Group
 Created on 29/01/2024 at 10:13:58(+00:00).
 """
+
 import typing as t
 
 from codeforlife.types import DataDict

src/api/serializers/user.py

@@ -2,6 +2,7 @@
 © Ocado Group
 Created on 18/01/2024 at 15:14:32(+00:00).
 """
+
 import typing as t
 from datetime import date, timedelta
 
@@ -480,11 +481,11 @@ def to_representation(self, instance):
                 instance.new_student
                 and instance.new_student.pending_class_request
             ):
-                representation[
-                    "requesting_to_join_class"
-                ] = self.ClassSerializer(
-                    instance.new_student.pending_class_request
-                ).data
+                representation["requesting_to_join_class"] = (
+                    self.ClassSerializer(
+                        instance.new_student.pending_class_request
+                    ).data
+                )
         except Student.DoesNotExist:
             pass
 

src/api/serializers/user_test.py

@@ -2,6 +2,7 @@
 © Ocado Group
 Created on 31/01/2024 at 16:07:32(+00:00).
 """
+
 import typing as t
 from datetime import date
 from unittest.mock import Mock, patch

src/api/views/klass.py

@@ -2,6 +2,7 @@
 © Ocado Group
 Created on 23/01/2024 at 17:53:37(+00:00).
 """
+
 from codeforlife.permissions import OR, AllowNone
 from codeforlife.user.permissions import IsTeacher
 from codeforlife.user.views import ClassViewSet as _ClassViewSet

src/api/views/klass_test.py

@@ -2,6 +2,7 @@
 © Ocado Group
 Created on 05/02/2024 at 16:13:46(+00:00).
 """
+
 import typing as t
 from datetime import timedelta
 

src/api/views/school_teacher_invitation.py

@@ -2,6 +2,7 @@
 © Ocado Group
 Created on 09/02/2024 at 16:14:00(+00:00).
 """
+
 import typing as t
 
 from codeforlife.mail import send_mail

src/api/views/user.py

@@ -2,6 +2,7 @@
 © Ocado Group
 Created on 23/01/2024 at 17:53:44(+00:00).
 """
+
 import logging
 from datetime import timedelta
 
@@ -186,9 +187,11 @@ def verify_email_address(self, request: Request, **url_params: str):
         return Response(
             status=status.HTTP_303_SEE_OTHER,
             headers={
-                "Location": settings.PAGE_TEACHER_LOGIN
-                if user.teacher
-                else settings.PAGE_INDY_LOGIN
+                "Location": (
+                    settings.PAGE_TEACHER_LOGIN
+                    if user.teacher
+                    else settings.PAGE_INDY_LOGIN
+                )
             },
         )
 

src/api/views/user_test.py

@@ -2,6 +2,7 @@
 © Ocado Group
 Created on 20/01/2024 at 10:58:52(+00:00).
 """
+
 import typing as t
 from datetime import timedelta
 from unittest.mock import Mock, call, patch

src/sso/forms.py

@@ -3,7 +3,6 @@
 Created on 01/12/2023 at 16:00:24(+00:00).
 """
 
-
 from codeforlife.user.models import User
 from django import forms
 from django.contrib.auth import authenticate