codeforlife-portal 6.41.5__py2.py3-none-any.whl → 6.41.6__py2.py3-none-any.whl

{codeforlife_portal-6.41.5.dist-info → codeforlife_portal-6.41.6.dist-info}/RECORD

@@ -1,27 +1,28 @@
 cfl_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cfl_common/setup.py,sha256=5Rk-FXyWToTujXqGRYqeA0A5nJ4NC5woXxyb6NLLbpo,818
 cfl_common/common/__init__.py,sha256=XlncBOpKp_gekbKH7Y_i6yu1qy5tJc3Y8sn8cDy-Vgk,48
-cfl_common/common/app_settings.py,sha256=IlFosu8P-m3ZOWnlX9MZupuLe2tFUDzQarBjYNDQ3kg,2491
+cfl_common/common/app_settings.py,sha256=x2ROLY5Xl5LgqjxyTiChZvQorZYUXpFzEkaLsjh8UHo,2586
 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=YlzJ98Fjv3Qe8XkIIakXOQx93yKFNIsS_vdrqGG7LeQ,7702
+cfl_common/common/email_messages.py,sha256=res-Uh_0KihJdvXKZg9EbvQ4ohQwS2rlR2wNHcazLoo,5009
+cfl_common/common/mail.py,sha256=EsqghHcRbrvCHI-eVcd88PrVVvsz1ZMbUzHrWne3nyE,4192
 cfl_common/common/models.py,sha256=vnvy8U-sHopyaxgJK9wTxelbKsCnYMjuEu3HIuAEkrs,14974
 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=05OteSWSuCLt2BRIlRhHCNWVigYjyoiaMw323ZKFZPk,1778
-cfl_common/common/helpers/emails.py,sha256=R1QVmAA2Nwcu3Lyxt02N2yjQzCg9fcVN-Pyl1gRaIrI,11316
-cfl_common/common/helpers/generators.py,sha256=wJ90XBe5zN-JXEPSpnQhCG0sdpBLEBUj1MG2K_GOWPk,1505
+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/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
-cfl_common/common/migrations/0002_emailverification.py,sha256=_tbAHuICs2y5Rdahry98GQ5plBh46SQ-0nZGrfTQAlY,2156
+cfl_common/common/migrations/0002_emailverification.py,sha256=csWNasKNB5HQfrg5Owa6ovwx9f-v3ved-1B6QSu2_3s,2094
 cfl_common/common/migrations/0003_aimmocharacter.py,sha256=ZS_-sJCVUnFdhDjyH75P5bryg5QKHPDfe-SXXK7k9KM,922
 cfl_common/common/migrations/0004_add_aimmocharacters.py,sha256=543WKEphsvdKo8Z7f8wPgZHGxRPWMdo288O5_7edawo,430
-cfl_common/common/migrations/0005_add_worksheets.py,sha256=Y9cN3d0K-NLDwyjNE0QGOnD9UUHBNtp2AOlbp_p7FXQ,412
+cfl_common/common/migrations/0005_add_worksheets.py,sha256=lIfjiNEOGiGEsrJJCN-BVaOcyidlT3s9uhwpCfyHFV0,376
 cfl_common/common/migrations/0006_update_aimmo_character_image_path.py,sha256=De1d02dAYE2KT8uW1qPi0NmWp45_zXVNH7kjWg3f2ko,431
-cfl_common/common/migrations/0007_add_pdf_names_to_first_two_worksheets.py,sha256=xoJQig-M4KXww9wHaSQNDoK2cc6dpfKd4qccD8wGZR8,431
-cfl_common/common/migrations/0008_unlock_worksheet_3.py,sha256=AxMwnF7sBsWq83e-FqtOwQ3f58FrYLzECjjNBBamvfA,381
+cfl_common/common/migrations/0007_add_pdf_names_to_first_two_worksheets.py,sha256=dQBI3VzqS8CpnpmQfXx_sNVDynhQL-KxwJNl38cgJi4,395
+cfl_common/common/migrations/0008_unlock_worksheet_3.py,sha256=WzTdGbSjYNlyxNLVRMPWOhNBkR5e-lRewu0xBy5d69c,345
 cfl_common/common/migrations/0009_add_blocked_time_to_teacher_and_student.py,sha256=hdff316HkAVCB0EW61qbR2lxwkxSTsD7OBK66PLBUUQ,599
 cfl_common/common/migrations/0010_remove_teacher_title.py,sha256=dMX-wgD-nzRx2AmrvuLMtb1X7TIv1gZ9icacFgI1LNc,396
 cfl_common/common/migrations/0011_student_login_id.py,sha256=0sMdbzshOu_hT3s7uC0ILKd4PA1waw14y83Re736788,400
@@ -30,36 +31,36 @@ cfl_common/common/migrations/0013_class_school.py,sha256=n5slnrrOFnrBsjAmkdcRxIU
 cfl_common/common/migrations/0014_login_type.py,sha256=_liGPnErUKWj2hfErZjkw--2BM8pZCYIvdg96uJts08,817
 cfl_common/common/migrations/0015_dailyactivity.py,sha256=jbzA7hwcEd7mg-w0he-OMpVGSUrjYuWW_QFXY2RWzjk,901
 cfl_common/common/migrations/0016_joinreleasestudent.py,sha256=bu7s-artUHMRPxP0Rnbw10cQy47c2_GYOD8fzzHgXQ8,1208
-cfl_common/common/migrations/0017_copy_email_to_username.py,sha256=nx1Y30Ngj_FuuBCR1C1hUZjYV-_hCTKoyoQyulVBzog,637
+cfl_common/common/migrations/0017_copy_email_to_username.py,sha256=oon4z_fHDxABJ-J3T3IeucAJPl2lYCu75zcZk0a1xfs,587
 cfl_common/common/migrations/0018_update_aimmo_character_image_path.py,sha256=WKrxcjGjQ2pE4lcubkU37nsThmHbeVni9tCNSQWm8Sk,387
 cfl_common/common/migrations/0019_aimmocharacter_alt.py,sha256=vhcO1-1TFNYJ2ILLj-tHq_z7jlhd9URwColHqTh11m8,418
 cfl_common/common/migrations/0020_class_is_active_and_null_access_code.py,sha256=g0frY5T5AuVwCPIhj9UEtyB0lyMktl285eBJtLpN-zk,555
-cfl_common/common/migrations/0021_school_is_active.py,sha256=3hHNUkBRtKlqVNuOu4ZL3bJvFcX1QO276Hz8IjIhBNg,736
-cfl_common/common/migrations/0022_school_cleanup.py,sha256=JsIHrz2w-JD5BiAYs-Evnqht6_mQ37YxTs9oLjlcH0A,661
-cfl_common/common/migrations/0023_userprofile_aimmo_badges.py,sha256=FQP_Q-phm1PnI05sy5KkEH02v0vhury4oNNrDJiyBbM,515
+cfl_common/common/migrations/0021_school_is_active.py,sha256=S1HjZIalqLSbqrTu7AF0xvqZEbzcvLCCa1rMa7Pnc-w,736
+cfl_common/common/migrations/0022_school_cleanup.py,sha256=r3YYnC6gJtBy5Ewa8_cjDxvK-W3oEm1IKopn-UXVyXg,661
+cfl_common/common/migrations/0023_userprofile_aimmo_badges.py,sha256=NsOOw2XB03k4U5-2wDzuvN7P69IHLNKcjsPLMxmJbPM,515
 cfl_common/common/migrations/0024_teacher_invited_by.py,sha256=UxsKaGB16y7NjH6mrqZceNLi3tERgLb7gxS14ozsTjw,632
-cfl_common/common/migrations/0025_schoolteacherinvitation.py,sha256=xX4SiJ4d6t30YewNYrEZmcOGTRLQwdnuRO2MIcewyVw,1463
-cfl_common/common/migrations/0026_teacher_remove_join_request.py,sha256=81rqW8d_x6pXX61U24TQdh6aj_Bf-nibSQFHxXCK5fQ,528
-cfl_common/common/migrations/0027_class_created_by.py,sha256=rKITmkyvX2iiQs-CFLOXrsoMEnWv6PqXz5G2GyGSDxo,537
-cfl_common/common/migrations/0028_coding_club_downloads.py,sha256=b-d7cNTk2d2cZzAhtfcrzV7aIn0xuPkRNXooZcEaBOI,606
-cfl_common/common/migrations/0029_dynamicelement.py,sha256=os-svhr2Xfnw6pR_pseAFdCzvTULexl7_LLG7IK60mc,684
-cfl_common/common/migrations/0030_add_maintenance_banner.py,sha256=8DxUo9YJXC_2yAPXP1t0fFU2r3I593zl6k3hB_Yapao,865
-cfl_common/common/migrations/0031_improve_admin_panel.py,sha256=GdhVIkd7HzqcklrbBi4iGWQX2qqU4okghyFxENls5-s,1380
-cfl_common/common/migrations/0032_dailyactivity_level_control_submits.py,sha256=eI5DgJLxlNrNPZiaeleRauMG3qTDgywkLAmVnrz7JL4,417
-cfl_common/common/migrations/0033_password_reset_tracking_fields.py,sha256=Xoz5Qvhjw1x2fNO1yJ4-LjBXspqtHYKoJDNCTKjtg78,619
-cfl_common/common/migrations/0034_dailyactivity_daily_school_student_lockout_reset.py,sha256=hnZoJf1_GwhIPzjrQMp72-CCXFXtuWGhaClNM-1gmw8,438
-cfl_common/common/migrations/0035_rename_lockout_fields.py,sha256=LCB0Cl-HhEsGazXVJDw6m3RLStRAKsHHtYEVEC4t-xw,808
+cfl_common/common/migrations/0025_schoolteacherinvitation.py,sha256=Ba2gpIfeCkPGDnB6JqbM1DXlixkLqsbE3voKVK9Gvok,1819
+cfl_common/common/migrations/0026_teacher_remove_join_request.py,sha256=U7hfnmNwQ0c6yzkiXhMrm2AdgrQszTjBal4U-v0H_VE,528
+cfl_common/common/migrations/0027_class_created_by.py,sha256=H9T78SxvnrM0mjh5l_msa060MsJoWZ_bV-VizBElNpc,632
+cfl_common/common/migrations/0028_coding_club_downloads.py,sha256=RLp7-M95MhwHCZfvo2qHfA_KZXa4pqXBni1Kaf26kOw,606
+cfl_common/common/migrations/0029_dynamicelement.py,sha256=T48j7Uwik_H0bg8eFpSxB-PgxEfmPlPgrr19UFETrj4,684
+cfl_common/common/migrations/0030_add_maintenance_banner.py,sha256=gZAVSbUPfZBTXHlJ_vjO4XwlAgIm6JcR59xZWawS4Ns,851
+cfl_common/common/migrations/0031_improve_admin_panel.py,sha256=UAOBZUS5jR071ciQjO-CoEN6y4BJqMSD1YvYwJBd3FI,1665
+cfl_common/common/migrations/0032_dailyactivity_level_control_submits.py,sha256=E6KiHkUXs1ka0SknETP_HXRTr1cKELPBIj5WgVdZNS8,417
+cfl_common/common/migrations/0033_password_reset_tracking_fields.py,sha256=s2kqLCJBeAIeYJjdlRdXHlmNwZb7Czq7omJp51VKc8M,619
+cfl_common/common/migrations/0034_dailyactivity_daily_school_student_lockout_reset.py,sha256=j3OKxJZTK4NQKVx2JkcK4o9Ie6C9yqbQHfZRsn4NIZg,438
+cfl_common/common/migrations/0035_rename_lockout_fields.py,sha256=1UbvNJ1Qf2SNqGRRJCjXhxHi_rnJuToUW8DEF-tH0ZM,808
 cfl_common/common/migrations/0036_rename_awaiting_email_verification_userprofile_is_verified.py,sha256=wmfENAwFqegcBJYk0wcFdgvY-m2BlGAFQjt-wNO6kBM,396
-cfl_common/common/migrations/0037_migrate_email_verification.py,sha256=kyGg5gvkaiwE-OFQBycKzykackLrkCTGFZcKCHfFMSM,1022
-cfl_common/common/migrations/0038_delete_emailverification.py,sha256=3u-vRF52IrpQvzkgUI7offAKCbBf2RKDxW-s_32c4S8,314
-cfl_common/common/migrations/0039_copy_email_to_username.py,sha256=us1CmVFxE_ntYhZpgtDerEzcQKBa0ytzGsjERG_F_uA,589
-cfl_common/common/migrations/0040_school_county.py,sha256=vnHuXh52NCTYhg4Os_AIwmwmtfdLSFKp26SAVCKw-i4,411
+cfl_common/common/migrations/0037_migrate_email_verification.py,sha256=zC8rZ3xFhkbHqr3oUyTO2XHleqbx8o9wA2S_24_Y6kY,1018
+cfl_common/common/migrations/0038_delete_emailverification.py,sha256=JTjGGrcJQY7sagMWLTn8jWP4Ldm99LwWo8Sn7QgfIgw,314
+cfl_common/common/migrations/0039_copy_email_to_username.py,sha256=h2NwkcMJ1pBCVKtEj9spM72hG4zm0JnWKXkQI7i9p48,552
+cfl_common/common/migrations/0040_school_county.py,sha256=LuPMnxLXOVZDlIeFtKr5wNrxBvVVrcjbnXyCjWgq4QQ,411
 cfl_common/common/migrations/0041_populate_gb_counties.py,sha256=74pFXOqUcPh8fCyhlOGQNUd0yzfDCUDR-Y2aO6UyP_Y,898
-cfl_common/common/migrations/0042_totalactivity.py,sha256=AqYs9BkYsG3xDzJ-yj3JBsxSyrOQSZnDwOR-DY_NFPY,810
+cfl_common/common/migrations/0042_totalactivity.py,sha256=U8nY0lcnreU4ugWpt8xi8lSDDRDg3cnV7liYVU_MxNw,810
 cfl_common/common/migrations/0043_add_total_activity.py,sha256=9dCx3-uCrmG5XS9snhTeFEOpaqFWZvjIvkgukYldZ4I,1065
-cfl_common/common/migrations/0044_update_activity_models.py,sha256=xP-rLNuWVk81SzTiPW1TS9RkqTSydmHH-Gp53IiwHiw,997
-cfl_common/common/migrations/0045_otp.py,sha256=a-D6ScRLcQ9U3RuyjNBcQzaPSRemFcPvLSkr1ItgzMg,599
-cfl_common/common/migrations/0046_alter_school_country.py,sha256=otxmKezNM_Qvpfe49EQ_V2zLn2SkB9RD8qjHFaUhR3c,437
+cfl_common/common/migrations/0044_update_activity_models.py,sha256=9ZwggtsiMB8LzKQEoyeDSIaADbz_wFk55bt-C9wSooY,997
+cfl_common/common/migrations/0045_otp.py,sha256=_GmCOFOINqFMBqPBvdBaR1nwAI_FkzIlMTq_kfaN1IQ,599
+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/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -71,10 +72,10 @@ cfl_common/common/tests/test_migration_remove_teacher_title.py,sha256=wwm6tayb75
 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=bS4xnwhKiSD5S0-IlQtSwvs2ynZNMh93mrIBvUpAb6M,2927
+cfl_common/common/tests/utils/email.py,sha256=lNLl1SoQUnRAI0Z7nuaUS8HQwt9YHVc-YB9rqdYzyrw,2190
 cfl_common/common/tests/utils/organisation.py,sha256=vNgKFtU3VPcWRnZfh82yCS90PLAK1XTYJNIxGwfgUI4,966
-cfl_common/common/tests/utils/student.py,sha256=h7w2UPGQHl1dNruzIfEnbeMbD4mhPYt2bj_8iqLkH_4,4239
-cfl_common/common/tests/utils/teacher.py,sha256=lBhNrusANKhPqMKgQN_6xg3hHS2tjGkqrsRvLjhekPo,2324
+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/user.py,sha256=NvLzZLVP4jy5Hn1iztOYF_BTQ9WsbSmuWMEzGzhAsRU,919
 deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deploy/captcha.py,sha256=MbOBuGnbT_SOIltSjP1XMOLrfo1DldCilaVAEim0vM4,23
@@ -95,11 +96,11 @@ deploy/static/robots.txt,sha256=5cS4RITuQhbpNzvpk4AyDCXdlIBfmfCoBYRvCHY2VT8,24
 deploy/templates/deploy/csrf_failure.html,sha256=-pBRPn4Y7nUdYHGpTHCokT9Boi-isuwuivF8V2K1SgM,412
 example_project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 example_project/manage.py,sha256=EUgybZlZ7xk2Zf2KCwBbK_z7gf7Ifqs0_bl4Kijhdgo,242
-example_project/portal_test_settings.py,sha256=dxxdij_LiYDSQIsnoeuJ6y0Kob0rCC0CNJIrBoQ4Xyk,7181
+example_project/portal_test_settings.py,sha256=fkbeU36YhWvNbR_hm28Rq4pV6ln-dGHK1VdML_1CToY,7227
 example_project/settings.py,sha256=GLelTfsnhAuf_rqjXUoIWoLtzKvr-9l8UQDQ23rxPQc,5580
 example_project/urls.py,sha256=OVeRQ-TCpzHISBRuzqD0yd3ewF7H5U3c-f2p2alfUD0,430
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=W7a69GHPeZkX6OrrDZxmHgUlk8Qd3F0Pwexx_RKDOhM,23
+portal/__init__.py,sha256=999dLIVurJM2yzNmRoSaZj8TtiA2BNl-SI7UXD1Wf3E,23
 portal/admin.py,sha256=k5Hsiln43DlVPoufnrx5AXWu_RijX8xi_n7wwBuuCJo,5132
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -537,18 +538,18 @@ portal/tests/test_class.py,sha256=V6Fkc6PqdisefKD3xs9PbfE2pKp-9e0gwQVkPUiu6bk,14
 portal/tests/test_daily_activities.py,sha256=-siDCMGBD1ijjccHVk7eEmrk4bgTsvbh0B6hDoj2fo0,1803
 portal/tests/test_emails.py,sha256=-rI3FlJO7n9qfZ8Vz_Fe3DmjOngr4r23PCpjIoRxNY0,9133
 portal/tests/test_helper_methods.py,sha256=-SQCDZm2XUtyXGEp0CHIb_SSC9CPD-XOSnpnY8QclHk,890
-portal/tests/test_independent_student.py,sha256=FB7YaQaio_NJGvPPVxl7XZk-zN2Fu0itdQb7W8psudo,25003
+portal/tests/test_independent_student.py,sha256=Kl2dyZh6-4TdlwWpsi2w1q54SoC_P2YWEvjJXrd6LdY,25857
 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_partials.py,sha256=ydh1nef6BqvMfah2BSBS9QDiKY0xopY74k_W1YVobAE,3687
-portal/tests/test_ratelimit.py,sha256=WWirzWPuFJp5K8PyXIa-QuBk5rFysTRg37w8Zznb_0M,18735
+portal/tests/test_ratelimit.py,sha256=-nlQHOT0Mk_9IKnKYa_t82Y6EL6oZD8uVZ5rof4C1O0,19144
 portal/tests/test_school_student.py,sha256=bFZwY4twaFHQLp0cltMq8cLNDZGgCHTZBCZHK0JcV8s,8604
 portal/tests/test_security.py,sha256=FGrlRfnzi-Xx2_bn4fTZlYORKm7w_GhGkD3havvplwc,3239
-portal/tests/test_teacher.py,sha256=T9ZUgbAmi3lwEVJy8zUsMwkLfcgBPjU0tORjPz9dxIE,35299
-portal/tests/test_teacher_student.py,sha256=B7mX6tuJPxXLFC3mjV1G-uyDSSLTGBauuuRxAYydGXM,21228
-portal/tests/test_views.py,sha256=ZWQE9DQnZxvhjK3ygyFh5JH9sndUaiiI8zJNVjrWrdI,41080
+portal/tests/test_teacher.py,sha256=mft_xw97AkNi5OGprafpMMdGM1L1J_sMedBBg_Unb9k,36139
+portal/tests/test_teacher_student.py,sha256=NWITbUw1kijqu3c8eRHLHJKaYQMOsOMvl7PAVx5QghI,21567
+portal/tests/test_views.py,sha256=6y4ICpo5KPTWQed3J1Hg74ZGBKI2y3-HNHAowOsge80,38769
 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
@@ -620,7 +621,7 @@ 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
 portal/views/cron/__init__.py,sha256=5rxXyhJmLOExRdrYZ1VJttTsyRIPRybzdftbUDwFByI,20
-portal/views/cron/user.py,sha256=gtZW-cGpgb0Rvpjwv_ge5Piw2ClolTgC6BDSpVD0EzE,8025
+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
@@ -635,8 +636,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.41.5.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-6.41.5.dist-info/METADATA,sha256=7Z9vG1kRYxFAzbXra0yCUKroW1Y1zSmcc9fVWU2LSj8,1169
-codeforlife_portal-6.41.5.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-codeforlife_portal-6.41.5.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-6.41.5.dist-info/RECORD,,
+codeforlife_portal-6.41.6.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-6.41.6.dist-info/METADATA,sha256=57Xioq1NyqGfmTvTgctiYOeTCqOfxc-u6jvMuGdoqR4,1169
+codeforlife_portal-6.41.6.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+codeforlife_portal-6.41.6.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-6.41.6.dist-info/RECORD,,

example_project/portal_test_settings.py

@@ -1,5 +1,7 @@
 """Django settings for example_project project."""
+
 import os
+
 from selenium import webdriver
 
 DEBUG = True
@@ -33,6 +35,8 @@ if os.environ.get("SELENIUM_HEADLESS", None):
 ROOT_URLCONF = "example_project.urls"
 SECRET_KEY = "bad_test_secret"
 
+DOTDIGITAL_AUTH = "dummy_dotdigital_auth"
+
 DOTMAILER_CREATE_CONTACT_URL = "https://test-create-contact/"
 DOTMAILER_DELETE_USER_BY_ID_URL = "https://test-delete-contact/"
 DOTMAILER_MAIN_ADDRESS_BOOK_URL = "https://test-main-address-book/"
@@ -169,7 +173,7 @@ TEMPLATES = [
                 "common.context_processors.cookie_management_enabled",
                 "portal.context_processors.process_newsletter_form",
             ]
-        }
+        },
     }
 ]
 

portal/__init__.py

@@ -1 +1 @@
-__version__ = "6.41.5"
+__version__ = "6.41.6"

portal/tests/test_independent_student.py

@@ -2,11 +2,16 @@ from __future__ import absolute_import
 
 import datetime
 import time
+from unittest.mock import ANY, Mock, patch
 
+from common.mail import campaign_ids
 from common.models import JoinReleaseStudent
 from common.tests.utils import email as email_utils
 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_independent_student,
     create_independent_student_directly,
@@ -137,7 +142,8 @@ class TestIndependentStudent(TestCase):
         # Assert response isn't a redirect (submit failure)
         assert response.status_code == 200
 
-    def test_signup_under_13_sends_parent_email(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_signup_under_13_sends_parent_email(self, mock_send_dotdigital_email: Mock):
         c = Client()
 
         response = c.post(
@@ -156,8 +162,9 @@ class TestIndependentStudent(TestCase):
         )
 
         assert response.status_code == 302
-        assert len(mail.outbox) == 1
-        assert mail.outbox[0].subject == "Code for Life account request"
+        mock_send_dotdigital_email.assert_called_once_with(
+            campaign_ids["verify_new_user_via_parent"], ANY, personalization_values=ANY
+        )
 
 
 # Class for Selenium tests. We plan to replace these and turn them into Cypress tests
@@ -256,16 +263,20 @@ class TestIndependentStudentFrontend(BaseTest):
         page = page.independent_student_login(username, password)
         assert self.is_dashboard(page)
 
-    def test_login_not_verified(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_login_not_verified(self, mock_send_dotdigital_email):
         username, password, _ = create_independent_student_directly(preverified=False)
         self.selenium.get(self.live_server_url)
         page = HomePage(self.selenium)
         page = page.go_to_independent_student_login_page()
         page = page.independent_student_login_failure(username, password)
 
+        errors = page.has_login_failed("independent_student_login_form", INVALID_LOGIN_MESSAGE)
         assert page.has_login_failed("independent_student_login_form", INVALID_LOGIN_MESSAGE)
 
-        verify_email(page)
+        verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
+
+        verify_email(page, verification_url)
 
         assert is_email_verified_message_showing(self.selenium)
 
@@ -340,7 +351,8 @@ class TestIndependentStudentFrontend(BaseTest):
             "student_account_form", "Names may only contain letters, numbers, dashes, underscores, and spaces."
         )
 
-    def test_change_email(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_change_email(self, mock_send_dotdigital_email):
         homepage = self.go_to_homepage()
 
         _, _, _, student_email, password = create_independent_student(homepage)
@@ -354,9 +366,9 @@ class TestIndependentStudentFrontend(BaseTest):
         assert is_student_details_updated_message_showing(self.selenium)
         assert is_email_updated_message_showing(self.selenium)
 
-        subject = str(mail.outbox[0].subject)
-        assert subject == "Email address update"
-        mail.outbox = []
+        mock_send_dotdigital_email.assert_called_with(
+            campaign_ids["email_change_notification"], ANY, personalization_values=ANY
+        )
 
         # Try changing email to an existing teacher's email
         teacher_email, _ = signup_teacher_directly()
@@ -372,9 +384,9 @@ class TestIndependentStudentFrontend(BaseTest):
         assert is_student_details_updated_message_showing(self.selenium)
         assert is_email_updated_message_showing(self.selenium)
 
-        subject = str(mail.outbox[0].subject)
-        assert subject == "Email address update"
-        mail.outbox = []
+        mock_send_dotdigital_email.assert_called_with(
+            campaign_ids["email_change_notification"], ANY, personalization_values=ANY
+        )
 
         page = (
             self.go_to_homepage()
@@ -402,11 +414,12 @@ class TestIndependentStudentFrontend(BaseTest):
 
         page = page.logout()
 
-        subject = str(mail.outbox[0].subject)
-        assert subject == "Email address update"
+        mock_send_dotdigital_email.assert_called_with(
+            campaign_ids["email_change_verification"], ANY, personalization_values=ANY
+        )
+        verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
 
-        page = email_utils.follow_change_email_link_to_independent_dashboard(page, mail.outbox[1])
-        mail.outbox = []
+        page = email_utils.follow_change_email_link_to_independent_dashboard(page, verification_url)
 
         page = page.independent_student_login(new_email, password)
 

portal/tests/test_ratelimit.py

@@ -2,10 +2,12 @@ from __future__ import absolute_import
 
 import re
 from datetime import datetime, timedelta
+from unittest.mock import ANY, Mock, patch
 
 import pytest
 import pytz
-from common.models import Teacher, Student, DailyActivity
+from common.mail import campaign_ids
+from common.models import DailyActivity, Student, Teacher
 from common.tests.utils.classes import create_class_directly
 from common.tests.utils.organisation import create_organisation_directly
 from common.tests.utils.student import (
@@ -13,11 +15,10 @@ from common.tests.utils.student import (
     create_school_student_directly,
     generate_independent_student_details,
 )
-from common.tests.utils.teacher import signup_teacher_directly, generate_details
+from common.tests.utils.teacher import generate_details, signup_teacher_directly
 from django.core import mail
 from django.test import Client, TestCase
-from django.urls import reverse
-from django.urls import reverse_lazy
+from django.urls import reverse, reverse_lazy
 
 from portal.helpers.ratelimit import get_ratelimit_count_for_user
 from portal.views.login import has_user_lockout_expired
@@ -432,8 +433,9 @@ class TestRatelimit(TestCase):
         assert current_daily_activity.school_student_lockout_resets == 2
 
 
+@patch("common.helpers.emails.send_dotdigital_email")
 @pytest.mark.django_db
-def test_teacher_already_registered_email(client):
+def test_teacher_already_registered_email(mock_send_dotdigital_email: Mock, client):
     first_name, last_name, email, password = generate_details()
     register_url = reverse("register")
     data = {
@@ -448,19 +450,20 @@ def test_teacher_already_registered_email(client):
 
     # Register the teacher first time, there should be a registration email
     client.post(register_url, data)
-    assert len(mail.outbox) == 1
+    mock_send_dotdigital_email.assert_called_once_with(campaign_ids["verify_new_user"], ANY, personalization_values=ANY)
 
     # Register with the same email again, there should also be an already registered email
     client.post(register_url, data)
-    assert len(mail.outbox) == 2
+    assert len(mail.outbox) == 1
 
     # Register with the same email one more time, there shouldn't be any new emails
     client.post(register_url, data)
-    assert len(mail.outbox) == 2
+    assert len(mail.outbox) == 1
 
 
+@patch("common.helpers.emails.send_dotdigital_email")
 @pytest.mark.django_db
-def test_independent_student_already_registered_email(client):
+def test_independent_student_already_registered_email(mock_send_dotdigital_email: Mock, client):
     name, username, email_address, password = generate_independent_student_details()
     register_url = reverse("register")
     data = {
@@ -477,12 +480,12 @@ def test_independent_student_already_registered_email(client):
 
     # Register the independent student first time, there should be a registration email
     client.post(register_url, data)
-    assert len(mail.outbox) == 1
+    mock_send_dotdigital_email.assert_called_once_with(campaign_ids["verify_new_user"], ANY, personalization_values=ANY)
 
     # Register with the same email again, there should also be an already registered email
     client.post(register_url, data)
-    assert len(mail.outbox) == 2
+    assert len(mail.outbox) == 1
 
     # Reset mock and register with the same email one more time, there shouldn't be any new emails
     client.post(register_url, data)
-    assert len(mail.outbox) == 2
+    assert len(mail.outbox) == 1

portal/tests/test_teacher.py

@@ -1,17 +1,24 @@
 from __future__ import absolute_import
 
-import re
 import time
 from datetime import timedelta
+from unittest.mock import ANY, Mock, patch
 from uuid import uuid4
 
 import jwt
 from aimmo.models import Game
+from common.mail import campaign_ids
 from common.models import Class, Student, Teacher
 from common.tests.utils import email as email_utils
 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.student import create_independent_student_directly, create_school_student_directly
+from common.tests.utils.organisation import (
+    create_organisation_directly,
+    join_teacher_to_organisation,
+)
+from common.tests.utils.student import (
+    create_independent_student_directly,
+    create_school_student_directly,
+)
 from common.tests.utils.teacher import (
     signup_duplicate_teacher_fail,
     signup_teacher,
@@ -357,7 +364,8 @@ class TestTeacher(TestCase):
         # Assert response isn't a redirect (submit failure)
         assert response.status_code == 200
 
-    def test_signup_email_verification(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_signup_email_verification(self, mock_send_dotdigital_email: Mock):
         c = Client()
 
         response = c.post(
@@ -374,7 +382,9 @@ class TestTeacher(TestCase):
         )
 
         assert response.status_code == 302
-        assert len(mail.outbox) == 1
+        mock_send_dotdigital_email.assert_called_once_with(
+            campaign_ids["verify_new_user"], ANY, personalization_values=ANY
+        )
 
         # Try verification URL with a fake token
         fake_token = jwt.encode(
@@ -393,9 +403,8 @@ class TestTeacher(TestCase):
         # Assert response isn't a redirect (get failure)
         assert bad_verification_response.status_code == 200
 
-        # Get verification link from email
-        message = str(mail.outbox[0].body)
-        verification_url = re.search("http.+/", message).group(0)
+        # Get verification link from function call
+        verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
 
         # Verify the email properly
         verification_response = c.get(verification_url)
@@ -472,7 +481,8 @@ class TestTeacherFrontend(BaseTest):
         page = page.login(email, password)
         assert self.is_dashboard_page(page)
 
-    def test_login_not_verified(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_login_not_verified(self, mock_send_dotdigital_email):
         email, password = signup_teacher_directly(preverified=False)
         create_organisation_directly(email)
         _, _, access_code = create_class_directly(email)
@@ -484,7 +494,9 @@ class TestTeacherFrontend(BaseTest):
 
         assert page.has_login_failed("form-login-teacher", INVALID_LOGIN_MESSAGE)
 
-        verify_email(page)
+        verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
+
+        verify_email(page, verification_url)
 
         assert is_email_verified_message_showing(self.selenium)
 
@@ -537,7 +549,8 @@ class TestTeacherFrontend(BaseTest):
 
         assert page.check_account_details({"first_name": "Florian", "last_name": "Aucomte"})
 
-    def test_change_email(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_change_email(self, mock_send_dotdigital_email):
         email, password = signup_teacher_directly()
         create_organisation_directly(email)
         _, _, access_code = create_class_directly(email)
@@ -553,9 +566,9 @@ class TestTeacherFrontend(BaseTest):
         assert self.is_email_verification_page(page)
         assert is_email_updated_message_showing(self.selenium)
 
-        subject = str(mail.outbox[0].subject)
-        assert subject == "Email address update"
-        mail.outbox = []
+        mock_send_dotdigital_email.assert_called_with(
+            campaign_ids["email_change_notification"], ANY, personalization_values=ANY
+        )
 
         # Try changing email to an existing indy student's email, should fail
         indy_email, _, _ = create_independent_student_directly()
@@ -566,9 +579,9 @@ class TestTeacherFrontend(BaseTest):
         assert self.is_email_verification_page(page)
         assert is_email_updated_message_showing(self.selenium)
 
-        subject = str(mail.outbox[0].subject)
-        assert subject == "Email address update"
-        mail.outbox = []
+        mock_send_dotdigital_email.assert_called_with(
+            campaign_ids["email_change_notification"], ANY, personalization_values=ANY
+        )
 
         page = self.go_to_homepage()
         page = page.go_to_teacher_login_page().login(email, password).open_account_tab()
@@ -586,11 +599,12 @@ class TestTeacherFrontend(BaseTest):
 
         page = page.logout()
 
-        subject = str(mail.outbox[0].subject)
-        assert subject == "Email address update"
+        mock_send_dotdigital_email.assert_called_with(
+            campaign_ids["email_change_verification"], ANY, personalization_values=ANY
+        )
+        verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
 
-        page = email_utils.follow_change_email_link_to_dashboard(page, mail.outbox[1])
-        mail.outbox = []
+        page = email_utils.follow_change_email_link_to_dashboard(page, verification_url)
 
         page = page.login(new_email, password).open_account_tab()
 

portal/tests/test_teacher_student.py

@@ -1,11 +1,15 @@
 from __future__ import absolute_import
 
 import json
+from unittest.mock import Mock, patch
 
 import pytest
 from common.models import JoinReleaseStudent
 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_many_school_students,
     create_school_student,
@@ -528,7 +532,8 @@ class TestTeacherStudentFrontend(BaseTest):
         page = page.logout().go_to_teacher_login_page().login(email_2, password_2).open_classes_tab().go_to_class_page()
         assert page.student_exists(student_name_1)
 
-    def test_dismiss(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_dismiss(self, mock_send_dotdigital_email: Mock):
         email, password = signup_teacher_directly()
         create_organisation_directly(email)
         _, _, access_code = create_class_directly(email)
@@ -557,7 +562,10 @@ class TestTeacherStudentFrontend(BaseTest):
         assert len(logs) == 1
         assert logs[0].action_type == JoinReleaseStudent.RELEASE
 
-    def test_multiple_dismiss(self):
+        mock_send_dotdigital_email.assert_called()
+
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_multiple_dismiss(self, mock_send_dotdigital_email: Mock):
         email, password = signup_teacher_directly()
         create_organisation_directly(email)
         _, _, access_code = create_class_directly(email)
@@ -597,3 +605,5 @@ class TestTeacherStudentFrontend(BaseTest):
 
         # student should still exist
         assert page.student_exists(student_name_2)
+
+        mock_send_dotdigital_email.assert_called()