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

cfl_common/common/email_messages.py

@@ -81,16 +81,3 @@ def inviteTeacherEmail(request, schoolName, token, account_exists):
         )
 
     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!"
-        ),
-    }

cfl_common/common/mail.py

@@ -10,6 +10,7 @@ from django.template import loader
 campaign_ids = {
     "admin_given": 1569057,
     "admin_revoked": 1569071,
+    "delete_account": 1567477,
     "email_change_notification": 1551600,
     "email_change_verification": 1551594,
     "reset_password": 1557153,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 6.43.1
+Version: 6.43.2
 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.2
 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.2.dist-info}/RECORD

@@ -5,8 +5,8 @@ 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/email_messages.py,sha256=J57n4krBAnwqacRjIzkO-qhbdlqNWwyJiRd8ozitm-M,3148
+cfl_common/common/mail.py,sha256=11WqmB770MmGJcATa4dOeyGHSYLceV8zZDPx_4kK-zI,6021
 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
@@ -106,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=Ngar-CylGsb6FZcYQn3kMXH5BOJ1Ub5AefCQXyRW8-E,23
+portal/__init__.py,sha256=hjhQopF2UeY6Ek3KDmWtiEswta3fxltdCEalD4TaXFA,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 +544,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=rW3OTFWxeEHm5tSumr1L4MRkUsEgESfhapU6M3bfNhc,26437
 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 +555,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
@@ -622,7 +622,7 @@ portal/views/home.py,sha256=J_kb0Kv5Ubk9yQ4r0IAvhPV5o_iezcaqA4Z5bd0-Idc,9869
 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,7 +633,7 @@ 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/edit_account_details.py,sha256=Ba-3D_zzKbX5N01NG5qqBS0ud10B8D5SN8hOpLiGa9U,8468
 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=nNA7XxylunLjyCpKmq7h_CYITi7wM3YnmjqzUL0A-bI,25236
@@ -642,8 +642,8 @@ portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 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.2.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-6.43.2.dist-info/METADATA,sha256=kUAWYPqcsp2m4LS4Kh6PwIr_K7GbBPgZA6qvvbO3XQE,1137
+codeforlife_portal-6.43.2.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+codeforlife_portal-6.43.2.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-6.43.2.dist-info/RECORD,,

portal/__init__.py

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

portal/tests/test_independent_student.py

@@ -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,7 +215,7 @@ 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()

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/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):