codeforlife-portal 6.42.0__py2.py3-none-any.whl → 6.43.1__py2.py3-none-any.whl

cfl_common/common/email_messages.py

@@ -29,30 +29,6 @@ def kickedEmail(request, schoolName):
     }
 
 
-def adminGivenEmail(request, schoolName):
-
-    url = request.build_absolute_uri(reverse("dashboard"))
-
-    return {
-        "subject": f"You have been made a school or club administrator",
-        "message": (
-            f"Administrator control of the school or club '{schoolName}' has been "
-            f"given to you. Go to {url} to start managing your school or club."
-        ),
-    }
-
-
-def adminRevokedEmail(request, schoolName):
-    return {
-        "subject": f"You are no longer a school or club administrator",
-        "message": (
-            f"Your administrator control of the school or club '{schoolName}' has been "
-            f"revoked. If you think this is an error, please contact one of the other "
-            f"administrators in your school or club."
-        ),
-    }
-
-
 def studentJoinRequestSentEmail(request, schoolName, accessCode):
     return {
         "subject": f"School or club join request sent",

cfl_common/common/helpers/emails.py

@@ -6,14 +6,11 @@ from uuid import uuid4
 
 import jwt
 from common import app_settings
-from common.app_settings import domain
-from common.mail import campaign_ids, send_dotdigital_email
+from common.mail import campaign_ids, django_send_email, send_dotdigital_email
 from common.models import Student, Teacher
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.mail import EmailMultiAlternatives
 from django.http import HttpResponse
-from django.template import loader
 from django.urls import reverse
 from django.utils import timezone
 from requests import delete, get, post, put
@@ -31,41 +28,6 @@ class DotmailerUserType(Enum):
     NO_ACCOUNT = auto()
 
 
-def send_email(
-    sender,
-    recipients,
-    subject,
-    text_content,
-    title,
-    replace_url=None,
-    plaintext_template="email.txt",
-    html_template="email.html",
-):
-    # add in template for templates to message
-
-    # setup templates
-    plaintext = loader.get_template(plaintext_template)
-    html = loader.get_template(html_template)
-    plaintext_email_context = {"content": text_content}
-    html_email_context = {"content": text_content, "title": title, "url_prefix": domain()}
-
-    # render templates
-    plaintext_body = plaintext.render(plaintext_email_context)
-    original_html_body = html.render(html_email_context)
-    html_body = original_html_body
-
-    if replace_url:
-        verify_url = replace_url["verify_url"]
-        verify_replace_url = re.sub(f"(.*/verify_email/)(.*)", f"\\1", verify_url)
-        html_body = re.sub(f"({verify_url})(.*){verify_url}", f"\\1\\2{verify_replace_url}", original_html_body)
-
-    # make message using templates
-    message = EmailMultiAlternatives(subject, plaintext_body, sender, recipients)
-    message.attach_alternative(html_body, "text/html")
-
-    message.send()
-
-
 def generate_token(user, new_email="", preverified=False):
     if preverified:
         user.userprofile.is_verified = preverified
@@ -91,6 +53,19 @@ def _newsletter_ticked(data):
     return "newsletter_ticked" in data and data["newsletter_ticked"]
 
 
+def send_email(
+    sender,
+    recipients,
+    subject,
+    text_content,
+    title,
+    replace_url=None,
+    plaintext_template="email.txt",
+    html_template="email.html",
+):
+    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):
     """
     Sends emails relating to email address verification.

cfl_common/common/mail.py

@@ -3,8 +3,13 @@ from dataclasses import dataclass
 
 import requests
 from common import app_settings
+from common.app_settings import MODULE_NAME, domain
+from django.core.mail import EmailMultiAlternatives
+from django.template import loader
 
 campaign_ids = {
+    "admin_given": 1569057,
+    "admin_revoked": 1569071,
     "email_change_notification": 1551600,
     "email_change_verification": 1551594,
     "reset_password": 1557153,
@@ -34,6 +39,41 @@ class EmailAttachment:
     content: str
 
 
+def django_send_email(
+    sender,
+    recipients,
+    subject,
+    text_content,
+    title,
+    replace_url=None,
+    plaintext_template="email.txt",
+    html_template="email.html",
+):
+    # add in template for templates to message
+
+    # setup templates
+    plaintext = loader.get_template(plaintext_template)
+    html = loader.get_template(html_template)
+    plaintext_email_context = {"content": text_content}
+    html_email_context = {"content": text_content, "title": title, "url_prefix": domain()}
+
+    # render templates
+    plaintext_body = plaintext.render(plaintext_email_context)
+    original_html_body = html.render(html_email_context)
+    html_body = original_html_body
+
+    if replace_url:
+        verify_url = replace_url["verify_url"]
+        verify_replace_url = re.sub(f"(.*/verify_email/)(.*)", f"\\1", verify_url)
+        html_body = re.sub(f"({verify_url})(.*){verify_url}", f"\\1\\2{verify_replace_url}", original_html_body)
+
+    # make message using templates
+    message = EmailMultiAlternatives(subject, plaintext_body, sender, recipients)
+    message.attach_alternative(html_body, "text/html")
+
+    message.send()
+
+
 # pylint: disable-next=too-many-arguments
 def send_dotdigital_email(
     campaign_id: int,
@@ -71,47 +111,51 @@ def send_dotdigital_email(
     """
     # pylint: enable=line-too-long
 
-    if auth is None:
-        auth = app_settings.DOTDIGITAL_AUTH
-
-    body = {
-        "campaignId": campaign_id,
-        "toAddresses": to_addresses,
-    }
-    if cc_addresses is not None:
-        body["ccAddresses"] = cc_addresses
-    if bcc_addresses is not None:
-        body["bccAddresses"] = bcc_addresses
-    if from_address is not None:
-        body["fromAddress"] = from_address
-    if personalization_values is not None:
-        body["personalizationValues"] = [
-            {
-                "name": key,
-                "value": value,
-            }
-            for key, value in personalization_values.items()
-        ]
-    if metadata is not None:
-        body["metadata"] = metadata
-    if attachments is not None:
-        body["attachments"] = [
-            {
-                "fileName": attachment.file_name,
-                "mimeType": attachment.mime_type,
-                "content": attachment.content,
-            }
-            for attachment in attachments
-        ]
-
-    response = requests.post(
-        url=f"https://{region}-api.dotdigital.com/v2/email/triggered-campaign",
-        json=body,
-        headers={
-            "accept": "text/plain",
-            "authorization": auth,
-        },
-        timeout=timeout,
-    )
-
-    assert response.ok, "Failed to send email." f" Reason: {response.reason}." f" Text: {response.text}."
+    # Dotdigital emails don't work locally, so if testing emails locally use Django to send a dummy email instead
+    if MODULE_NAME == "local":
+        django_send_email(from_address, to_addresses, "dummy_subject", "dummy_text_content", "dummy_title")
+    else:
+        if auth is None:
+            auth = app_settings.DOTDIGITAL_AUTH
+
+        body = {
+            "campaignId": campaign_id,
+            "toAddresses": to_addresses,
+        }
+        if cc_addresses is not None:
+            body["ccAddresses"] = cc_addresses
+        if bcc_addresses is not None:
+            body["bccAddresses"] = bcc_addresses
+        if from_address is not None:
+            body["fromAddress"] = from_address
+        if personalization_values is not None:
+            body["personalizationValues"] = [
+                {
+                    "name": key,
+                    "value": value,
+                }
+                for key, value in personalization_values.items()
+            ]
+        if metadata is not None:
+            body["metadata"] = metadata
+        if attachments is not None:
+            body["attachments"] = [
+                {
+                    "fileName": attachment.file_name,
+                    "mimeType": attachment.mime_type,
+                    "content": attachment.content,
+                }
+                for attachment in attachments
+            ]
+
+        response = requests.post(
+            url=f"https://{region}-api.dotdigital.com/v2/email/triggered-campaign",
+            json=body,
+            headers={
+                "accept": "text/plain",
+                "authorization": auth,
+            },
+            timeout=timeout,
+        )
+
+        assert response.ok, "Failed to send email." f" Reason: {response.reason}." f" Text: {response.text}."

cfl_common/common/migrations/0049_anonymise_orphan_users.py

@@ -0,0 +1,29 @@
+from django.apps.registry import Apps
+from django.db import migrations
+
+from portal.views.api import __anonymise_user
+
+
+def anonymise_orphan_users(apps: Apps, *args):
+    """
+    Users should never exist without a user-type linked to them. Anonymise all
+    instances of User objects without a Teacher or Student instance.
+    """
+    User = apps.get_model("auth", "User")
+
+    active_orphan_users = User.objects.filter(
+        new_teacher__isnull=True, new_student__isnull=True, is_active=True
+    )
+
+    for active_orphan_user in active_orphan_users:
+        __anonymise_user(active_orphan_user)
+
+
+class Migration(migrations.Migration):
+    dependencies = [("common", "0048_unique_school_names")]
+
+    operations = [
+        migrations.RunPython(
+            code=anonymise_orphan_users, reverse_code=migrations.RunPython.noop
+        ),
+    ]

cfl_common/common/migrations/0050_anonymise_orphan_schools.py

@@ -0,0 +1,30 @@
+from uuid import uuid4
+
+from django.apps.registry import Apps
+from django.db import migrations
+
+
+def anonymise_orphan_schools(apps: Apps, *args):
+    """
+    Schools without any teachers or students should be anonymised (inactive).
+    Mark all active orphan schools as inactive.
+    """
+    School = apps.get_model("common", "School")
+
+    active_orphan_schools = School.objects.filter(teacher_school__isnull=True)
+
+    for active_orphan_school in active_orphan_schools:
+        active_orphan_school.name = uuid4().hex
+        active_orphan_school.is_active = False
+        active_orphan_school.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [("common", "0049_anonymise_orphan_users")]
+
+    operations = [
+        migrations.RunPython(
+            code=anonymise_orphan_schools,
+            reverse_code=migrations.RunPython.noop,
+        ),
+    ]

cfl_common/common/migrations/0051_verify_returning_users.py

@@ -0,0 +1,30 @@
+from django.apps.registry import Apps
+from django.db import migrations
+
+
+def verify_returning_users(apps: Apps, *args):
+    """
+    Users cannot be unverified after having logged in at least once. Grab all
+    instances of unverified UserProfile where the User has logged in and mark it
+    as verified.
+    """
+    UserProfile = apps.get_model("common", "UserProfile")
+
+    unverified_returning_userprofiles = UserProfile.objects.filter(
+        user__last_login__isnull=False, is_verified=False
+    )
+
+    for unverified_returning_userprofile in unverified_returning_userprofiles:
+        unverified_returning_userprofile.is_verified = True
+        unverified_returning_userprofile.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [("common", "0050_anonymise_orphan_schools")]
+
+    operations = [
+        migrations.RunPython(
+            code=verify_returning_users,
+            reverse_code=migrations.RunPython.noop,
+        ),
+    ]

cfl_common/common/models.py

@@ -2,7 +2,6 @@ import re
 from datetime import timedelta
 from uuid import uuid4
 
-import pgeocode
 from django.contrib.auth.models import User
 from django.db import models
 from django.utils import timezone

cfl_common/common/tests/test_migration_anonymise_orphan_schools.py

@@ -0,0 +1,30 @@
+import pytest
+from django_test_migrations.migrator import Migrator
+
+
+@pytest.mark.django_db
+def test_migration_anonymise_orphan_schools(migrator: Migrator):
+    state = migrator.apply_initial_migration(
+        ("common", "0049_anonymise_orphan_users")
+    )
+    User = state.apps.get_model("auth", "User")
+    UserProfile = state.apps.get_model("common", "UserProfile")
+    Teacher = state.apps.get_model("common", "Teacher")
+    School = state.apps.get_model("common", "School")
+
+    orphan_school = School.objects.create(name="OrphanSchool")
+    teacher_school = School.objects.create(name="TeacherSchool")
+
+    teacher_user = User.objects.create_user("TeacherUser", password="password")
+    teacher_userprofile = UserProfile.objects.create(user=teacher_user)
+    Teacher.objects.create(
+        user=teacher_userprofile, new_user=teacher_user, school=teacher_school
+    )
+
+    migrator.apply_tested_migration(("common", "0050_anonymise_orphan_schools"))
+
+    def assert_school_anonymised(pk: int, anonymised: bool):
+        assert School.objects.get(pk=pk).is_active != anonymised
+
+    assert_school_anonymised(orphan_school.pk, True)
+    assert_school_anonymised(teacher_school.pk, False)

cfl_common/common/tests/test_migration_anonymise_orphan_users.py

@@ -0,0 +1,30 @@
+import pytest
+from django_test_migrations.migrator import Migrator
+
+
+@pytest.mark.django_db
+def test_migration_anonymise_orphan_users(migrator: Migrator):
+    state = migrator.apply_initial_migration(
+        ("common", "0048_unique_school_names")
+    )
+    User = state.apps.get_model("auth", "User")
+    UserProfile = state.apps.get_model("common", "UserProfile")
+    Teacher = state.apps.get_model("common", "Teacher")
+    Student = state.apps.get_model("common", "Student")
+
+    orphan_user = User.objects.create_user("OrphanUser", password="password")
+    teacher_user = User.objects.create_user("TeacherUser", password="password")
+    student_user = User.objects.create_user("StudentUser", password="password")
+    teacher_userprofile = UserProfile.objects.create(user=teacher_user)
+    student_userprofile = UserProfile.objects.create(user=student_user)
+    Teacher.objects.create(user=teacher_userprofile, new_user=teacher_user)
+    Student.objects.create(user=student_userprofile, new_user=student_user)
+
+    migrator.apply_tested_migration(("common", "0049_anonymise_orphan_users"))
+
+    def assert_user_anonymised(pk: int, anonymised: bool):
+        assert User.objects.get(pk=pk).is_active != anonymised
+
+    assert_user_anonymised(orphan_user.pk, True)
+    assert_user_anonymised(teacher_user.pk, False)
+    assert_user_anonymised(student_user.pk, False)

cfl_common/common/tests/{test_0048_unique_school_names.py → test_migration_unique_school_names.py}

@@ -3,8 +3,10 @@ from django_test_migrations.migrator import Migrator
 
 
 @pytest.mark.django_db
-def test_0048_unique_school_names(migrator: Migrator):
-    state = migrator.apply_initial_migration(("common", "0047_delete_school_postcode"))
+def test_migration_unique_school_names(migrator: Migrator):
+    state = migrator.apply_initial_migration(
+        ("common", "0047_delete_school_postcode")
+    )
     School = state.apps.get_model("common", "School")
 
     school_name = "ExampleSchool"
@@ -15,7 +17,9 @@ def test_0048_unique_school_names(migrator: Migrator):
             School(name=f"{school_name} 1"),
         ]
     )
-    school_ids = list(School.objects.order_by("-id")[:3].values_list("id", flat=True))
+    school_ids = list(
+        School.objects.order_by("-id")[:3].values_list("id", flat=True)
+    )
     school_ids.reverse()
 
     migrator.apply_tested_migration(("common", "0048_unique_school_names"))

cfl_common/common/tests/test_migration_verify_returning_users.py

@@ -0,0 +1,59 @@
+from datetime import datetime, timezone
+
+import pytest
+from django_test_migrations.migrator import Migrator
+
+from portal.views.api import __anonymise_user
+
+
+@pytest.mark.django_db
+def test_migration_verify_returning_users(migrator: Migrator):
+    state = migrator.apply_initial_migration(
+        ("common", "0050_anonymise_orphan_schools")
+    )
+    User = state.apps.get_model("auth", "User")
+    UserProfile = state.apps.get_model("common", "UserProfile")
+
+    returning_user = User.objects.create_user(
+        "ReturningUser",
+        password="password",
+        last_login=datetime.now(tz=timezone.utc),
+    )
+    returning_userprofile = UserProfile.objects.create(user=returning_user)
+
+    non_returning_user = User.objects.create_user(
+        "NonReturningUser", password="password"
+    )
+    non_returning_userprofile = UserProfile.objects.create(
+        user=non_returning_user
+    )
+
+    anonymised_returning_user = User.objects.create_user(
+        "AnonReturningUser",
+        password="password",
+        last_login=datetime.now(tz=timezone.utc),
+    )
+    anonymised_returning_userprofile = UserProfile.objects.create(
+        user=anonymised_returning_user
+    )
+    __anonymise_user(anonymised_returning_user)
+
+    anonymised_non_returning_user = User.objects.create_user(
+        "AnonNonReturningUser", password="password"
+    )
+    anonymised_non_returning_userprofile = UserProfile.objects.create(
+        user=anonymised_non_returning_user
+    )
+    __anonymise_user(anonymised_non_returning_user)
+
+    migrator.apply_tested_migration(("common", "0051_verify_returning_users"))
+
+    def assert_userprofile_is_verified(pk: int, verified: bool):
+        assert UserProfile.objects.get(pk=pk).is_verified == verified
+
+    assert_userprofile_is_verified(returning_userprofile.pk, True)
+    assert_userprofile_is_verified(non_returning_userprofile.pk, False)
+    assert_userprofile_is_verified(anonymised_returning_userprofile.pk, True)
+    assert_userprofile_is_verified(
+        anonymised_non_returning_userprofile.pk, False
+    )

{codeforlife_portal-6.42.0.dist-info → codeforlife_portal-6.43.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 6.42.0
+Version: 6.43.1
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Framework :: Django
@@ -24,7 +24,7 @@ Requires-Dist: django-classy-tags ==2.0.0
 Requires-Dist: libsass ==0.23.0
 Requires-Dist: phonenumbers ==8.12.12
 Requires-Dist: more-itertools ==8.7.0
-Requires-Dist: cfl-common ==6.42.0
+Requires-Dist: cfl-common ==6.43.1
 Requires-Dist: django-ratelimit ==3.0.1
 Requires-Dist: django-preventconcurrentlogins ==0.8.2
 Requires-Dist: django-csp ==3.7

{codeforlife_portal-6.42.0.dist-info → codeforlife_portal-6.43.1.dist-info}/RECORD

@@ -5,14 +5,14 @@ cfl_common/common/app_settings.py,sha256=x2ROLY5Xl5LgqjxyTiChZvQorZYUXpFzEkaLsjh
 cfl_common/common/apps.py,sha256=49UXZ3bSkFKvIEOL4zM7y1sAhccQJyRtsoOg5XVd_8Y,129
 cfl_common/common/context_processors.py,sha256=X0iuX5qu9kMWa7q8osE9CJ2LgM7pPOYQFGdjm8X3rk0,236
 cfl_common/common/csp_config.py,sha256=sZT6s9zMT5FFIqNODsURT0ifxbDgXpDlki8UxaBq2iE,2940
-cfl_common/common/email_messages.py,sha256=DRiz6MCKUGdFsC-pN9EwFqzPhpzMWXaT9HPcji1BkvE,4437
-cfl_common/common/mail.py,sha256=5iwvedYfaJUv7v8vVpV1kyBtnw04EJhHPy3FRGI9WHM,4223
-cfl_common/common/models.py,sha256=vnvy8U-sHopyaxgJK9wTxelbKsCnYMjuEu3HIuAEkrs,14974
+cfl_common/common/email_messages.py,sha256=oK8cb5wrDbxq6xoEoILHJggs3P35aEyk9eFJHIR6y74,3644
+cfl_common/common/mail.py,sha256=qgsgBc0drFIG8ik4ZBjaqjSvk0LVDIJV2fNYWFrbzHU,5990
+cfl_common/common/models.py,sha256=EunFsc7sOWfWiFf4IQwuy56gu8pu3YpPoOgVtsMhbRM,14958
 cfl_common/common/permissions.py,sha256=gC6RQGZI2QDBbglx-xr_V4Hl2C2nf1V2_uPmEuoEcJo,2416
 cfl_common/common/utils.py,sha256=Nn2Npao9Uqad5Js_IdHwF-ow6wrPNpBLW4AO1LxoEBc,1727
 cfl_common/common/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cfl_common/common/helpers/data_migration_loader.py,sha256=_BhS5lPmhcuVUbryBmJytlWdHyT02KYyxPkHar32mOE,1748
-cfl_common/common/helpers/emails.py,sha256=u2X2brjHIlUDNIgQ6-Ld23Y4zyouJGTFH-G7HNQDBYs,11041
+cfl_common/common/helpers/emails.py,sha256=6xY8YxYY3ywcFWguys2G_36HTaBBah4ma1p20s4mpKU,10099
 cfl_common/common/helpers/generators.py,sha256=kTL5e91I8wgmjJ-mu4jr9vIacjccUZ5pZSAz5cUNhdM,1505
 cfl_common/common/helpers/organisation.py,sha256=e-JKumKoXrkMTzZPv0H4ViWL8vtCt7oXJjn_zZ1ec00,427
 cfl_common/common/migrations/0001_initial.py,sha256=Y2kt2xmdCbrmDXCgqmhXeacicNg26Zj7L7SANSsgAAI,9664
@@ -63,12 +63,18 @@ cfl_common/common/migrations/0045_otp.py,sha256=_GmCOFOINqFMBqPBvdBaR1nwAI_FkzIl
 cfl_common/common/migrations/0046_alter_school_country.py,sha256=dg_lexw7ALB-jlOm_EBQauk9mI4VbqUGv0qQsHo0b5s,437
 cfl_common/common/migrations/0047_delete_school_postcode.py,sha256=GPV0hLfXmbPpx4-G5OaaLy6aalKvSnZLH0aGggYx9u0,331
 cfl_common/common/migrations/0048_unique_school_names.py,sha256=pu5xiuesvFNGngD-hl0OQ6Gi2r6pEY9fPCayKyb9n04,1433
+cfl_common/common/migrations/0049_anonymise_orphan_users.py,sha256=tw9xMrDMRPDCO8HWjBVlnQF8r1YVCKZnVr2wZ3He6og,847
+cfl_common/common/migrations/0050_anonymise_orphan_schools.py,sha256=_KCkSkoObTpLplX6gXvlV3JXpddn7neyJEa8YKFWeW0,869
+cfl_common/common/migrations/0051_verify_returning_users.py,sha256=GVdMtOFIJQveYvKlK5EW-1tA_T-mEP_L_HfHarsaPvY,957
 cfl_common/common/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cfl_common/common/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cfl_common/common/tests/test_0048_unique_school_names.py,sha256=4WAGJoqCK1VYQrh8v4jVh7JTm8Gs_iZzmcDu1vYQcRc,999
 cfl_common/common/tests/test_migration_aimmo_characters.py,sha256=pdCCsns90Qz05QqmaBUYK18jKe9aP-symtZjkKG4rag,1079
+cfl_common/common/tests/test_migration_anonymise_orphan_schools.py,sha256=wJRyPgRvBsXLSCFdbBi2GXjgSgDbKUTRiM31CXIvpqs,1194
+cfl_common/common/tests/test_migration_anonymise_orphan_users.py,sha256=MGuI8YVvUReXxjK36i2n-vkC677I8HqVHph778zL34Q,1368
 cfl_common/common/tests/test_migration_blocked_time.py,sha256=z9WxMTrZTKFieLfbQwkoOZozziPHmWVk6T4FysLeHGk,590
 cfl_common/common/tests/test_migration_remove_teacher_title.py,sha256=wwm6tayb75QmDXwXBfxu6SIMf7Ant4rEHHEBLIFjHcI,522
+cfl_common/common/tests/test_migration_unique_school_names.py,sha256=D5SQ1UmD8yHLiEDsA7mWl1O4HzzxsBN_RXErB3ikg5I,1032
+cfl_common/common/tests/test_migration_verify_returning_users.py,sha256=n8JGW-TmE1Hv_4AHl3kn9b6Hwp7DkpZWiYkbPeR8PXw,2054
 cfl_common/common/tests/test_models.py,sha256=xMdzonW5CADMjas_zfg8V1YPQpUetleyn6TE95hbO9k,3723
 cfl_common/common/tests/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cfl_common/common/tests/utils/classes.py,sha256=ZA2pp9Pyx3rwi0VFwtuUA2Pys9xQJ-L_zE0u2tpwEH4,1094
@@ -100,7 +106,7 @@ example_project/portal_test_settings.py,sha256=frp_XMpd-z1g3VFCRxB2w7AaFW2ivRVKn
 example_project/settings.py,sha256=XRZZvASoIl5a9xe3masTq_CUBleuJq9ByHx8f_e2UFc,5613
 example_project/urls.py,sha256=OVeRQ-TCpzHISBRuzqD0yd3ewF7H5U3c-f2p2alfUD0,430
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=ica5ssOzZS9jT8YpXm7HhZkzfZI3xz6GxgU2O-zXjQc,23
+portal/__init__.py,sha256=Ngar-CylGsb6FZcYQn3kMXH5BOJ1Ub5AefCQXyRW8-E,23
 portal/admin.py,sha256=k5Hsiln43DlVPoufnrx5AXWu_RijX8xi_n7wwBuuCJo,5132
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -532,7 +538,7 @@ portal/tests/selenium_test_case.py,sha256=eWUF_5SqkI178bkay5SUDa06r0QTIKUUT8jTAh
 portal/tests/test_2FA.py,sha256=0N4C9Ab3TvO9W__oQLCo-fLDH1Ho3CiGGsSg-2TiZUE,3597
 portal/tests/test_admin.py,sha256=AM2dgv8j9m4L-SDO-sMA9tQvQH9GwRBrlwRG9OgqtfI,1451
 portal/tests/test_aimmo_dashboards.py,sha256=24yGHieAxDHHP-S6qhCWphuszBzVUK3JUF4CmaarbbM,8615
-portal/tests/test_api.py,sha256=cKWLmKOGID5gKW9Ru-7gI0EXpETBM5Gju2odOB8DkP8,12818
+portal/tests/test_api.py,sha256=Yo5s_nEGOoG35jA39yZ6nuDOUZvuCZ8o8o8XhZos61w,13819
 portal/tests/test_captcha_forms.py,sha256=lirhIli-sHovun8VdrF0he7KRFTAd8DMCpkJ8cQNotg,1015
 portal/tests/test_class.py,sha256=V6Fkc6PqdisefKD3xs9PbfE2pKp-9e0gwQVkPUiu6bk,14150
 portal/tests/test_daily_activities.py,sha256=-siDCMGBD1ijjccHVk7eEmrk4bgTsvbh0B6hDoj2fo0,1803
@@ -542,7 +548,7 @@ portal/tests/test_independent_student.py,sha256=ysWpkYiwjPdB7gO3ow-5JuxqLi0IywRS
 portal/tests/test_invite_teacher.py,sha256=oeOaoJV1IqJSYPlaPFjnhVXdB2mq8otCTLp_lfjuCfk,12224
 portal/tests/test_middleware.py,sha256=b6jfNmiRZ2snqLKsyJUG-RivoX5fmrqLlQkG9MeVnqM,8034
 portal/tests/test_newsletter_footer.py,sha256=MdVUX53mEoDTa4Krq-jg9LFNo-QyghqvTvhHeNXBGnE,838
-portal/tests/test_organisation.py,sha256=fOtck-0MkPM2F0V4RFH-QUeWEk6yUIXDv_GI5cl8sdg,7649
+portal/tests/test_organisation.py,sha256=kCMUNzLN6EzaMUBcFkqXwnqLGgOuQxQWIHHt63nhqBs,7574
 portal/tests/test_partials.py,sha256=ydh1nef6BqvMfah2BSBS9QDiKY0xopY74k_W1YVobAE,3687
 portal/tests/test_ratelimit.py,sha256=XWq1A9XgRrlcMHibGoJ0kc4gLc5U_u5UhKHjthxCfYA,19376
 portal/tests/test_school_student.py,sha256=bFZwY4twaFHQLp0cltMq8cLNDZGgCHTZBCZHK0JcV8s,8604
@@ -624,20 +630,20 @@ portal/views/cron/__init__.py,sha256=5rxXyhJmLOExRdrYZ1VJttTsyRIPRybzdftbUDwFByI
 portal/views/cron/user.py,sha256=N4slzEXqzp557LLPlwA6sD3HVzDu74NBf128uvtwKnM,6044
 portal/views/login/__init__.py,sha256=xSCtyFPSI87BRUybBgqa86ekFEolX5gUDbBSfBUMTyI,399
 portal/views/login/independent_student.py,sha256=3dFULhwMAlX4VDrJl-Znril6a9M5xKBSHO1eWvujfS0,2662
-portal/views/login/student.py,sha256=4bQLLhB-KHvvjim07rYWXaLCZzHjUVofl0wrRkb1s0w,5224
+portal/views/login/student.py,sha256=dt6cMfWepBJsVCRcADltfYSHVpyeP1WGLKSogMJ22E0,5539
 portal/views/login/teacher.py,sha256=kRugP7TPbZIb_BmYMYxFeugxZy8UbCry_q0_jJDJ_Mw,1975
 portal/views/student/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/views/student/edit_account_details.py,sha256=keMakqgqy5xB76QbpwsnkadxbMg_dGsAxLuP2CoWbvc,8551
 portal/views/student/play.py,sha256=-v9lBjHF3_PAKRgWcCGGt_bEOpIkmJDJnzgR5JvqrMo,8908
 portal/views/teacher/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-portal/views/teacher/dashboard.py,sha256=_zKAEIaMwCI5LdF5QN2kLy59UTkNhNnx5mYhe-mfdVA,24991
+portal/views/teacher/dashboard.py,sha256=nNA7XxylunLjyCpKmq7h_CYITi7wM3YnmjqzUL0A-bI,25236
 portal/views/teacher/teach.py,sha256=B71jReMJ4BYFmo7NtJVK3-4DeXEwxfu_WA3Ij1RYzdI,34725
 portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/views/two_factor/core.py,sha256=O_wcBeFqdPYSGNGv-pT_vbs5-Dj1Z-Jfkd6f9-E5yZI,760
 portal/views/two_factor/form.py,sha256=lnHNKI-BMlpncTuW3zUzjPaJJNuEra2I_nOam0eOKFY,257
 portal/views/two_factor/profile.py,sha256=tkl_ludo8arMtd5LKNmohM66vpC_YQiP-0nspTSJiJ4,383
-codeforlife_portal-6.42.0.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-6.42.0.dist-info/METADATA,sha256=CmKt5JHc-erJVPaxVVCZ5OSA1btKf0HjBOC_gQ-eAYo,1137
-codeforlife_portal-6.42.0.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-codeforlife_portal-6.42.0.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-6.42.0.dist-info/RECORD,,
+codeforlife_portal-6.43.1.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-6.43.1.dist-info/METADATA,sha256=tFzxDaekn6AVyuunmE_TYU1KveLBu1erHq8KPawpbzs,1137
+codeforlife_portal-6.43.1.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+codeforlife_portal-6.43.1.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-6.43.1.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "6.42.0"
+__version__ = "6.43.1"

portal/tests/test_api.py

@@ -5,7 +5,10 @@ from unittest.mock import patch
 import pytest
 from common.models import Class, School, Student, Teacher
 from common.tests.utils.classes import create_class_directly
-from common.tests.utils.organisation import create_organisation_directly, join_teacher_to_organisation
+from common.tests.utils.organisation import (
+    create_organisation_directly,
+    join_teacher_to_organisation,
+)
 from common.tests.utils.student import create_school_student_directly
 from common.tests.utils.teacher import signup_teacher_directly
 from common.tests.utils.user import create_user_directly, get_superuser
@@ -19,7 +22,10 @@ from rest_framework.test import APIClient, APITestCase
 
 class APITests(APITestCase):
     def test_valid_date_registered(self):
-        url = reverse("registered-users", kwargs={"year": "2016", "month": "04", "day": "01"})
+        url = reverse(
+            "registered-users",
+            kwargs={"year": "2016", "month": "04", "day": "01"},
+        )
         superuser = get_superuser()
         self.client.force_authenticate(user=superuser)
         response = self.client.get(url)
@@ -27,14 +33,20 @@ class APITests(APITestCase):
         assert_that(isinstance(response.data, int))
 
     def test_invalid_date_registered(self):
-        url = reverse("registered-users", kwargs={"year": "2016", "month": "05", "day": "35"})
+        url = reverse(
+            "registered-users",
+            kwargs={"year": "2016", "month": "05", "day": "35"},
+        )
         superuser = get_superuser()
         self.client.force_authenticate(user=superuser)
         response = self.client.get(url)
         assert_that(response, has_status_code(status.HTTP_404_NOT_FOUND))
 
     def test_valid_date_lastconnectedsince(self):
-        url = reverse("last-connected-since", kwargs={"year": "2016", "month": "04", "day": "01"})
+        url = reverse(
+            "last-connected-since",
+            kwargs={"year": "2016", "month": "04", "day": "01"},
+        )
         superuser = get_superuser()
         self.client.force_authenticate(user=superuser)
         response = self.client.get(url)
@@ -42,7 +54,10 @@ class APITests(APITestCase):
         assert_that(isinstance(response.data, int))
 
     def test_invalid_date_lastconnectedsince(self):
-        url = reverse("last-connected-since", kwargs={"year": "2016", "month": "05", "day": "35"})
+        url = reverse(
+            "last-connected-since",
+            kwargs={"year": "2016", "month": "05", "day": "35"},
+        )
         superuser = get_superuser()
         self.client.force_authenticate(user=superuser)
         response = self.client.get(url)
@@ -67,7 +82,9 @@ class APITests(APITestCase):
         assert len(response.data) == 1
 
     @patch("portal.views.api.IS_CLOUD_SCHEDULER_FUNCTION", return_value=True)
-    def test_get_inactive_users_if_appengine(self, mock_is_cloud_scheduler_function):
+    def test_get_inactive_users_if_appengine(
+        self, mock_is_cloud_scheduler_function
+    ):
         client = APIClient()
         create_user_directly(active=False)
         create_user_directly(active=True)
@@ -86,7 +103,9 @@ class APITests(APITestCase):
         assert response.status_code == status.HTTP_403_FORBIDDEN
 
     @patch("portal.views.api.IS_CLOUD_SCHEDULER_FUNCTION", return_value=True)
-    def test_delete_inactive_users_if_appengine(self, mock_is_cloud_scheduler_function):
+    def test_delete_inactive_users_if_appengine(
+        self, mock_is_cloud_scheduler_function
+    ):
         client = APIClient()
         create_user_directly(active=False)
         create_user_directly(active=False)
@@ -94,14 +113,25 @@ class APITests(APITestCase):
         response = client.get(url)
         users = response.data
         assert len(users) == 2
+
+        # NOTE: Migration 0049 causes user 34 (created via migration 0001) to
+        # be marked as inactive. Slightly tweaked this test so it still
+        # passes but takes into account this new anonymisation.
+        old_deleted_users = list(User.objects.filter(is_active=False))
+        assert len(old_deleted_users) == 1
+
         response = client.delete(url)
         assert mock_is_cloud_scheduler_function.called
         assert response.status_code == status.HTTP_204_NO_CONTENT
+
         for user in users:
             with pytest.raises(User.DoesNotExist):
                 User.objects.get(username=user["username"])
+
         deleted_users = list(User.objects.filter(is_active=False))
-        assert len(deleted_users) == 2
+        new_deleted_users_count = len(deleted_users) - len(old_deleted_users)
+        assert new_deleted_users_count == 2
+
         for user in deleted_users:
             assert user.first_name == "Deleted"
             assert user.last_name == "User"
@@ -112,27 +142,41 @@ class APITests(APITestCase):
         assert len(response.data) == 0
 
     @patch("portal.views.api.IS_CLOUD_SCHEDULER_FUNCTION", return_value=True)
-    def test_orphan_schools_and_classes_are_anonymised(self, mock_is_cloud_scheduler_function):
+    def test_orphan_schools_and_classes_are_anonymised(
+        self, mock_is_cloud_scheduler_function
+    ):
         client = APIClient()
         # Create a school with an active teacher
         school1_teacher1_email, _ = signup_teacher_directly()
         school1 = create_organisation_directly(school1_teacher1_email)
-        klass11, _, access_code11 = create_class_directly(school1_teacher1_email)
+        klass11, _, access_code11 = create_class_directly(
+            school1_teacher1_email
+        )
         _, _, student11 = create_school_student_directly(access_code11)
 
         # Create a school with one active non-admin teacher and one inactive admin teacher
         school2_teacher1_email, _ = signup_teacher_directly()
         school2_teacher2_email, _ = signup_teacher_directly()
         school2 = create_organisation_directly(school2_teacher1_email)
-        join_teacher_to_organisation(school2_teacher2_email, school2.name, is_admin=True)
-        klass21, _, access_code21 = create_class_directly(school2_teacher1_email)
+        join_teacher_to_organisation(
+            school2_teacher2_email, school2.name, is_admin=True
+        )
+        klass21, _, access_code21 = create_class_directly(
+            school2_teacher1_email
+        )
         _, _, student21 = create_school_student_directly(access_code21)
-        klass22, _, access_code22 = create_class_directly(school2_teacher2_email)
+        klass22, _, access_code22 = create_class_directly(
+            school2_teacher2_email
+        )
         _, _, student22 = create_school_student_directly(access_code22)
-        school2_teacher1 = Teacher.objects.get(new_user__email=school2_teacher1_email)
+        school2_teacher1 = Teacher.objects.get(
+            new_user__email=school2_teacher1_email
+        )
         school2_teacher1.is_admin = False
         school2_teacher1.save()
-        school2_teacher2 = Teacher.objects.get(new_user__email=school2_teacher2_email)
+        school2_teacher2 = Teacher.objects.get(
+            new_user__email=school2_teacher2_email
+        )
         school2_teacher2.new_user.is_active = False
         school2_teacher2.new_user.save()
 
@@ -141,28 +185,40 @@ class APITests(APITestCase):
         school3_teacher2_email, _ = signup_teacher_directly()
         school3 = create_organisation_directly(school3_teacher1_email)
         join_teacher_to_organisation(school3_teacher2_email, school3.name)
-        klass31, _, access_code31 = create_class_directly(school3_teacher1_email)
+        klass31, _, access_code31 = create_class_directly(
+            school3_teacher1_email
+        )
         _, _, student31 = create_school_student_directly(access_code31)
-        klass32, _, access_code32 = create_class_directly(school3_teacher2_email)
+        klass32, _, access_code32 = create_class_directly(
+            school3_teacher2_email
+        )
         _, _, student32 = create_school_student_directly(access_code32)
-        school3_teacher1 = Teacher.objects.get(new_user__email=school3_teacher1_email)
+        school3_teacher1 = Teacher.objects.get(
+            new_user__email=school3_teacher1_email
+        )
         school3_teacher1.new_user.is_active = False
         school3_teacher1.new_user.save()
-        school3_teacher2 = Teacher.objects.get(new_user__email=school3_teacher2_email)
+        school3_teacher2 = Teacher.objects.get(
+            new_user__email=school3_teacher2_email
+        )
         school3_teacher2.new_user.is_active = False
         school3_teacher2.new_user.save()
 
         # Create a school with no active teachers
         school4_teacher1_email, _ = signup_teacher_directly()
         school4 = create_organisation_directly(school4_teacher1_email)
-        school4_teacher1 = Teacher.objects.get(new_user__email=school4_teacher1_email)
+        school4_teacher1 = Teacher.objects.get(
+            new_user__email=school4_teacher1_email
+        )
         school4_teacher1.new_user.is_active = False
         school4_teacher1.new_user.save()
 
         # Create a school with no teachers
         school5_teacher1_email, _ = signup_teacher_directly()
         school5 = create_organisation_directly(school5_teacher1_email)
-        school5_teacher1 = Teacher.objects.get(new_user__email=school5_teacher1_email)
+        school5_teacher1 = Teacher.objects.get(
+            new_user__email=school5_teacher1_email
+        )
         school5_teacher1.delete()
 
         # Call the API
@@ -182,7 +238,9 @@ class APITests(APITestCase):
         assert Student.objects.filter(pk=student21.pk).exists()
         assert not Student.objects.get(pk=student22.pk).new_user.is_active
         # Also check the first teacher is now an admin
-        assert Teacher.objects.get(new_user__email=school2_teacher1_email).is_admin
+        assert Teacher.objects.get(
+            new_user__email=school2_teacher1_email
+        ).is_admin
 
         # Check the third school is anonymised together with its classes and students
         assert not School.objects.filter(name=school3.name).exists()
@@ -250,14 +308,19 @@ class APITests(APITestCase):
                 last_name=random_account["last_name"],
             )
 
-        assert len(User.objects.all()) == len(random_accounts) + initial_users_length
+        assert (
+            len(User.objects.all())
+            == len(random_accounts) + initial_users_length
+        )
 
         client.login(username=admin_username, password=admin_password)
         response = client.get(reverse("remove_fake_accounts"))
         assert response.status_code == 204
 
         # check if after deletion all the users are still there
-        assert len(User.objects.all()) == initial_users_length + 2  # mentioned in the fake_accounts description
+        assert (
+            len(User.objects.all()) == initial_users_length + 2
+        )  # mentioned in the fake_accounts description
 
 
 def has_status_code(status_code):
@@ -272,7 +335,11 @@ class HasStatusCode(BaseMatcher):
         return response.status_code == self.status_code
 
     def describe_to(self, description):
-        description.append_text("has status code ").append_text(self.status_code)
+        description.append_text("has status code ").append_text(
+            self.status_code
+        )
 
     def describe_mismatch(self, response, mismatch_description):
-        mismatch_description.append_text("had status code ").append_text(response.status_code)
+        mismatch_description.append_text("had status code ").append_text(
+            response.status_code
+        )

portal/tests/test_organisation.py

@@ -4,9 +4,11 @@ import time
 
 from common.models import Teacher
 from common.tests.utils.classes import create_class_directly
-from common.tests.utils.organisation import (create_organisation,
-                                             create_organisation_directly,
-                                             join_teacher_to_organisation)
+from common.tests.utils.organisation import (
+    create_organisation,
+    create_organisation_directly,
+    join_teacher_to_organisation,
+)
 from common.tests.utils.student import create_school_student_directly
 from common.tests.utils.teacher import signup_teacher_directly
 from selenium.webdriver.common.by import By

portal/views/login/student.py

@@ -51,7 +51,8 @@ class StudentLoginView(LoginView):
         class_name = self.kwargs["access_code"].upper()
         messages.info(
             request,
-            f"<strong>You are logged in to class: " f"{escape(class_name)}</strong>",
+            f"<strong>You are logged in to class: "
+            f"{escape(class_name)}</strong>",
             extra_tags="safe message--student",
         )
 
@@ -72,7 +73,9 @@ class StudentLoginView(LoginView):
         klass = classes[0]
 
         name = form.cleaned_data.get("username")
-        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
+        )
         try:
             student = students[0]
         except IndexError:
@@ -81,32 +84,44 @@ class StudentLoginView(LoginView):
             raise Exception(msg)
 
         # Log the login time, class, and login type
-        session = UserSession(user=student.new_user, class_field=klass, login_type=login_type)
+        session = UserSession(
+            user=student.new_user, class_field=klass, login_type=login_type
+        )
         session.save()
 
+        student.user.is_verified = True
+        student.user.save()
+
     def form_valid(self, form):
         """Security check complete. Log the user in."""
-
         # Reset ratelimit cache upon successful login
         clear_ratelimit_cache_for_user(form.cleaned_data["username"])
 
-        login_type = self.kwargs.get("login_type", "classlink")  # default to "classlink" if not specified
+        login_type = self.kwargs.get(
+            "login_type", "classlink"
+        )  # default to "classlink" if not specified
 
         self._add_login_data(form, login_type)
         return super(StudentLoginView, self).form_valid(form)
 
     def post(self, request, *args, **kwargs):
         """
-        If the first name and access code found under the url inputted in the form corresponds to that of a blocked
-        account, this redirects the user to the locked out page. However, if the lockout
-        time is more than 24 hours before this is executed, the account is unlocked.
+        If the first name and access code found under the url inputted in the
+        form corresponds to that of a blocked account, this redirects the user
+        to the locked out page. However, if the lockout time is more than 24
+        hours before this is executed, the account is unlocked.
         """
         username = request.POST.get("username")
 
         # get access code from the current url
         access_code = get_access_code_from_request(request)
-        if Student.objects.filter(new_user__first_name=username, class_field__access_code=access_code).exists():
-            student = Student.objects.get(new_user__first_name=username, class_field__access_code=access_code)
+        if Student.objects.filter(
+            new_user__first_name=username, class_field__access_code=access_code
+        ).exists():
+            student = Student.objects.get(
+                new_user__first_name=username,
+                class_field__access_code=access_code,
+            )
 
             if student.blocked_time is not None:
                 if has_user_lockout_expired(student):
@@ -129,9 +144,15 @@ def student_direct_login(request, user_id, login_id):
     if user:
         # Log the login time and class
         student = Student.objects.get(new_user=user)
-        session = UserSession(user=user, class_field=student.class_field, login_type="direct")
+        session = UserSession(
+            user=user, class_field=student.class_field, login_type="direct"
+        )
         session.save()
 
         login(request, user)
+
+        student.user.is_verified = True
+        student.user.save()
+
         return HttpResponseRedirect(reverse_lazy("student_details"))
     return HttpResponseRedirect(reverse_lazy("home"))

portal/views/teacher/dashboard.py

@@ -2,12 +2,24 @@ from datetime import timedelta
 from uuid import uuid4
 
 from common import email_messages
-from common.helpers.emails import (INVITE_FROM, NOTIFICATION_EMAIL,
-                                   DotmailerUserType, add_to_dotmailer,
-                                   generate_token, send_email, update_email)
+from common.helpers.emails import (
+    INVITE_FROM,
+    NOTIFICATION_EMAIL,
+    DotmailerUserType,
+    add_to_dotmailer,
+    generate_token,
+    send_email,
+    update_email,
+)
 from common.helpers.generators import get_random_username
-from common.models import (Class, JoinReleaseStudent, SchoolTeacherInvitation,
-                           Student, Teacher)
+from common.mail import campaign_ids, send_dotdigital_email
+from common.models import (
+    Class,
+    JoinReleaseStudent,
+    SchoolTeacherInvitation,
+    Student,
+    Teacher,
+)
 from common.permissions import check_teacher_authorised, logged_in_as_teacher
 from common.utils import using_two_factor
 from django.contrib import messages as messages
@@ -16,7 +28,7 @@ from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.models import User
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
-from django.urls import reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.views.decorators.http import require_POST
 from game.level_management import levels_shared_with, unshare_level
@@ -25,14 +37,20 @@ from two_factor.utils import devices_for_user
 from portal.forms.invite_teacher import InviteTeacherForm
 from portal.forms.organisation import OrganisationForm
 from portal.forms.registration import DeleteAccountForm
-from portal.forms.teach import (ClassCreationForm, InvitedTeacherForm,
-                                TeacherAddExternalStudentForm,
-                                TeacherEditAccountForm)
+from portal.forms.teach import (
+    ClassCreationForm,
+    InvitedTeacherForm,
+    TeacherAddExternalStudentForm,
+    TeacherEditAccountForm,
+)
 from portal.helpers.decorators import ratelimit
 from portal.helpers.password import check_update_password
-from portal.helpers.ratelimit import (RATELIMIT_LOGIN_GROUP,
-                                      RATELIMIT_LOGIN_RATE, RATELIMIT_METHOD,
-                                      clear_ratelimit_cache_for_user)
+from portal.helpers.ratelimit import (
+    RATELIMIT_LOGIN_GROUP,
+    RATELIMIT_LOGIN_RATE,
+    RATELIMIT_METHOD,
+    clear_ratelimit_cache_for_user,
+)
 
 from .teach import create_class
 
@@ -380,19 +398,22 @@ def invite_toggle_admin(request, invite_id):
 
     if invite.invited_teacher_is_admin:
         messages.success(request, "Administrator invite status has been given successfully")
-        emailMessage = email_messages.adminGivenEmail(request, invite.school)
+        send_dotdigital_email(
+            campaign_ids["admin_given"],
+            [invite.invited_teacher_email],
+            personalization_values={
+                "SCHOOL_CLUB_NAME": invite.school,
+                "MANAGEMENT_LINK": request.build_absolute_uri(reverse("dashboard")),
+            },
+        )
 
     else:
         messages.success(request, "Administrator invite status has been revoked successfully")
-        emailMessage = email_messages.adminRevokedEmail(request, invite.school)
-
-    send_email(
-        NOTIFICATION_EMAIL,
-        [invite.invited_teacher_email],
-        emailMessage["subject"],
-        emailMessage["message"],
-        emailMessage["subject"],
-    )
+        send_dotdigital_email(
+            campaign_ids["admin_revoked"],
+            [invite.invited_teacher_email],
+            personalization_values={"SCHOOL_CLUB_NAME": invite.school},
+        )
 
     return HttpResponseRedirect(reverse_lazy("dashboard"))
 
@@ -411,7 +432,14 @@ def organisation_toggle_admin(request, pk):
 
     if teacher.is_admin:
         messages.success(request, "Administrator status has been given successfully.")
-        email_message = email_messages.adminGivenEmail(request, teacher.school.name)
+        send_dotdigital_email(
+            campaign_ids["admin_given"],
+            [teacher.new_user.email],
+            personalization_values={
+                "SCHOOL_CLUB_NAME": teacher.school.name,
+                "MANAGEMENT_LINK": request.build_absolute_uri(reverse("dashboard")),
+            },
+        )
     else:
         # Remove access to all levels that are from other teachers' students
         [
@@ -420,15 +448,11 @@ def organisation_toggle_admin(request, pk):
             if hasattr(level.owner, "student") and not teacher.teaches(level.owner)
         ]
         messages.success(request, "Administrator status has been revoked successfully.")
-        email_message = email_messages.adminRevokedEmail(request, teacher.school.name)
-
-    send_email(
-        NOTIFICATION_EMAIL,
-        [teacher.new_user.email],
-        email_message["subject"],
-        email_message["message"],
-        email_message["subject"],
-    )
+        send_dotdigital_email(
+            campaign_ids["admin_revoked"],
+            [teacher.new_user.email],
+            personalization_values={"SCHOOL_CLUB_NAME": teacher.school.name},
+        )
 
     return HttpResponseRedirect(reverse_lazy("dashboard"))