codeforlife-portal 6.44.10__tar.gz → 6.45.0__tar.gz

{codeforlife-portal-6.44.10/codeforlife_portal.egg-info → codeforlife-portal-6.45.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 6.44.10
+Version: 6.45.0
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Framework :: Django

{codeforlife-portal-6.44.10 → codeforlife-portal-6.45.0/codeforlife_portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 6.44.10
+Version: 6.45.0
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Framework :: Django

{codeforlife-portal-6.44.10 → codeforlife-portal-6.45.0}/codeforlife_portal.egg-info/requires.txt

@@ -17,7 +17,7 @@ django-classy-tags==2.0.0
 libsass==0.23.0
 phonenumbers==8.12.12
 more-itertools==8.7.0
-cfl-common==6.44.10
+cfl-common==6.45.0
 django-ratelimit==3.0.1
 django-preventconcurrentlogins==0.8.2
 django-csp==3.7

codeforlife-portal-6.45.0/portal/__init__.py

@@ -0,0 +1 @@
+__version__ = "6.45.0"

{codeforlife-portal-6.44.10 → codeforlife-portal-6.45.0}/portal/forms/play.py

@@ -277,15 +277,19 @@ class StudentJoinOrganisationForm(forms.Form):
 
     def clean(self):
         access_code = self.cleaned_data.get("access_code", None)
+        join_error_text = "The class code you entered either does not exist or is not currently accepting join requests. Please double check that you have entered the correct class code and contact the teacher of the class to ensure their class is currently accepting join requests."
 
         if access_code:
             classes = Class.objects.filter(access_code=access_code)
             if len(classes) != 1:
-                raise forms.ValidationError("Cannot find the school or club and/or class")
+                raise forms.ValidationError(join_error_text)
+
             self.klass = classes[0]
-            if not self.klass.always_accept_requests:
-                if self.klass.accept_requests_until is None:
-                    raise forms.ValidationError("Cannot find the school or club and/or class")
-                elif (self.klass.accept_requests_until - timezone.now()) < timedelta():
-                    raise forms.ValidationError("Cannot find the school or club and/or class")
+
+            if not self.klass.always_accept_requests and (
+                self.klass.accept_requests_until is None
+                or self.klass.accept_requests_until - timezone.now()
+                < timedelta()
+            ):
+                raise forms.ValidationError(join_error_text)
         return self.cleaned_data

{codeforlife-portal-6.44.10 → codeforlife-portal-6.45.0}/portal/tests/test_independent_student.py

@@ -283,7 +283,7 @@ class TestIndependentStudentFrontend(BaseTest):
         page = page.go_to_independent_student_login_page()
         page = page.independent_student_login_failure(username, password)
 
-        errors = page.has_login_failed("independent_student_login_form", INVALID_LOGIN_MESSAGE)
+        page.has_login_failed("independent_student_login_form", INVALID_LOGIN_MESSAGE)
         assert page.has_login_failed("independent_student_login_form", INVALID_LOGIN_MESSAGE)
 
         verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
@@ -471,7 +471,9 @@ class TestIndependentStudentFrontend(BaseTest):
         )
 
         assert self.is_join_class_page(page)
-        assert page.has_join_request_failed("Cannot find the school or club and/or class")
+        assert page.has_join_request_failed(
+            "The class code you entered either does not exist or is not currently accepting join requests. Please double check that you have entered the correct class code and contact the teacher of the class to ensure their class is currently accepting join requests."
+        )
 
     def test_join_class_not_accepting_requests(self):
         teacher_email, _ = signup_teacher_directly()
@@ -490,7 +492,9 @@ class TestIndependentStudentFrontend(BaseTest):
         )
 
         assert self.is_join_class_page(page)
-        assert page.has_join_request_failed("Cannot find the school or club and/or class")
+        assert page.has_join_request_failed(
+            "The class code you entered either does not exist or is not currently accepting join requests. Please double check that you have entered the correct class code and contact the teacher of the class to ensure their class is currently accepting join requests."
+        )
 
     def test_join_class_revoked(self):
         teacher_email, _ = signup_teacher_directly()

{codeforlife-portal-6.44.10 → codeforlife-portal-6.45.0}/portal/tests/test_views.py

@@ -53,8 +53,11 @@ class TestTeacherViews(TestCase):
     @classmethod
     def setUpTestData(cls):
         cls.email, cls.password = signup_teacher_directly()
+        cls.school = create_organisation_directly(cls.email)
         _, _, cls.class_access_code = create_class_directly(cls.email)
-        _, _, cls.student = create_school_student_directly(cls.class_access_code)
+        _, cls.password_student, cls.student = create_school_student_directly(
+            cls.class_access_code
+        )
 
     def login(self):
         c = Client()
@@ -63,7 +66,9 @@ class TestTeacherViews(TestCase):
 
     def test_reminder_cards(self):
         c = self.login()
-        url = reverse("teacher_print_reminder_cards", args=[self.class_access_code])
+        url = reverse(
+            "teacher_print_reminder_cards", args=[self.class_access_code]
+        )
 
         # First test with 2 dummy students
         NAME1 = "Test name"
@@ -97,7 +102,9 @@ class TestTeacherViews(TestCase):
         # page number
         students_per_page = REMINDER_CARDS_PDF_ROWS * REMINDER_CARDS_PDF_COLUMNS
         for _ in range(len(studentlist), students_per_page + 1):
-            studentlist.append({"name": NAME1, "password": PASSWORD1, "login_url": URL})
+            studentlist.append(
+                {"name": NAME1, "password": PASSWORD1, "login_url": URL}
+            )
 
         assert len(studentlist) == students_per_page + 1
 
@@ -136,7 +143,9 @@ class TestTeacherViews(TestCase):
         reader = csv.reader(io.StringIO(content))
 
         access_code = self.class_access_code
-        class_url = reverse("student_login", kwargs={"access_code": access_code})
+        class_url = reverse(
+            "student_login", kwargs={"access_code": access_code}
+        )
         row0 = next(reader)
         assert row0[0].strip() == access_code
         assert class_url in row0[1].strip()
@@ -175,7 +184,9 @@ class TestTeacherViews(TestCase):
 
     def test_daily_activity_student_details(self):
         c = self.login()
-        url = reverse("teacher_print_reminder_cards", args=[self.class_access_code])
+        url = reverse(
+            "teacher_print_reminder_cards", args=[self.class_access_code]
+        )
 
         data = {
             "data": json.dumps(
@@ -221,6 +232,48 @@ class TestTeacherViews(TestCase):
         with pytest.raises(Exception):
             count_student_details_click("Wrong download method")
 
+    def test_release_verified_student(self):
+        c = Client()
+        student_login_url = reverse(
+            "student_login", args=[self.class_access_code]
+        )
+        response = c.post(
+            student_login_url,
+            {
+                "username": self.student.new_user.first_name,
+                "password": self.password_student,
+            },
+        )
+        assert response.status_code == 302
+
+        student = Student.objects.get(pk=self.student.pk)
+        assert student.user.is_verified
+
+        c.logout()
+        c.login(username=self.email, password=self.password)
+
+        release_url = reverse(
+            "teacher_dismiss_students", args=[self.class_access_code]
+        )
+        response = c.post(
+            release_url,
+            {
+                "form-TOTAL_FORMS": 1,
+                "form-INITIAL_FORMS": 1,
+                "form-MIN_NUM_FORMS": 0,
+                "form-MAX_NUM_FORMS": 1000,
+                "form-0-orig_name": self.student.new_user.first_name,
+                "form-0-name": self.student.new_user.first_name,
+                "form-0-email": "independent@gmail.com",
+                "form-0-confirm_email": "independent@gmail.com",
+                "submit_dismiss": "",
+            },
+        )
+        assert response.status_code == 302
+
+        student = Student.objects.get(pk=self.student.pk)
+        assert not student.user.is_verified
+
 
 class TestLoginViews(TestCase):
     @classmethod
@@ -238,7 +291,9 @@ class TestLoginViews(TestCase):
         teacher_email, teacher_password = signup_teacher_directly()
         create_organisation_directly(teacher_email)
         _, _, class_access_code = create_class_directly(teacher_email)
-        student_name, student_password, _ = create_school_student_directly(class_access_code)
+        student_name, student_password, _ = create_school_student_directly(
+            class_access_code
+        )
 
         return (
             teacher_email,
@@ -271,9 +326,16 @@ class TestLoginViews(TestCase):
         _, _, name, password, class_access_code = self._set_up_test_data()
 
         if next_url:
-            url = reverse("student_login", kwargs={"access_code": class_access_code}) + "?next=/"
+            url = (
+                reverse(
+                    "student_login", kwargs={"access_code": class_access_code}
+                )
+                + "?next=/"
+            )
         else:
-            url = reverse("student_login", kwargs={"access_code": class_access_code})
+            url = reverse(
+                "student_login", kwargs={"access_code": class_access_code}
+            )
 
         c = Client()
         response = c.post(url, {"username": name, "password": password})
@@ -312,7 +374,9 @@ class TestLoginViews(TestCase):
 
     def _get_user_class(self, name, class_access_code):
         klass = Class.objects.get(access_code=class_access_code)
-        students = Student.objects.filter(new_user__first_name__iexact=name, class_field=klass)
+        students = Student.objects.filter(
+            new_user__first_name__iexact=name, class_field=klass
+        )
         assert len(students) == 1
         user = students[0].new_user
         return user, klass
@@ -354,7 +418,9 @@ class TestLoginViews(TestCase):
         _, _, name, password, class_access_code = self._set_up_test_data()
 
         c = Client()
-        url = reverse("student_login", kwargs={"access_code": class_access_code})
+        url = reverse(
+            "student_login", kwargs={"access_code": class_access_code}
+        )
         c.post(url, {"username": name, "password": password})
 
         # check if there's a UserSession data within the last 10 secs
@@ -375,7 +441,9 @@ class TestLoginViews(TestCase):
         randomname = "randomname"
 
         c = Client()
-        url = reverse("student_login", kwargs={"access_code": class_access_code})
+        url = reverse(
+            "student_login", kwargs={"access_code": class_access_code}
+        )
         c.post(url, {"username": randomname, "password": "xx"})
 
         # check if there's a UserSession data within the last 10 secs
@@ -401,7 +469,9 @@ class TestLoginViews(TestCase):
 
     def test_student_direct_login(self):
         _, _, _, _, class_access_code = self._set_up_test_data()
-        student, login_id, _, _ = create_student_with_direct_login(class_access_code)
+        student, login_id, _, _ = create_student_with_direct_login(
+            class_access_code
+        )
 
         c = Client()
         assert c.login(user_id=student.new_user.id, login_id=login_id) == True
@@ -523,7 +593,9 @@ class TestViews(TestCase):
         c = Client()
 
         # Login and check initial data
-        url = reverse("student_login", kwargs={"access_code": class_access_code})
+        url = reverse(
+            "student_login", kwargs={"access_code": class_access_code}
+        )
         c.post(url, {"username": student_name, "password": student_password})
 
         student_dashboard_url = reverse("student_details")
@@ -602,7 +674,9 @@ class TestViews(TestCase):
 
         # try again with the correct password
         url = reverse("delete_account")
-        response = c.post(url, {"password": password, "unsubscribe_newsletter": "on"})
+        response = c.post(
+            url, {"password": password, "unsubscribe_newsletter": "on"}
+        )
 
         assert response.status_code == 302
         mock_send_dotdigital_email.assert_called_once()
@@ -684,7 +758,9 @@ class TestViews(TestCase):
 
         school_id = school.id
         school_name = school.name
-        teachers = Teacher.objects.filter(school=school).order_by("new_user__last_name", "new_user__first_name")
+        teachers = Teacher.objects.filter(school=school).order_by(
+            "new_user__last_name", "new_user__first_name"
+        )
         assert len(teachers) == 3
 
         # one of the remaining teachers should be admin (the second in our case, as it's alphabetical)
@@ -715,7 +791,9 @@ class TestViews(TestCase):
         self.assertEqual(mock_send_dotdigital_email.call_count, 2)
 
         # 2 teachers left
-        teachers = Teacher.objects.filter(school=school).order_by("new_user__last_name", "new_user__first_name")
+        teachers = Teacher.objects.filter(school=school).order_by(
+            "new_user__last_name", "new_user__first_name"
+        )
         assert len(teachers) == 2
 
         # teacher2 should still be admin, teacher4 is not passed admin role because there is teacher2
@@ -727,7 +805,9 @@ class TestViews(TestCase):
         # delete teacher4
         anonymise(user4)
 
-        teachers = Teacher.objects.filter(school=school).order_by("new_user__last_name", "new_user__first_name")
+        teachers = Teacher.objects.filter(school=school).order_by(
+            "new_user__last_name", "new_user__first_name"
+        )
         assert len(teachers) == 1
         u = User.objects.get(id=usrid2)
         assert u.new_teacher.is_admin
@@ -785,13 +865,17 @@ class TestViews(TestCase):
         c.logout()
 
     @patch("common.helpers.emails.send_dotdigital_email")
-    def test_registrations_increment_data(self, mock_send_dotdigital_email: Mock):
+    def test_registrations_increment_data(
+        self, mock_send_dotdigital_email: Mock
+    ):
         c = Client()
 
         total_activity = TotalActivity.objects.get(id=1)
         teacher_registration_count = total_activity.teacher_registrations
         student_registration_count = total_activity.student_registrations
-        independent_registration_count = total_activity.independent_registrations
+        independent_registration_count = (
+            total_activity.independent_registrations
+        )
 
         response = c.post(
             reverse("register"),
@@ -811,7 +895,10 @@ class TestViews(TestCase):
 
         total_activity = TotalActivity.objects.get(id=1)
 
-        assert total_activity.teacher_registrations == teacher_registration_count + 1
+        assert (
+            total_activity.teacher_registrations
+            == teacher_registration_count + 1
+        )
 
         response = c.post(
             reverse("register"),
@@ -833,7 +920,10 @@ class TestViews(TestCase):
 
         total_activity = TotalActivity.objects.get(id=1)
 
-        assert total_activity.independent_registrations == independent_registration_count + 1
+        assert (
+            total_activity.independent_registrations
+            == independent_registration_count + 1
+        )
 
         teacher_email, teacher_password = signup_teacher_directly()
         create_organisation_directly(teacher_email)
@@ -849,7 +939,10 @@ class TestViews(TestCase):
 
         total_activity = TotalActivity.objects.get(id=1)
 
-        assert total_activity.student_registrations == student_registration_count + 3
+        assert (
+            total_activity.student_registrations
+            == student_registration_count + 3
+        )
 
 
 # CRON view tests
@@ -868,8 +961,12 @@ class CronTestClient(APIClient):
         secure=False,
         **extra,
     ):
-        wsgi_response = super().generic(method, path, data, content_type, secure, **extra)
-        assert 200 <= wsgi_response.status_code < 300, f"Response has error status code: {wsgi_response.status_code}"
+        wsgi_response = super().generic(
+            method, path, data, content_type, secure, **extra
+        )
+        assert (
+            200 <= wsgi_response.status_code < 300
+        ), f"Response has error status code: {wsgi_response.status_code}"
 
         return wsgi_response
 
@@ -888,7 +985,9 @@ class TestUser(CronTestCase):
         indy_email, _, _ = create_independent_student_directly()
 
         self.teacher_user = User.objects.get(email=teacher_email)
-        self.teacher_user_profile = UserProfile.objects.get(user=self.teacher_user)
+        self.teacher_user_profile = UserProfile.objects.get(
+            user=self.teacher_user
+        )
 
         self.indy_user = User.objects.get(email=indy_email)
         self.indy_user_profile = UserProfile.objects.get(user=self.indy_user)
@@ -904,11 +1003,17 @@ class TestUser(CronTestCase):
         assert_called: bool,
         mock_send_dotdigital_email: Mock,
     ):
-        self.teacher_user.date_joined = timezone.now() - timedelta(days=days, hours=12)
+        self.teacher_user.date_joined = timezone.now() - timedelta(
+            days=days, hours=12
+        )
         self.teacher_user.save()
-        self.student_user.date_joined = timezone.now() - timedelta(days=days, hours=12)
+        self.student_user.date_joined = timezone.now() - timedelta(
+            days=days, hours=12
+        )
         self.student_user.save()
-        self.indy_user.date_joined = timezone.now() - timedelta(days=days, hours=12)
+        self.indy_user.date_joined = timezone.now() - timedelta(
+            days=days, hours=12
+        )
         self.indy_user.save()
 
         self.teacher_user_profile.is_verified = is_verified
@@ -919,9 +1024,13 @@ class TestUser(CronTestCase):
         self.client.get(reverse(view_name))
 
         if assert_called:
-            mock_send_dotdigital_email.assert_any_call(ANY, [self.teacher_user.email], personalization_values=ANY)
+            mock_send_dotdigital_email.assert_any_call(
+                ANY, [self.teacher_user.email], personalization_values=ANY
+            )
 
-            mock_send_dotdigital_email.assert_any_call(ANY, [self.indy_user.email], personalization_values=ANY)
+            mock_send_dotdigital_email.assert_any_call(
+                ANY, [self.indy_user.email], personalization_values=ANY
+            )
 
             # Check only two emails are sent - the student should never be included.
             assert mock_send_dotdigital_email.call_count == 2
@@ -931,22 +1040,40 @@ class TestUser(CronTestCase):
         mock_send_dotdigital_email.reset_mock()
 
     def test_first_verify_email_reminder_view(self):
-        self.send_verify_email_reminder(6, False, "first-verify-email-reminder", False)
-        self.send_verify_email_reminder(7, False, "first-verify-email-reminder", True)
-        self.send_verify_email_reminder(7, True, "first-verify-email-reminder", False)
-        self.send_verify_email_reminder(8, False, "first-verify-email-reminder", False)
+        self.send_verify_email_reminder(
+            6, False, "first-verify-email-reminder", False
+        )
+        self.send_verify_email_reminder(
+            7, False, "first-verify-email-reminder", True
+        )
+        self.send_verify_email_reminder(
+            7, True, "first-verify-email-reminder", False
+        )
+        self.send_verify_email_reminder(
+            8, False, "first-verify-email-reminder", False
+        )
 
     def test_second_verify_email_reminder_view(self):
-        self.send_verify_email_reminder(13, False, "second-verify-email-reminder", False)
-        self.send_verify_email_reminder(14, False, "second-verify-email-reminder", True)
-        self.send_verify_email_reminder(14, True, "second-verify-email-reminder", False)
-        self.send_verify_email_reminder(15, False, "second-verify-email-reminder", False)
+        self.send_verify_email_reminder(
+            13, False, "second-verify-email-reminder", False
+        )
+        self.send_verify_email_reminder(
+            14, False, "second-verify-email-reminder", True
+        )
+        self.send_verify_email_reminder(
+            14, True, "second-verify-email-reminder", False
+        )
+        self.send_verify_email_reminder(
+            15, False, "second-verify-email-reminder", False
+        )
 
     def test_anonymise_unverified_accounts_view(self):
         now = timezone.now()
 
         for user in [self.teacher_user, self.indy_user, self.student_user]:
-            user.date_joined = now - timedelta(days=USER_DELETE_UNVERIFIED_ACCOUNT_DAYS + 1)
+            user.date_joined = now - timedelta(
+                days=USER_DELETE_UNVERIFIED_ACCOUNT_DAYS + 1
+            )
             user.save()
 
         for user_profile in [self.teacher_user_profile, self.indy_user_profile]:
@@ -1011,7 +1138,9 @@ class TestUser(CronTestCase):
                 new_user=indy_user,
             )
 
-            activity_today = DailyActivity.objects.get_or_create(date=datetime.now().date())[0]
+            activity_today = DailyActivity.objects.get_or_create(
+                date=datetime.now().date()
+            )[0]
             daily_teacher_count = activity_today.anonymised_unverified_teachers
             daily_indy_count = activity_today.anonymised_unverified_independents
 
@@ -1034,16 +1163,30 @@ class TestUser(CronTestCase):
             assert indy_user_active == assert_active
             assert student_user_active
 
-            activity_today = DailyActivity.objects.get_or_create(date=datetime.now().date())[0]
+            activity_today = DailyActivity.objects.get_or_create(
+                date=datetime.now().date()
+            )[0]
             total_activity = TotalActivity.objects.get(id=1)
 
             if not teacher_user_active:
-                assert activity_today.anonymised_unverified_teachers == daily_teacher_count + 1
-                assert total_activity.anonymised_unverified_teachers == total_teacher_count + 1
+                assert (
+                    activity_today.anonymised_unverified_teachers
+                    == daily_teacher_count + 1
+                )
+                assert (
+                    total_activity.anonymised_unverified_teachers
+                    == total_teacher_count + 1
+                )
 
             if not indy_user_active:
-                assert activity_today.anonymised_unverified_independents == daily_indy_count + 1
-                assert total_activity.anonymised_unverified_independents == total_indy_count + 1
+                assert (
+                    activity_today.anonymised_unverified_independents
+                    == daily_indy_count + 1
+                )
+                assert (
+                    total_activity.anonymised_unverified_independents
+                    == total_indy_count + 1
+                )
 
             teacher_user.delete()
             indy_user.delete()

{codeforlife-portal-6.44.10 → codeforlife-portal-6.45.0}/portal/views/teacher/teach.py

@@ -552,15 +552,16 @@ def process_dismiss_student_form(request, formset, klass, access_code):
         student.new_user.first_name = data["name"]
         student.new_user.username = data["email"]
         student.new_user.email = data["email"]
+        student.user.is_verified = False
         student.save()
         student.new_user.save()
-        student.new_user.userprofile.save()
+        student.user.save()
 
         # log the data
         joinrelease = JoinReleaseStudent.objects.create(student=student, action_type=JoinReleaseStudent.RELEASE)
         joinrelease.save()
 
-        send_verification_email(request, student.new_user, data)
+        send_verification_email(request, student.new_user, data, school=klass.teacher.school)
 
     if not failed_users:
         messages.success(request, "The students have been released successfully from the class.")

codeforlife-portal-6.44.10/portal/__init__.py

@@ -1 +0,0 @@
-__version__ = "6.44.10"