feat: Deverify released students, send new verify email and update jo…

…in request error message

cfl_common/common/helpers/emails.py

@@ -1,6 +1,5 @@
 import datetime
 import json
-import re
 from enum import Enum, auto
 from uuid import uuid4
 
@@ -66,13 +65,14 @@ def send_email(
     django_send_email(sender, recipients, subject, text_content, title, replace_url, plaintext_template, html_template)
 
 
-def send_verification_email(request, user, data, new_email=None, age=None):
+def send_verification_email(request, user, data, new_email=None, age=None, school=None):
     """
     Sends emails relating to email address verification.
 
     On registration:
     - if the user is under 13, send a verification email addressed to the parent / guardian
     - if the user is over 13, send a regular verification email
+    - if the user is a student who just got released, send a verification email explaining the situation
     - if the user is a student who has requested to sign up to the newsletter, handle their Dotmailer subscription
 
     On email address update:
@@ -92,16 +92,25 @@ def send_verification_email(request, user, data, new_email=None, age=None):
     if not new_email:
         verification = generate_token(user)
 
-        # if the user is a teacher
         if age is None:
-            url = f"{request.build_absolute_uri(reverse('verify_email', kwargs={'token': verification}))}"
+            # if the user is a released student
+            if hasattr(user, "new_student"):
+                url = f"{request.build_absolute_uri(reverse('verify_email', kwargs={'token': verification}))}"
+
+                send_dotdigital_email(
+                    campaign_ids["verify_released_student"], [user.email],
+                    personalization_values={"VERIFICATION_LINK": url, "SCHOOL_NAME": school.name}
+                )
+            # if the user is a teacher
+            else:
+                url = f"{request.build_absolute_uri(reverse('verify_email', kwargs={'token': verification}))}"
 
-            send_dotdigital_email(
-                campaign_ids["verify_new_user"], [user.email], personalization_values={"VERIFICATION_LINK": url}
-            )
+                send_dotdigital_email(
+                    campaign_ids["verify_new_user"], [user.email], personalization_values={"VERIFICATION_LINK": url}
+                )
 
-            if _newsletter_ticked(data):
-                add_to_dotmailer(user.first_name, user.last_name, user.email, DotmailerUserType.TEACHER)
+                if _newsletter_ticked(data):
+                    add_to_dotmailer(user.first_name, user.last_name, user.email, DotmailerUserType.TEACHER)
         # if the user is an independent student
         else:
             if age < 13:

cfl_common/common/mail.py

@@ -26,6 +26,7 @@
     "verify_new_user_first_reminder": 1557170,
     "verify_new_user_second_reminder": 1557173,
     "verify_new_user_via_parent": 1551587,
+    "verify_released_student": 1580574,
 }
 
 

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

portal/tests/test_independent_student.py

@@ -471,7 +471,9 @@ def test_join_class_nonexistent_class(self):
         )
 
         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 @@ def test_join_class_not_accepting_requests(self):
         )
 
         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()