codeforlife-portal 7.3.3__py2.py3-none-any.whl → 7.3.5__py2.py3-none-any.whl

cfl_common/common/migrations/0055_alter_schoolteacherinvitation_token.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.25 on 2024-09-27 16:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0054_delete_aimmo_models'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='schoolteacherinvitation',
+            name='token',
+            field=models.CharField(max_length=88),
+        ),
+    ]

cfl_common/common/models.py

@@ -152,7 +152,7 @@ class SchoolTeacherInvitationModelManager(models.Manager):
 
 
 class SchoolTeacherInvitation(models.Model):
-    token = models.CharField(max_length=32)
+    token = models.CharField(max_length=88)
     school = models.ForeignKey(
         School,
         related_name="teacher_invitations",

{codeforlife_portal-7.3.3.dist-info → codeforlife_portal-7.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 7.3.3
+Version: 7.3.5
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
@@ -21,7 +21,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==7.3.3
+Requires-Dist: cfl-common==7.3.5
 Requires-Dist: django-ratelimit==3.0.1
 Requires-Dist: django-preventconcurrentlogins==0.8.2
 Requires-Dist: django-csp==3.7

{codeforlife_portal-7.3.3.dist-info → codeforlife_portal-7.3.5.dist-info}/RECORD

@@ -6,7 +6,7 @@ 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=9ECOLnp60ENRFAYEEIoYOMhqQzLgfKA-wkWxeUBwDrQ,2824
 cfl_common/common/mail.py,sha256=nCY5aRiyiBCudonewpHOQ3GnXhQu4HLJRaqx1vOYhfI,6799
-cfl_common/common/models.py,sha256=FB34xkpmTpYkvypgrDHv3QSRWnds69JnjHFw0X0fjrI,15989
+cfl_common/common/models.py,sha256=yAULJtzuF4loEt6mPrgZjwHGiQH6Hqm82etE7Sofvys,15989
 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
@@ -68,6 +68,7 @@ cfl_common/common/migrations/0051_verify_returning_users.py,sha256=WMpoTA24WgimL
 cfl_common/common/migrations/0052_add_cse_fields.py,sha256=NhUkkcu2EBzJFhewCTccQ63AoANkGq1CXbFWIGJG9jk,2232
 cfl_common/common/migrations/0053_clean_class_data.py,sha256=lBKlDa49YwT660o-Ot6IYe4I1KfervTn4uAijda0nyw,584
 cfl_common/common/migrations/0054_delete_aimmo_models.py,sha256=fmn4mDdlHr5DhPbIl_ygvGwWVFD8TZHAgQ6VUQQgCx8,415
+cfl_common/common/migrations/0055_alter_schoolteacherinvitation_token.py,sha256=lzPAMaI3zU_q25RuIos_LV97NXOa3MIn_eWaEL71Y4I,403
 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_migration_anonymise_orphan_schools.py,sha256=wJRyPgRvBsXLSCFdbBi2GXjgSgDbKUTRiM31CXIvpqs,1194
@@ -107,7 +108,7 @@ example_project/portal_test_settings.py,sha256=NfLY72mt1LR2c0_kxF-Yg5pCm2vQ52ece
 example_project/settings.py,sha256=Smpr5FHAaQQhXPgh6-Zsy-jnH5_ZV9htPTWJWlGqptI,5575
 example_project/urls.py,sha256=3SsP5jvPAXV5xmduka4zbSZB5PbXggjsalu1ojY5KIo,434
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=0toPzfNzgKGz4jRa-Ox6B7nbLNoBzmpwgBujvzkybx0,22
+portal/__init__.py,sha256=M1Lk7wtZo07-pOYT24InoD_8ELHmXmGPngYBeKjWKiQ,22
 portal/admin.py,sha256=on1-zNRnZvf2cwBN6GVRVYRhkaksrCgfzX8XPWtkvz8,6062
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -548,7 +549,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=vjnJi_aj_x48OJOMMRIBr0JTCxy4tFxqrLfCgw0fRxQ,29315
 portal/tests/test_teacher_student.py,sha256=NWITbUw1kijqu3c8eRHLHJKaYQMOsOMvl7PAVx5QghI,21567
-portal/tests/test_views.py,sha256=uyvdt-nlp-sN9NKl_hKeUgu7d0Z0kK-0g_nimi2boyY,45679
+portal/tests/test_views.py,sha256=krg_3ZPbpPti7WNFyQkP7Mg4yX4_1dErZAX2iRJ2hu0,46751
 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
@@ -616,7 +617,7 @@ portal/views/play_landing_page.py,sha256=FFmjUFub3ZdlbMqkB8yX3jAImCzqrUqgb8AZcpK
 portal/views/registration.py,sha256=L9AzIG2nOU946cSOXmUMQRtDo3uxApHX-0ceXopbOCw,10888
 portal/views/teach.py,sha256=nzlyTcgq9ImAjnqrF3esqi212qBLH5Ww1LKE2gSjoRY,210
 portal/views/cron/__init__.py,sha256=5rxXyhJmLOExRdrYZ1VJttTsyRIPRybzdftbUDwFByI,20
-portal/views/cron/user.py,sha256=IP4hngpHg1GrKqh6dyyW13dr3R6617MenAcObWH9zbY,10287
+portal/views/cron/user.py,sha256=iKM_FOcSQvrXtRSZUtxSiMFD3M869JP5jvEfRWHLpvM,10731
 portal/views/login/__init__.py,sha256=xSCtyFPSI87BRUybBgqa86ekFEolX5gUDbBSfBUMTyI,399
 portal/views/login/independent_student.py,sha256=3dFULhwMAlX4VDrJl-Znril6a9M5xKBSHO1eWvujfS0,2662
 portal/views/login/student.py,sha256=dt6cMfWepBJsVCRcADltfYSHVpyeP1WGLKSogMJ22E0,5539
@@ -631,8 +632,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-7.3.3.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-7.3.3.dist-info/METADATA,sha256=ZnS_f1ciHft66Np8pW27jVf4WWyxwYGSYZyTNI8sMHo,3317
-codeforlife_portal-7.3.3.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-codeforlife_portal-7.3.3.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-7.3.3.dist-info/RECORD,,
+codeforlife_portal-7.3.5.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-7.3.5.dist-info/METADATA,sha256=ArUl7ZGlxBmaD6OMUM7u7gMy4dRFzc18BUxtE-sCNek,3317
+codeforlife_portal-7.3.5.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
+codeforlife_portal-7.3.5.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-7.3.5.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "7.3.3"
+__version__ = "7.3.5"

portal/tests/test_views.py

@@ -40,7 +40,12 @@ from rest_framework.test import APIClient, APITestCase
 from deploy import captcha
 from portal.templatetags.app_tags import is_logged_in_as_admin_teacher
 from portal.views.api import anonymise
-from portal.views.cron.user import USER_DELETE_UNVERIFIED_ACCOUNT_DAYS
+from portal.views.cron.user import (
+    USER_DELETE_UNVERIFIED_ACCOUNT_DAYS,
+    USER_2ND_INACTIVE_REMINDER_DAYS,
+    USER_FINAL_INACTIVE_REMINDER_DAYS,
+    USER_RETENTION_PERIOD,
+)
 from portal.views.teacher.teach import (
     REMINDER_CARDS_PDF_COLUMNS,
     REMINDER_CARDS_PDF_ROWS,
@@ -1238,6 +1243,7 @@ class TestUser(CronTestCase):
         assert_called: bool,
         campaign_name: str,
         mock_send_dotdigital_email: Mock,
+        personalization_values=None,
     ):
         self.teacher_user.date_joined = timezone.now() - timedelta(
             days=days, hours=12
@@ -1255,13 +1261,28 @@ class TestUser(CronTestCase):
         self.client.get(reverse(view_name))
 
         if assert_called:
-            mock_send_dotdigital_email.assert_any_call(
-                campaign_ids[campaign_name], [self.teacher_user.email]
-            )
+            if personalization_values is not None:
+                mock_send_dotdigital_email.assert_any_call(
+                    campaign_ids[campaign_name],
+                    [self.teacher_user.email],
+                    personalization_values=personalization_values,
+                )
 
-            mock_send_dotdigital_email.assert_any_call(
-                campaign_ids[campaign_name], [self.indy_user.email]
-            )
+                mock_send_dotdigital_email.assert_any_call(
+                    campaign_ids[campaign_name],
+                    [self.indy_user.email],
+                    personalization_values=personalization_values,
+                )
+            else:
+                mock_send_dotdigital_email.assert_any_call(
+                    campaign_ids[campaign_name],
+                    [self.teacher_user.email],
+                )
+
+                mock_send_dotdigital_email.assert_any_call(
+                    campaign_ids[campaign_name],
+                    [self.indy_user.email],
+                )
 
             # Check only two emails are sent - the student should never be included.
             assert mock_send_dotdigital_email.call_count == 2
@@ -1302,6 +1323,10 @@ class TestUser(CronTestCase):
             "second-inactivity-reminder",
             True,
             "inactive_users_on_website_second_reminder",
+            personalization_values={
+                "DAYS_LEFT": USER_RETENTION_PERIOD
+                - USER_2ND_INACTIVE_REMINDER_DAYS
+            },
         )
         self.send_inactivity_reminder(
             974,
@@ -1322,6 +1347,10 @@ class TestUser(CronTestCase):
             "final-inactivity-reminder",
             True,
             "inactive_users_on_website_final_reminder",
+            personalization_values={
+                "DAYS_LEFT": USER_RETENTION_PERIOD
+                - USER_FINAL_INACTIVE_REMINDER_DAYS
+            },
         )
         self.send_inactivity_reminder(
             1066,

portal/views/cron/user.py

@@ -22,6 +22,7 @@ USER_DELETE_UNVERIFIED_ACCOUNT_DAYS = 19
 USER_1ST_INACTIVE_REMINDER_DAYS = 730  # 2 years
 USER_2ND_INACTIVE_REMINDER_DAYS = 973  # roughly 2 years and 8 months
 USER_FINAL_INACTIVE_REMINDER_DAYS = 1065  # 2 years and 11 months
+USER_RETENTION_PERIOD = 1096  # 3 years
 
 
 def get_unverified_users(
@@ -266,6 +267,10 @@ class SecondInactivityReminderView(CronMixin, APIView):
                             "inactive_users_on_website_second_reminder"
                         ],
                         [email],
+                        personalization_values={
+                            "DAYS_LEFT": USER_RETENTION_PERIOD
+                            - USER_2ND_INACTIVE_REMINDER_DAYS
+                        },
                     )
 
                     sent_email_count += 1
@@ -300,6 +305,10 @@ class FinalInactivityReminderView(CronMixin, APIView):
                             "inactive_users_on_website_final_reminder"
                         ],
                         [email],
+                        personalization_values={
+                            "DAYS_LEFT": USER_RETENTION_PERIOD
+                            - USER_FINAL_INACTIVE_REMINDER_DAYS
+                        },
                     )
 
                     sent_email_count += 1