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

cfl_common/common/mail.py

@@ -10,9 +10,18 @@ from django.template import loader
 campaign_ids = {
     "admin_given": 1569057,
     "admin_revoked": 1569071,
+    "delete_account": 1567477,
     "email_change_notification": 1551600,
     "email_change_verification": 1551594,
+    "invite_teacher_with_account": 1569599,
+    "invite_teacher_without_account": 1569607,
+    "level_creation": 1570259,
     "reset_password": 1557153,
+    "student_join_request_notification": 1569486,
+    "student_join_request_rejected": 1569470,
+    "student_join_request_sent": 1569477,
+    "teacher_released": 1569537,
+    "user_already_registered": 1569539,
     "verify_new_user": 1551577,
     "verify_new_user_first_reminder": 1557170,
     "verify_new_user_second_reminder": 1557173,

cfl_common/common/tests/utils/email.py

@@ -16,8 +16,8 @@ def follow_verify_email_link_to_login(page, url, user_type):
         return go_to_independent_student_login_page(page.browser)
 
 
-def follow_duplicate_account_link_to_login(page, email, user_type):
-    _follow_duplicate_account_email_link(page, email)
+def follow_duplicate_account_link_to_login(page, url, user_type):
+    page.browser.get(url)
 
     if user_type == "teacher":
         return go_to_teacher_login_page(page.browser)
@@ -25,15 +25,6 @@ def follow_duplicate_account_link_to_login(page, email, user_type):
         return go_to_independent_student_login_page(page.browser)
 
 
-def _follow_duplicate_account_email_link(page, email):
-    message = str(email.message())
-    prefix = 'please login: <a href="'
-    i = str.find(message, prefix) + len(prefix)
-    suffix = '" rel="nofollow">'
-    j = str.find(message, suffix, i)
-    page.browser.get(message[i:j])
-
-
 def follow_reset_email_link(browser, link):
     browser.get(link)
 

cfl_common/common/tests/utils/student.py

@@ -5,7 +5,6 @@ from unittest.mock import patch
 from common.helpers.emails import generate_token
 from common.helpers.generators import generate_login_id
 from common.models import Class, Student
-from django.core import mail
 
 from . import email
 
@@ -102,23 +101,6 @@ def generate_independent_student_details():
 generate_independent_student_details.next_id = 1
 
 
-def signup_duplicate_independent_student_fail(page, duplicate_email=None):
-    page = page.go_to_signup_page()
-
-    name, username, email_address, password = generate_independent_student_details()
-
-    if not duplicate_email:
-        duplicate_email = email_address
-
-    page = page.independent_student_signup(name, duplicate_email, password=password, confirm_password=password)
-
-    page = page.return_to_home_page()
-
-    page = email.follow_duplicate_account_link_to_login(page, mail.outbox[0], "independent")
-
-    return page, name, username, email_address, password
-
-
 @patch("common.helpers.emails.send_dotdigital_email")
 def create_independent_student(page, mock_send_dotdigital_email):
     page = page.go_to_signup_page()

cfl_common/common/tests/utils/teacher.py

@@ -4,7 +4,6 @@ from unittest.mock import patch
 
 from common.helpers.emails import generate_token
 from common.models import Teacher
-from django.core import mail
 
 from . import email
 
@@ -34,7 +33,8 @@ def signup_teacher_directly(preverified=True, **kwargs):
     return email_address, password
 
 
-def signup_duplicate_teacher_fail(page, duplicate_email):
+@patch("portal.views.home.send_dotdigital_email")
+def signup_duplicate_teacher_fail(page, duplicate_email, mock_send_dotdigital_email):
     page = page.go_to_signup_page()
 
     first_name, last_name, email_address, password = generate_details()
@@ -42,8 +42,9 @@ def signup_duplicate_teacher_fail(page, duplicate_email):
 
     page = page.return_to_home_page()
 
-    page = email.follow_duplicate_account_link_to_login(page, mail.outbox[0], "teacher")
-    mail.outbox = []
+    login_link = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["LOGIN_URL"]
+
+    page = email.follow_duplicate_account_link_to_login(page, login_link, "teacher")
 
     return page, email_address, password
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 6.43.1
+Version: 6.43.3
 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.43.1
+Requires-Dist: cfl-common ==6.43.3
 Requires-Dist: django-ratelimit ==3.0.1
 Requires-Dist: django-preventconcurrentlogins ==0.8.2
 Requires-Dist: django-csp ==3.7

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

@@ -5,8 +5,7 @@ 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=oK8cb5wrDbxq6xoEoILHJggs3P35aEyk9eFJHIR6y74,3644
-cfl_common/common/mail.py,sha256=qgsgBc0drFIG8ik4ZBjaqjSvk0LVDIJV2fNYWFrbzHU,5990
+cfl_common/common/mail.py,sha256=XPImcfZKcW5mxov04_0jc3xkx_u1SJE6Hhn8K2kPgoA,6354
 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
@@ -78,10 +77,10 @@ cfl_common/common/tests/test_migration_verify_returning_users.py,sha256=n8JGW-Tm
 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
-cfl_common/common/tests/utils/email.py,sha256=x3DjWCT997wwj33YuiA3mDqkNahr63zVmz_mX7XIomo,2094
+cfl_common/common/tests/utils/email.py,sha256=RljsVjIob4Uqi3O5YhP2ifqfc4cMcdP4Gv0EaL-sHXo,1780
 cfl_common/common/tests/utils/organisation.py,sha256=vNgKFtU3VPcWRnZfh82yCS90PLAK1XTYJNIxGwfgUI4,966
-cfl_common/common/tests/utils/student.py,sha256=XlgWT0TdbIY6w9uB4SqOoXmhxxCRnucEcPY9Q5Xva0U,4415
-cfl_common/common/tests/utils/teacher.py,sha256=kY9LuP1mTEj_andYxF9k54xEHiJ36a6dokHxA9cB9f0,2500
+cfl_common/common/tests/utils/student.py,sha256=PLd980iSlxmMoB8J3C2pVjNC5xHdVxfAkJXzhv_dRhg,3814
+cfl_common/common/tests/utils/teacher.py,sha256=bJAYLzZdksCIHNxUJJYGZNLHj-axYro4pd3_sXvXbno,2625
 cfl_common/common/tests/utils/user.py,sha256=NvLzZLVP4jy5Hn1iztOYF_BTQ9WsbSmuWMEzGzhAsRU,919
 deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deploy/captcha.py,sha256=MbOBuGnbT_SOIltSjP1XMOLrfo1DldCilaVAEim0vM4,23
@@ -106,7 +105,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=Ngar-CylGsb6FZcYQn3kMXH5BOJ1Ub5AefCQXyRW8-E,23
+portal/__init__.py,sha256=lS9jJlgjO1rzcyujvAxw3NGfAlOy9t3JYoNPpGZka5Q,23
 portal/admin.py,sha256=k5Hsiln43DlVPoufnrx5AXWu_RijX8xi_n7wwBuuCJo,5132
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -544,7 +543,7 @@ portal/tests/test_class.py,sha256=V6Fkc6PqdisefKD3xs9PbfE2pKp-9e0gwQVkPUiu6bk,14
 portal/tests/test_daily_activities.py,sha256=-siDCMGBD1ijjccHVk7eEmrk4bgTsvbh0B6hDoj2fo0,1803
 portal/tests/test_emails.py,sha256=Y26VjhPOzc2aptHBSmOW9R-do3k1QaRqUc5MiwgsAQk,9156
 portal/tests/test_helper_methods.py,sha256=-SQCDZm2XUtyXGEp0CHIb_SSC9CPD-XOSnpnY8QclHk,890
-portal/tests/test_independent_student.py,sha256=ysWpkYiwjPdB7gO3ow-5JuxqLi0IywRSxG1s3rKzTK0,26282
+portal/tests/test_independent_student.py,sha256=jyNpHyisCfkD-CDsjIfSxWnWTxDmkReJ-BdXEBdJoMo,27081
 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
@@ -555,7 +554,7 @@ portal/tests/test_school_student.py,sha256=bFZwY4twaFHQLp0cltMq8cLNDZGgCHTZBCZHK
 portal/tests/test_security.py,sha256=FGrlRfnzi-Xx2_bn4fTZlYORKm7w_GhGkD3havvplwc,3239
 portal/tests/test_teacher.py,sha256=_VmQCWq07uCFbvq6Vd7GN00mE7vY7WNMeQTk6bHxFPI,36898
 portal/tests/test_teacher_student.py,sha256=NWITbUw1kijqu3c8eRHLHJKaYQMOsOMvl7PAVx5QghI,21567
-portal/tests/test_views.py,sha256=6y4ICpo5KPTWQed3J1Hg74ZGBKI2y3-HNHAowOsge80,38769
+portal/tests/test_views.py,sha256=IElQJnp9fhlmqR-54nBycul2uUIjsG9dTRnYy5SxXJ4,39278
 portal/tests/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/tests/migrations/test_migration_make_portaladmin_teacher.py,sha256=ekMRb6cU97oT0k9gCKW7IUB7oPuGmv4uWJCqInQN7x8,2589
 portal/tests/migrations/test_migration_preview_user_remove.py,sha256=K6D-FZT9YFEA8oMxHz9VTglVV6MZOTRYVlvwWwXc2vU,555
@@ -618,11 +617,11 @@ portal/views/admin.py,sha256=4Xt3zEyQH7sUwQSrwuRtoCodWidjOzd7gJUwWU96pXY,957
 portal/views/api.py,sha256=lCwiclR98G-yTgK55u8IjkueIH8iremeiZSa3jAvO-M,6990
 portal/views/dotmailer.py,sha256=_subSoy5f1j5sAcRrjE_xMejdarjHIY1d_jwSrf7_o0,2299
 portal/views/email.py,sha256=dSgTp0kEZRTBRwPbtCrMoWhiOqZ1dPZT1YMvR6f1GQU,3899
-portal/views/home.py,sha256=J_kb0Kv5Ubk9yQ4r0IAvhPV5o_iezcaqA4Z5bd0-Idc,9869
+portal/views/home.py,sha256=J4KY66p2nRgRu1O_0IYwdgfZoTYuhQS0qpfiA1b8PTE,9855
 portal/views/legal.py,sha256=nUunsTHnhMcXBcDlg1GmUal86k9Vhinne4A2FWfq78M,342
 portal/views/organisation.py,sha256=sPDbiM7hdtpF8GKyh_4n4VPl2a-WnAgnF4q9aSvQCVI,3341
 portal/views/play_landing_page.py,sha256=FFmjUFub3ZdlbMqkB8yX3jAImCzqrUqgb8AZcpKywZ4,308
-portal/views/registration.py,sha256=oGHec_NvBTRd--4pAXtCevteAj6ivF8PKwbwul46Mmk,11011
+portal/views/registration.py,sha256=L9AzIG2nOU946cSOXmUMQRtDo3uxApHX-0ceXopbOCw,10888
 portal/views/teach.py,sha256=nzlyTcgq9ImAjnqrF3esqi212qBLH5Ww1LKE2gSjoRY,210
 portal/views/aimmo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/views/aimmo/dashboard.py,sha256=YMOzonNE87OEP5lThY4BrF0rNyvIYpDInh_sM-n38AM,4046
@@ -633,17 +632,17 @@ portal/views/login/independent_student.py,sha256=3dFULhwMAlX4VDrJl-Znril6a9M5xKB
 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/student/edit_account_details.py,sha256=Ba-3D_zzKbX5N01NG5qqBS0ud10B8D5SN8hOpLiGa9U,8468
+portal/views/student/play.py,sha256=r5TADH_wYn3d1beezfvkYBiendQ9qLys9dUJwHqF_44,8581
 portal/views/teacher/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-portal/views/teacher/dashboard.py,sha256=nNA7XxylunLjyCpKmq7h_CYITi7wM3YnmjqzUL0A-bI,25236
+portal/views/teacher/dashboard.py,sha256=8WglspwuHF__2LtoX5_XvoW1ulICSupjKv--MtjrvJk,25714
 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.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,,
+codeforlife_portal-6.43.3.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-6.43.3.dist-info/METADATA,sha256=d1x7eE5cAtisbjaj-f49hoXXduEJXJg7agpKyvtX7q0,1137
+codeforlife_portal-6.43.3.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+codeforlife_portal-6.43.3.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-6.43.3.dist-info/RECORD,,

portal/__init__.py

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

portal/tests/test_independent_student.py

@@ -16,7 +16,7 @@ from common.tests.utils.student import (
     create_independent_student,
     create_independent_student_directly,
     create_school_student_directly,
-    signup_duplicate_independent_student_fail,
+    generate_independent_student_details,
     verify_email,
 )
 from common.tests.utils.teacher import signup_teacher_directly
@@ -169,7 +169,8 @@ class TestIndependentStudent(TestCase):
 
 # Class for Selenium tests. We plan to replace these and turn them into Cypress tests
 class TestIndependentStudentFrontend(BaseTest):
-    def test_delete_indy_account(self):
+    @patch("portal.views.registration.send_dotdigital_email")
+    def test_delete_indy_account(self, mock_send_dotdigital_email: Mock):
         page = self.go_to_homepage()
         page, _, _, email, password = create_independent_student(page)
         page = page.independent_student_login(email, password)
@@ -214,27 +215,37 @@ class TestIndependentStudentFrontend(BaseTest):
         assert not User.objects.get(id=user_id).is_active
 
         # check if email has been sent
-        assert len(mail.outbox) == 1
+        mock_send_dotdigital_email.assert_called_once_with(campaign_ids["delete_account"], ANY)
 
     def test_signup_without_newsletter(self):
         page = self.go_to_homepage()
         page, _, _, _, _ = create_independent_student(page)
         assert is_email_verified_message_showing(self.selenium)
 
-    def test_signup_duplicate_email_failure(self):
+    @patch("portal.views.home.send_dotdigital_email")
+    def test_signup_duplicate_email_failure(self, mock_send_dotdigital_email):
         page = self.go_to_homepage()
         page, _, _, email, _ = create_independent_student(page)
         assert is_email_verified_message_showing(self.selenium)
 
-        page = self.go_to_homepage()
-        page, _, _, _, _ = signup_duplicate_independent_student_fail(page, duplicate_email=email)
+        page = self.go_to_homepage().go_to_signup_page()
+
+        name, username, email_address, password = generate_independent_student_details()
+        page = page.independent_student_signup(name, email, password=password, confirm_password=password)
+        page = page.return_to_home_page()
+
+        mock_send_dotdigital_email.assert_called_once_with(
+            campaign_ids["user_already_registered"], ANY, personalization_values=ANY
+        )
+
+        login_link = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["LOGIN_URL"]
 
-        assert len(mail.outbox) == 1
-        assert mail.outbox[0].subject == "Duplicate account"
+        page = email_utils.follow_duplicate_account_link_to_login(page, login_link, "independent")
 
         assert self.is_login_page(page)
 
-    def test_signup_duplicate_email_with_teacher(self):
+    @patch("portal.views.home.send_dotdigital_email")
+    def test_signup_duplicate_email_with_teacher(self, mock_send_dotdigital_email: Mock):
         teacher_email, _ = signup_teacher_directly()
 
         page = self.go_to_homepage()
@@ -247,8 +258,9 @@ class TestIndependentStudentFrontend(BaseTest):
 
         page.return_to_home_page()
 
-        assert len(mail.outbox) == 1
-        assert mail.outbox[0].subject == "Duplicate account"
+        mock_send_dotdigital_email.assert_called_once_with(
+            campaign_ids["user_already_registered"], ANY, personalization_values=ANY
+        )
 
     def test_login_failure(self):
         page = self.go_to_homepage()

portal/tests/test_views.py

@@ -572,7 +572,8 @@ class TestViews(TestCase):
         assert response.status_code == 200
         assert response.context_data == EXPECTED_DATA_WITH_KURONO_GAME
 
-    def test_delete_account(self):
+    @patch("portal.views.registration.send_dotdigital_email")
+    def test_delete_account(self, mock_send_dotdigital_email: Mock):
         email, password = signup_teacher_directly()
         u = User.objects.get(email=email)
         usrid = u.id
@@ -593,7 +594,7 @@ class TestViews(TestCase):
         response = c.post(url, {"password": "wrongPassword"})
 
         assert response.status_code == 302
-        assert response.url == reverse("dashboard")
+        mock_send_dotdigital_email.assert_not_called()
 
         # user has not been anonymised
         u = User.objects.get(email=email)
@@ -604,6 +605,7 @@ class TestViews(TestCase):
         response = c.post(url, {"password": password, "unsubscribe_newsletter": "on"})
 
         assert response.status_code == 302
+        mock_send_dotdigital_email.assert_called_once()
         assert response.url == reverse("home")
 
         # user has been anonymised
@@ -611,7 +613,10 @@ class TestViews(TestCase):
         assert u.first_name == "Deleted"
         assert not u.is_active
 
-    def test_delete_account_admin(self):
+        assert c.login(username=email, password=password) == False
+
+    @patch("portal.views.registration.send_dotdigital_email")
+    def test_delete_account_admin(self, mock_send_dotdigital_email: Mock):
         """test the passing of admin role after deletion of an admin account"""
 
         email1, password1 = signup_teacher_directly()
@@ -666,6 +671,7 @@ class TestViews(TestCase):
         # delete teacher1 account
         url = reverse("delete_account")
         c.post(url, {"password": password1})
+        mock_send_dotdigital_email.assert_called_once()
 
         # user has been anonymised
         u = User.objects.get(id=usrid1)
@@ -706,6 +712,7 @@ class TestViews(TestCase):
         # now delete teacher3 account
         url = reverse("delete_account")
         c.post(url, {"password": password3})
+        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")
@@ -738,6 +745,7 @@ class TestViews(TestCase):
 
         url = reverse("delete_account")
         c.post(url, {"password": password2})
+        self.assertEqual(mock_send_dotdigital_email.call_count, 3)
 
         # school should be anonymised
         school = School._base_manager.get(id=school_id)

portal/views/home.py

@@ -1,13 +1,13 @@
 import logging
 import math
 
-from common import email_messages
 from common.helpers.emails import (
     NOTIFICATION_EMAIL,
     send_email,
     send_verification_email,
 )
-from common.models import Student, Teacher, DynamicElement, TotalActivity
+from common.mail import campaign_ids, send_dotdigital_email
+from common.models import DynamicElement, Student, Teacher, TotalActivity
 from common.permissions import logged_in_as_student, logged_in_as_teacher
 from common.utils import _using_two_factor
 from django.contrib import messages as messages
@@ -34,8 +34,7 @@ from portal.helpers.ratelimit import (
 from portal.strings.coding_club import CODING_CLUB_BANNER
 from portal.strings.home_learning import HOME_LEARNING_BANNER
 from portal.templatetags.app_tags import cloud_storage
-from portal.views.teacher.teach import DownloadType
-from portal.views.teacher.teach import count_student_pack_downloads_click
+from portal.views.teacher.teach import DownloadType, count_student_pack_downloads_click
 
 LOGGER = logging.getLogger(__name__)
 
@@ -126,7 +125,7 @@ def process_signup_form(request, data):
     email = data["teacher_email"]
 
     if email and User.objects.filter(email=email).exists():
-        email_message = email_messages.userAlreadyRegisteredEmail(request, email)
+
         is_email_ratelimited = is_ratelimited(
             request=request,
             group=RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP,
@@ -136,12 +135,13 @@ def process_signup_form(request, data):
         )
 
         if not is_email_ratelimited:
-            send_email(
-                NOTIFICATION_EMAIL,
+            send_dotdigital_email(
+                campaign_ids["user_already_registered"],
                 [email],
-                email_message["subject"],
-                email_message["message"],
-                email_message["subject"],
+                personalization_values={
+                    "EMAIL": email,
+                    "LOGIN_URL": request.build_absolute_uri(reverse("teacher_login")),
+                },
             )
         else:
             LOGGER.warn(f"Ratelimit teacher {RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP}: {email}")
@@ -164,7 +164,6 @@ def process_independent_student_signup_form(request, data):
     email = data["email"]
 
     if email and User.objects.filter(email=email).exists():
-        email_message = email_messages.userAlreadyRegisteredEmail(request, email, is_independent_student=True)
         is_email_ratelimited = is_ratelimited(
             request=request,
             group=RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP,
@@ -174,12 +173,13 @@ def process_independent_student_signup_form(request, data):
         )
 
         if not is_email_ratelimited:
-            send_email(
-                NOTIFICATION_EMAIL,
+            send_dotdigital_email(
+                campaign_ids["user_already_registered"],
                 [email],
-                email_message["subject"],
-                email_message["message"],
-                email_message["subject"],
+                personalization_values={
+                    "EMAIL": email,
+                    "LOGIN_URL": request.build_absolute_uri(reverse("independent_student_login")),
+                },
             )
         else:
             LOGGER.warning(f"Ratelimit independent {RATELIMIT_USER_ALREADY_REGISTERED_EMAIL_GROUP}: {email}")

portal/views/registration.py

@@ -1,24 +1,21 @@
 import ast
 import re
-
-from common.email_messages import accountDeletionEmail
-from portal.views.login import has_user_lockout_expired
-
-from django.contrib.auth.models import User
 from datetime import datetime
+
 from common.helpers.emails import (
-    delete_contact,
     NOTIFICATION_EMAIL,
     PASSWORD_RESET_EMAIL,
+    delete_contact,
     send_email,
 )
-from common.models import Teacher, Student, DailyActivity
-from common.permissions import not_logged_in, not_fully_logged_in
-
+from common.mail import campaign_ids, send_dotdigital_email
+from common.models import DailyActivity, Student, Teacher
+from common.permissions import not_fully_logged_in, not_logged_in
 from django.contrib import messages as messages
 from django.contrib.auth import get_user_model
-from django.contrib.auth.decorators import user_passes_test, login_required
+from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm
+from django.contrib.auth.models import User
 from django.contrib.auth.tokens import default_token_generator
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
@@ -35,14 +32,15 @@ from django.views.decorators.http import require_POST
 from deploy import captcha
 from portal import app_settings
 from portal.forms.registration import (
-    TeacherPasswordResetForm,
-    TeacherPasswordResetSetPasswordForm,
     StudentPasswordResetForm,
     StudentPasswordResetSetPasswordForm,
+    TeacherPasswordResetForm,
+    TeacherPasswordResetSetPasswordForm,
 )
 from portal.helpers.captcha import remove_captcha_from_form
 from portal.helpers.ratelimit import clear_ratelimit_cache_for_user
 from portal.views.api import anonymise
+from portal.views.login import has_user_lockout_expired
 
 
 @user_passes_test(not_logged_in, login_url=reverse_lazy("home"))
@@ -309,13 +307,6 @@ def delete_account(request):
         delete_contact(email)
 
     # send confirmation email
-    message = accountDeletionEmail(request)
-    send_email(
-        NOTIFICATION_EMAIL,
-        [email],
-        message["subject"],
-        message["message"],
-        message["title"],
-    )
+    send_dotdigital_email(campaign_ids["delete_account"], [email])
 
     return HttpResponseRedirect(reverse_lazy("home"))

portal/views/student/edit_account_details.py

@@ -1,5 +1,9 @@
-from common.email_messages import accountDeletionEmail
-from common.helpers.emails import NOTIFICATION_EMAIL, delete_contact, send_email, update_indy_email
+from common.helpers.emails import (
+    NOTIFICATION_EMAIL,
+    delete_contact,
+    send_email,
+    update_indy_email,
+)
 from common.models import Student
 from common.permissions import logged_in_as_student
 from django.contrib import messages as messages
@@ -7,17 +11,15 @@ from django.contrib.auth import logout
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpResponseRedirect
+from django.shortcuts import render
 from django.urls import reverse_lazy
 from django.views.generic.edit import FormView
-from django.shortcuts import render
 
-from portal.forms.play import StudentEditAccountForm, IndependentStudentEditAccountForm
+from portal.forms.play import IndependentStudentEditAccountForm, StudentEditAccountForm
 from portal.forms.registration import DeleteAccountForm
-
 from portal.helpers.password import check_update_password
 from portal.helpers.ratelimit import clear_ratelimit_cache_for_user
 from portal.views.api import anonymise
-from django.contrib import messages as messages
 
 
 def _get_form(self, form_class):

portal/views/student/play.py

@@ -1,7 +1,7 @@
 from typing import Any, Dict, List, Optional
 
-from common import email_messages
 from common.helpers.emails import NOTIFICATION_EMAIL, send_email
+from common.mail import campaign_ids, send_dotdigital_email
 from common.models import Student
 from common.permissions import (
     logged_in_as_independent_student,
@@ -22,9 +22,7 @@ from game.models import Attempt, Level
 from portal.forms.play import StudentJoinOrganisationForm
 
 
-class SchoolStudentDashboard(
-    LoginRequiredNoErrorMixin, UserPassesTestMixin, TemplateView
-):
+class SchoolStudentDashboard(LoginRequiredNoErrorMixin, UserPassesTestMixin, TemplateView):
     template_name = "portal/play/student_dashboard.html"
     login_url = reverse_lazy("student_login_access_code")
 
@@ -50,16 +48,10 @@ class SchoolStudentDashboard(
         custom_levels = student.new_user.shared.filter(owner=teacher)
 
         if custom_levels:
-            custom_levels_data = _compute_rapid_router_scores(
-                student, custom_levels
-            )
+            custom_levels_data = _compute_rapid_router_scores(student, custom_levels)
 
-            context_data["total_custom_score"] = custom_levels_data[
-                "total_score"
-            ]
-            context_data["total_custom_available_score"] = custom_levels_data[
-                "total_available_score"
-            ]
+            context_data["total_custom_score"] = custom_levels_data["total_score"]
+            context_data["total_custom_available_score"] = custom_levels_data["total_available_score"]
 
         # Get Kurono game info if the class has a game linked to it
         aimmo_game = klass.active_game
@@ -72,9 +64,7 @@ class SchoolStudentDashboard(
         return context_data
 
 
-class IndependentStudentDashboard(
-    LoginRequiredNoErrorMixin, UserPassesTestMixin, TemplateView, FormView
-):
+class IndependentStudentDashboard(LoginRequiredNoErrorMixin, UserPassesTestMixin, TemplateView, FormView):
     template_name = "portal/play/independent_student_dashboard.html"
     login_url = reverse_lazy("independent_student_login")
 
@@ -91,9 +81,7 @@ class IndependentStudentDashboard(
         )
 
 
-def _compute_rapid_router_scores(
-    student: Student, levels: List[Level] or QuerySet
-) -> Dict[str, int]:
+def _compute_rapid_router_scores(student: Student, levels: List[Level] or QuerySet) -> Dict[str, int]:
     """
     Finds Rapid Router progress and score data for a specific student and a specific
     set of levels. This is used to show quick score data to the student on their
@@ -112,9 +100,9 @@ def _compute_rapid_router_scores(
     num_completed = num_top_scores = total_available_score = 0
     total_score = 0.0
     # Get a QuerySet of best attempts for each level
-    best_attempts = Attempt.objects.filter(
-        level__in=levels, student=student, is_best_attempt=True
-    ).select_related("level")
+    best_attempts = Attempt.objects.filter(level__in=levels, student=student, is_best_attempt=True).select_related(
+        "level"
+    )
 
     for level in levels:
         total_available_score += _get_max_score_for_level(level)
@@ -122,10 +110,7 @@ def _compute_rapid_router_scores(
     # For each level, compare best attempt's score with level's max score and
     # increment variables as needed
     if best_attempts:
-        attempts_dict = {
-            best_attempt.level.id: best_attempt
-            for best_attempt in best_attempts
-        }
+        attempts_dict = {best_attempt.level.id: best_attempt for best_attempt in best_attempts}
         for level in levels:
             attempt = attempts_dict.get(level.id)
 
@@ -155,12 +140,7 @@ def _get_max_score_for_level(level: Level) -> int:
     """
     return (
         10
-        if level.id > 12
-        and (
-            level.disable_route_score
-            or level.disable_algorithm_score
-            or not level.episode
-        )
+        if level.id > 12 and (level.disable_route_score or level.disable_algorithm_score or not level.episode)
         else 20
     )
 
@@ -207,31 +187,23 @@ def process_join_organisation_form(request_form, request, student):
         student.pending_class_request = request_form.klass
         student.save()
 
-        email_message = email_messages.studentJoinRequestSentEmail(
-            request,
-            request_form.klass.teacher.school.name,
-            request_form.klass.access_code,
-        )
-        send_email(
-            NOTIFICATION_EMAIL,
+        send_dotdigital_email(
+            campaign_ids["student_join_request_sent"],
             [student.new_user.email],
-            email_message["subject"],
-            email_message["message"],
-            email_message["subject"],
+            personalization_values={
+                "SCHOOL_CLUB_NAME": request_form.klass.teacher.school.name,
+                "ACCESS_CODE": request_form.klass.access_code,
+            },
         )
 
-        email_message = email_messages.studentJoinRequestNotifyEmail(
-            request,
-            student.new_user.username,
-            student.new_user.email,
-            student.pending_class_request.access_code,
-        )
-        send_email(
-            NOTIFICATION_EMAIL,
+        send_dotdigital_email(
+            campaign_ids["student_join_request_notification"],
             [student.pending_class_request.teacher.new_user.email],
-            email_message["subject"],
-            email_message["message"],
-            email_message["subject"],
+            personalization_values={
+                "USERNAME": student.new_user.username,
+                "EMAIL": student.new_user.email,
+                "ACCESS_CODE": student.pending_class_request.access_code,
+            },
         )
 
         messages.success(

portal/views/teacher/dashboard.py

@@ -1,7 +1,6 @@
 from datetime import timedelta
 from uuid import uuid4
 
-from common import email_messages
 from common.helpers.emails import (
     INVITE_FROM,
     NOTIFICATION_EMAIL,
@@ -167,9 +166,21 @@ def dashboard_teacher_view(request, is_admin):
                 )
 
                 account_exists = User.objects.filter(email=invited_teacher_email).exists()
-                message = email_messages.inviteTeacherEmail(request, school.name, token, account_exists)
-                send_email(
-                    INVITE_FROM, [invited_teacher_email], message["subject"], message["message"], message["subject"]
+
+                registration_link = (
+                    f"{request.build_absolute_uri(reverse('invited_teacher', kwargs={'token': token}))} "
+                )
+
+                campaign_id = (
+                    campaign_ids["invite_teacher_with_account"]
+                    if account_exists
+                    else campaign_ids["invite_teacher_without_account"]
+                )
+
+                send_dotdigital_email(
+                    campaign_id,
+                    [invited_teacher_email],
+                    personalization_values={"SCHOOL_NAME": school.name, "REGISTRATION_LINK": registration_link},
                 )
 
                 messages.success(
@@ -375,14 +386,10 @@ def organisation_kick(request, pk):
 
     messages.success(request, success_message)
 
-    emailMessage = email_messages.kickedEmail(request, user.school.name)
-
-    send_email(
-        NOTIFICATION_EMAIL,
+    send_dotdigital_email(
+        campaign_ids["teacher_released"],
         [teacher.new_user.email],
-        emailMessage["subject"],
-        emailMessage["message"],
-        emailMessage["subject"],
+        personalization_values={"SCHOOL_CLUB_NAME": user.school.name},
     )
 
     return HttpResponseRedirect(reverse_lazy("dashboard"))
@@ -537,15 +544,13 @@ def teacher_reject_student_request(request, pk):
 
     check_student_request_can_be_handled(request, student)
 
-    emailMessage = email_messages.studentJoinRequestRejectedEmail(
-        request, student.pending_class_request.teacher.school.name, student.pending_class_request.access_code
-    )
-    send_email(
-        NOTIFICATION_EMAIL,
+    send_dotdigital_email(
+        campaign_ids["student_join_request_rejected"],
         [student.new_user.email],
-        emailMessage["subject"],
-        emailMessage["message"],
-        emailMessage["subject"],
+        personalization_values={
+            "SCHOOL_CLUB_NAME": student.pending_class_request.teacher.school.name,
+            "ACCESS_CODE": student.pending_class_request.access_code,
+        },
     )
 
     student.pending_class_request = None
@@ -591,10 +596,21 @@ def resend_invite_teacher(request, token):
         teacher = Teacher.objects.filter(id=invite.from_teacher.id)[0]
 
         messages.success(request, "Teacher re-invited!")
-        message = email_messages.inviteTeacherEmail(request, invite.school, token, not (invite.is_expired))
-        send_email(
-            INVITE_FROM, [invite.invited_teacher_email], message["subject"], message["message"], message["subject"]
+
+        registration_link = f"{request.build_absolute_uri(reverse('invited_teacher', kwargs={'token': token}))} "
+
+        campaign_id = (
+            campaign_ids["invite_teacher_with_account"]
+            if teacher.exists()
+            else campaign_ids["invite_teacher_without_account"]
         )
+
+        send_dotdigital_email(
+            campaign_id,
+            [invite.invited_teacher_email],
+            personalization_values={"SCHOOL_NAME": invite.school, "REGISTRATION_LINK": registration_link},
+        )
+
     return HttpResponseRedirect(reverse_lazy("dashboard"))
 
 

cfl_common/common/email_messages.py

@@ -1,96 +0,0 @@
-from django.urls import reverse
-
-
-def userAlreadyRegisteredEmail(request, email, is_independent_student=False):
-    if is_independent_student:
-        login_url = reverse("independent_student_login")
-    else:
-        login_url = reverse("teacher_login")
-
-    return {
-        "subject": f"Duplicate account",
-        "message": (
-            f"A user is already registered with this email address: {email}.\n"
-            f"If you've already registered, please login: "
-            f"{request.build_absolute_uri(login_url)}.\n"
-            f"Otherwise please register with a different email address."
-        ),
-    }
-
-
-def kickedEmail(request, schoolName):
-    return {
-        "subject": f"You were successfully released from your school or club",
-        "message": (
-            f"You have been released from the school or club '{schoolName}'. "
-            f"If you think this was an error, please contact the administrator of that "
-            f"school or club."
-        ),
-    }
-
-
-def studentJoinRequestSentEmail(request, schoolName, accessCode):
-    return {
-        "subject": f"School or club join request sent",
-        "message": (
-            f"Your request to join the school or club '{schoolName}' in class "
-            f"{accessCode} has been sent to that class's teacher, who will either "
-            f"accept or deny your request."
-        ),
-    }
-
-
-def studentJoinRequestNotifyEmail(request, username, email, accessCode):
-    return {
-        "subject": f"School or club join request",
-        "message": (
-            f"There is a request waiting from student with username '{username}' and "
-            f"email {email} to join your class {accessCode}. "
-            f"Please log in to your dashboard to review the request."
-        ),
-    }
-
-
-def studentJoinRequestRejectedEmail(request, schoolName, accessCode):
-    return {
-        "subject": f"School or club join request rejected",
-        "message": (
-            f"Your request to join the school or club '{schoolName}' in class "
-            f"{accessCode} has been rejected. Speak to your teacher if you think this "
-            f"is an error."
-        ),
-    }
-
-
-def inviteTeacherEmail(request, schoolName, token, account_exists):
-    url = f"{request.build_absolute_uri(reverse('invited_teacher', kwargs={'token': token}))} "
-
-    if account_exists:
-        message = (
-            f"A teacher at the school '{schoolName}' has invited you to join Code for Life. 🎉 Unfortunately, you "
-            f"already have an account with this email address, so you will need to either delete it first or change "
-            f"the email registered to your other account. After that, you can complete the registration process, by "
-            f"following the link below.\n\n"
-            f"{url}"
-        )
-    else:
-        message = (
-            f"A teacher at the school '{schoolName}' has invited you to join Code for Life. 🎉 To complete the "
-            f"registration process, please create a password by following the link below.\n\n"
-            f"{url}"
-        )
-
-    return {"subject": f"You've been invited to join Code for Life", "message": message}
-
-
-def accountDeletionEmail(request):
-    return {
-        "subject": f"We are sorry to see you go",
-        "title": "Your account was successfully deleted",
-        "message": (
-            f"If you have a moment before you leave us completely, please "
-            f"let us know the reason through our super short survey below."
-            f"\n\nGive feedback: https://usabi.li/do/d8e0313a31d7/5bef"
-            f"\n\nThank you for being part of the Code for Life community!"
-        ),
-    }