fix: requesting_to_join_class

ocadotechnology · Sep 2, 2024 · 7b7e421 · 7b7e421
1 parent 04013c0
commit 7b7e421
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/codeforlife/user/serializers/user.py b/codeforlife/user/serializers/user.py
@@ -71,6 +71,16 @@ def to_representation(self, instance):
         except Student.DoesNotExist:
             student = None
 
+        try:
+            requesting_to_join_class = (
+                instance.new_student.pending_class_request.access_code
+                if instance.new_student
+                and instance.new_student.pending_class_request
+                else None
+            )
+        except Student.DoesNotExist:
+            requesting_to_join_class = None
+
         try:
             teacher = (
                 TeacherSerializer[Teacher](instance.new_teacher).data
@@ -87,6 +97,7 @@ def to_representation(self, instance):
             "email": instance.email,
             "is_active": instance.is_active,
             "date_joined": instance.date_joined,
+            "requesting_to_join_class": requesting_to_join_class,
             "student": student,
             "teacher": teacher,
         }
diff --git a/codeforlife/user/serializers/user_test.py b/codeforlife/user/serializers/user_test.py
@@ -22,6 +22,7 @@ def test_to_representation__teacher(self):
         self.assert_to_representation(
             user,
             new_data={
+                "requesting_to_join_class": None,
                 "teacher": {
                     "id": user.teacher.id,
                     "school": user.teacher.school.id,
@@ -39,6 +40,7 @@ def test_to_representation__student(self):
         self.assert_to_representation(
             user,
             new_data={
+                "requesting_to_join_class": None,
                 "teacher": None,
                 "student": {
                     "id": user.student.id,
@@ -55,5 +57,9 @@ def test_to_representation__indy(self):
 
         self.assert_to_representation(
             user,
-            new_data={"teacher": None, "student": None},
+            new_data={
+                "requesting_to_join_class": None,
+                "teacher": None,
+                "student": None,
+            },
         )