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

portal/tests/test_views.py

@@ -7,7 +7,6 @@ from unittest.mock import ANY, Mock, patch
 import PyPDF2
 import pytest
 from aimmo.models import Game
-from common.helpers.emails import NOTIFICATION_EMAIL
 from common.models import (
     Class,
     DailyActivity,
@@ -55,9 +54,7 @@ class TestTeacherViews(TestCase):
     def setUpTestData(cls):
         cls.email, cls.password = signup_teacher_directly()
         _, _, cls.class_access_code = create_class_directly(cls.email)
-        _, _, cls.student = create_school_student_directly(
-            cls.class_access_code
-        )
+        _, _, cls.student = create_school_student_directly(cls.class_access_code)
 
     def login(self):
         c = Client()
@@ -66,9 +63,7 @@ class TestTeacherViews(TestCase):
 
     def test_reminder_cards(self):
         c = self.login()
-        url = reverse(
-            "teacher_print_reminder_cards", args=[self.class_access_code]
-        )
+        url = reverse("teacher_print_reminder_cards", args=[self.class_access_code])
 
         # First test with 2 dummy students
         NAME1 = "Test name"
@@ -102,9 +97,7 @@ class TestTeacherViews(TestCase):
         # page number
         students_per_page = REMINDER_CARDS_PDF_ROWS * REMINDER_CARDS_PDF_COLUMNS
         for _ in range(len(studentlist), students_per_page + 1):
-            studentlist.append(
-                {"name": NAME1, "password": PASSWORD1, "login_url": URL}
-            )
+            studentlist.append({"name": NAME1, "password": PASSWORD1, "login_url": URL})
 
         assert len(studentlist) == students_per_page + 1
 
@@ -143,9 +136,7 @@ class TestTeacherViews(TestCase):
         reader = csv.reader(io.StringIO(content))
 
         access_code = self.class_access_code
-        class_url = reverse(
-            "student_login", kwargs={"access_code": access_code}
-        )
+        class_url = reverse("student_login", kwargs={"access_code": access_code})
         row0 = next(reader)
         assert row0[0].strip() == access_code
         assert class_url in row0[1].strip()
@@ -184,9 +175,7 @@ class TestTeacherViews(TestCase):
 
     def test_daily_activity_student_details(self):
         c = self.login()
-        url = reverse(
-            "teacher_print_reminder_cards", args=[self.class_access_code]
-        )
+        url = reverse("teacher_print_reminder_cards", args=[self.class_access_code])
 
         data = {
             "data": json.dumps(
@@ -249,9 +238,7 @@ class TestLoginViews(TestCase):
         teacher_email, teacher_password = signup_teacher_directly()
         create_organisation_directly(teacher_email)
         _, _, class_access_code = create_class_directly(teacher_email)
-        student_name, student_password, _ = create_school_student_directly(
-            class_access_code
-        )
+        student_name, student_password, _ = create_school_student_directly(class_access_code)
 
         return (
             teacher_email,
@@ -284,16 +271,9 @@ class TestLoginViews(TestCase):
         _, _, name, password, class_access_code = self._set_up_test_data()
 
         if next_url:
-            url = (
-                reverse(
-                    "student_login", kwargs={"access_code": class_access_code}
-                )
-                + "?next=/"
-            )
+            url = reverse("student_login", kwargs={"access_code": class_access_code}) + "?next=/"
         else:
-            url = reverse(
-                "student_login", kwargs={"access_code": class_access_code}
-            )
+            url = reverse("student_login", kwargs={"access_code": class_access_code})
 
         c = Client()
         response = c.post(url, {"username": name, "password": password})
@@ -332,9 +312,7 @@ class TestLoginViews(TestCase):
 
     def _get_user_class(self, name, class_access_code):
         klass = Class.objects.get(access_code=class_access_code)
-        students = Student.objects.filter(
-            new_user__first_name__iexact=name, class_field=klass
-        )
+        students = Student.objects.filter(new_user__first_name__iexact=name, class_field=klass)
         assert len(students) == 1
         user = students[0].new_user
         return user, klass
@@ -376,9 +354,7 @@ class TestLoginViews(TestCase):
         _, _, name, password, class_access_code = self._set_up_test_data()
 
         c = Client()
-        url = reverse(
-            "student_login", kwargs={"access_code": class_access_code}
-        )
+        url = reverse("student_login", kwargs={"access_code": class_access_code})
         c.post(url, {"username": name, "password": password})
 
         # check if there's a UserSession data within the last 10 secs
@@ -399,9 +375,7 @@ class TestLoginViews(TestCase):
         randomname = "randomname"
 
         c = Client()
-        url = reverse(
-            "student_login", kwargs={"access_code": class_access_code}
-        )
+        url = reverse("student_login", kwargs={"access_code": class_access_code})
         c.post(url, {"username": randomname, "password": "xx"})
 
         # check if there's a UserSession data within the last 10 secs
@@ -427,9 +401,7 @@ class TestLoginViews(TestCase):
 
     def test_student_direct_login(self):
         _, _, _, _, class_access_code = self._set_up_test_data()
-        student, login_id, _, _ = create_student_with_direct_login(
-            class_access_code
-        )
+        student, login_id, _, _ = create_student_with_direct_login(class_access_code)
 
         c = Client()
         assert c.login(user_id=student.new_user.id, login_id=login_id) == True
@@ -551,9 +523,7 @@ class TestViews(TestCase):
         c = Client()
 
         # Login and check initial data
-        url = reverse(
-            "student_login", kwargs={"access_code": class_access_code}
-        )
+        url = reverse("student_login", kwargs={"access_code": class_access_code})
         c.post(url, {"username": student_name, "password": student_password})
 
         student_dashboard_url = reverse("student_details")
@@ -631,9 +601,7 @@ class TestViews(TestCase):
 
         # try again with the correct password
         url = reverse("delete_account")
-        response = c.post(
-            url, {"password": password, "unsubscribe_newsletter": "on"}
-        )
+        response = c.post(url, {"password": password, "unsubscribe_newsletter": "on"})
 
         assert response.status_code == 302
         assert response.url == reverse("home")
@@ -710,9 +678,7 @@ class TestViews(TestCase):
 
         school_id = school.id
         school_name = school.name
-        teachers = Teacher.objects.filter(school=school).order_by(
-            "new_user__last_name", "new_user__first_name"
-        )
+        teachers = Teacher.objects.filter(school=school).order_by("new_user__last_name", "new_user__first_name")
         assert len(teachers) == 3
 
         # one of the remaining teachers should be admin (the second in our case, as it's alphabetical)
@@ -742,9 +708,7 @@ class TestViews(TestCase):
         c.post(url, {"password": password3})
 
         # 2 teachers left
-        teachers = Teacher.objects.filter(school=school).order_by(
-            "new_user__last_name", "new_user__first_name"
-        )
+        teachers = Teacher.objects.filter(school=school).order_by("new_user__last_name", "new_user__first_name")
         assert len(teachers) == 2
 
         # teacher2 should still be admin, teacher4 is not passed admin role because there is teacher2
@@ -756,9 +720,7 @@ class TestViews(TestCase):
         # delete teacher4
         anonymise(user4)
 
-        teachers = Teacher.objects.filter(school=school).order_by(
-            "new_user__last_name", "new_user__first_name"
-        )
+        teachers = Teacher.objects.filter(school=school).order_by("new_user__last_name", "new_user__first_name")
         assert len(teachers) == 1
         u = User.objects.get(id=usrid2)
         assert u.new_teacher.is_admin
@@ -814,15 +776,14 @@ class TestViews(TestCase):
 
         c.logout()
 
-    def test_registrations_increment_data(self):
+    @patch("common.helpers.emails.send_dotdigital_email")
+    def test_registrations_increment_data(self, mock_send_dotdigital_email: Mock):
         c = Client()
 
         total_activity = TotalActivity.objects.get(id=1)
         teacher_registration_count = total_activity.teacher_registrations
         student_registration_count = total_activity.student_registrations
-        independent_registration_count = (
-            total_activity.independent_registrations
-        )
+        independent_registration_count = total_activity.independent_registrations
 
         response = c.post(
             reverse("register"),
@@ -838,13 +799,11 @@ class TestViews(TestCase):
         )
 
         assert response.status_code == 302
+        mock_send_dotdigital_email.assert_called_once()
 
         total_activity = TotalActivity.objects.get(id=1)
 
-        assert (
-            total_activity.teacher_registrations
-            == teacher_registration_count + 1
-        )
+        assert total_activity.teacher_registrations == teacher_registration_count + 1
 
         response = c.post(
             reverse("register"),
@@ -862,13 +821,11 @@ class TestViews(TestCase):
         )
 
         assert response.status_code == 302
+        mock_send_dotdigital_email.assert_called()
 
         total_activity = TotalActivity.objects.get(id=1)
 
-        assert (
-            total_activity.independent_registrations
-            == independent_registration_count + 1
-        )
+        assert total_activity.independent_registrations == independent_registration_count + 1
 
         teacher_email, teacher_password = signup_teacher_directly()
         create_organisation_directly(teacher_email)
@@ -884,10 +841,7 @@ class TestViews(TestCase):
 
         total_activity = TotalActivity.objects.get(id=1)
 
-        assert (
-            total_activity.student_registrations
-            == student_registration_count + 3
-        )
+        assert total_activity.student_registrations == student_registration_count + 3
 
 
 # CRON view tests
@@ -906,12 +860,8 @@ class CronTestClient(APIClient):
         secure=False,
         **extra,
     ):
-        wsgi_response = super().generic(
-            method, path, data, content_type, secure, **extra
-        )
-        assert (
-            200 <= wsgi_response.status_code < 300
-        ), f"Response has error status code: {wsgi_response.status_code}"
+        wsgi_response = super().generic(method, path, data, content_type, secure, **extra)
+        assert 200 <= wsgi_response.status_code < 300, f"Response has error status code: {wsgi_response.status_code}"
 
         return wsgi_response
 
@@ -930,34 +880,27 @@ class TestUser(CronTestCase):
         indy_email, _, _ = create_independent_student_directly()
 
         self.teacher_user = User.objects.get(email=teacher_email)
-        self.teacher_user_profile = UserProfile.objects.get(
-            user=self.teacher_user
-        )
+        self.teacher_user_profile = UserProfile.objects.get(user=self.teacher_user)
 
         self.indy_user = User.objects.get(email=indy_email)
         self.indy_user_profile = UserProfile.objects.get(user=self.indy_user)
 
         self.student_user: User = student.new_user
 
+    @patch("portal.views.cron.user.send_dotdigital_email")
     def send_verify_email_reminder(
         self,
         days: int,
         is_verified: bool,
         view_name: str,
-        send_email: Mock,
         assert_called: bool,
+        mock_send_dotdigital_email: Mock,
     ):
-        self.teacher_user.date_joined = timezone.now() - timedelta(
-            days=days, hours=12
-        )
+        self.teacher_user.date_joined = timezone.now() - timedelta(days=days, hours=12)
         self.teacher_user.save()
-        self.student_user.date_joined = timezone.now() - timedelta(
-            days=days, hours=12
-        )
+        self.student_user.date_joined = timezone.now() - timedelta(days=days, hours=12)
         self.student_user.save()
-        self.indy_user.date_joined = timezone.now() - timedelta(
-            days=days, hours=12
-        )
+        self.indy_user.date_joined = timezone.now() - timedelta(days=days, hours=12)
         self.indy_user.save()
 
         self.teacher_user_profile.is_verified = is_verified
@@ -968,100 +911,34 @@ class TestUser(CronTestCase):
         self.client.get(reverse(view_name))
 
         if assert_called:
-            send_email.assert_any_call(
-                sender=NOTIFICATION_EMAIL,
-                recipients=[self.teacher_user.email],
-                subject=ANY,
-                title=ANY,
-                text_content=ANY,
-                replace_url=ANY,
-            )
+            mock_send_dotdigital_email.assert_any_call(ANY, [self.teacher_user.email], personalization_values=ANY)
 
-            send_email.assert_any_call(
-                sender=NOTIFICATION_EMAIL,
-                recipients=[self.indy_user.email],
-                subject=ANY,
-                title=ANY,
-                text_content=ANY,
-                replace_url=ANY,
-            )
+            mock_send_dotdigital_email.assert_any_call(ANY, [self.indy_user.email], personalization_values=ANY)
 
             # Check only two emails are sent - the student should never be included.
-            assert send_email.call_count == 2
+            assert mock_send_dotdigital_email.call_count == 2
         else:
-            send_email.assert_not_called()
+            mock_send_dotdigital_email.assert_not_called()
 
-        send_email.reset_mock()
+        mock_send_dotdigital_email.reset_mock()
 
-    @patch("portal.views.cron.user.send_email")
-    def test_first_verify_email_reminder_view(self, send_email: Mock):
-        self.send_verify_email_reminder(
-            days=6,
-            is_verified=False,
-            view_name="first-verify-email-reminder",
-            send_email=send_email,
-            assert_called=False,
-        )
-        self.send_verify_email_reminder(
-            days=7,
-            is_verified=False,
-            view_name="first-verify-email-reminder",
-            send_email=send_email,
-            assert_called=True,
-        )
-        self.send_verify_email_reminder(
-            days=7,
-            is_verified=True,
-            view_name="first-verify-email-reminder",
-            send_email=send_email,
-            assert_called=False,
-        )
-        self.send_verify_email_reminder(
-            days=8,
-            is_verified=False,
-            view_name="first-verify-email-reminder",
-            send_email=send_email,
-            assert_called=False,
-        )
+    def test_first_verify_email_reminder_view(self):
+        self.send_verify_email_reminder(6, False, "first-verify-email-reminder", False)
+        self.send_verify_email_reminder(7, False, "first-verify-email-reminder", True)
+        self.send_verify_email_reminder(7, True, "first-verify-email-reminder", False)
+        self.send_verify_email_reminder(8, False, "first-verify-email-reminder", False)
 
-    @patch("portal.views.cron.user.send_email")
-    def test_second_verify_email_reminder_view(self, send_email: Mock):
-        self.send_verify_email_reminder(
-            days=13,
-            is_verified=False,
-            view_name="second-verify-email-reminder",
-            send_email=send_email,
-            assert_called=False,
-        )
-        self.send_verify_email_reminder(
-            days=14,
-            is_verified=False,
-            view_name="second-verify-email-reminder",
-            send_email=send_email,
-            assert_called=True,
-        )
-        self.send_verify_email_reminder(
-            days=14,
-            is_verified=True,
-            view_name="second-verify-email-reminder",
-            send_email=send_email,
-            assert_called=False,
-        )
-        self.send_verify_email_reminder(
-            days=15,
-            is_verified=False,
-            view_name="second-verify-email-reminder",
-            send_email=send_email,
-            assert_called=False,
-        )
+    def test_second_verify_email_reminder_view(self):
+        self.send_verify_email_reminder(13, False, "second-verify-email-reminder", False)
+        self.send_verify_email_reminder(14, False, "second-verify-email-reminder", True)
+        self.send_verify_email_reminder(14, True, "second-verify-email-reminder", False)
+        self.send_verify_email_reminder(15, False, "second-verify-email-reminder", False)
 
     def test_anonymise_unverified_accounts_view(self):
         now = timezone.now()
 
         for user in [self.teacher_user, self.indy_user, self.student_user]:
-            user.date_joined = now - timedelta(
-                days=USER_DELETE_UNVERIFIED_ACCOUNT_DAYS + 1
-            )
+            user.date_joined = now - timedelta(days=USER_DELETE_UNVERIFIED_ACCOUNT_DAYS + 1)
             user.save()
 
         for user_profile in [self.teacher_user_profile, self.indy_user_profile]:
@@ -1126,9 +1003,7 @@ class TestUser(CronTestCase):
                 new_user=indy_user,
             )
 
-            activity_today = DailyActivity.objects.get_or_create(
-                date=datetime.now().date()
-            )[0]
+            activity_today = DailyActivity.objects.get_or_create(date=datetime.now().date())[0]
             daily_teacher_count = activity_today.anonymised_unverified_teachers
             daily_indy_count = activity_today.anonymised_unverified_independents
 
@@ -1151,30 +1026,16 @@ class TestUser(CronTestCase):
             assert indy_user_active == assert_active
             assert student_user_active
 
-            activity_today = DailyActivity.objects.get_or_create(
-                date=datetime.now().date()
-            )[0]
+            activity_today = DailyActivity.objects.get_or_create(date=datetime.now().date())[0]
             total_activity = TotalActivity.objects.get(id=1)
 
             if not teacher_user_active:
-                assert (
-                    activity_today.anonymised_unverified_teachers
-                    == daily_teacher_count + 1
-                )
-                assert (
-                    total_activity.anonymised_unverified_teachers
-                    == total_teacher_count + 1
-                )
+                assert activity_today.anonymised_unverified_teachers == daily_teacher_count + 1
+                assert total_activity.anonymised_unverified_teachers == total_teacher_count + 1
 
             if not indy_user_active:
-                assert (
-                    activity_today.anonymised_unverified_independents
-                    == daily_indy_count + 1
-                )
-                assert (
-                    total_activity.anonymised_unverified_independents
-                    == total_indy_count + 1
-                )
+                assert activity_today.anonymised_unverified_independents == daily_indy_count + 1
+                assert total_activity.anonymised_unverified_independents == total_indy_count + 1
 
             teacher_user.delete()
             indy_user.delete()

portal/views/cron/user.py

@@ -1,11 +1,8 @@
 import logging
-from datetime import timedelta, datetime
+from datetime import datetime, timedelta
 
-from common.helpers.emails import (
-    NOTIFICATION_EMAIL,
-    generate_token_for_email,
-    send_email,
-)
+from common.helpers.emails import generate_token_for_email
+from common.mail import campaign_ids, send_dotdigital_email
 from common.models import DailyActivity, TotalActivity
 from django.contrib.auth.models import User
 from django.db.models import F
@@ -14,29 +11,14 @@ from django.urls import reverse
 from django.utils import timezone
 from rest_framework.response import Response
 from rest_framework.views import APIView
+
 from portal.views.api import anonymise
 
 from ...mixins import CronMixin
 
 # TODO: move email templates to DotDigital.
 USER_1ST_VERIFY_EMAIL_REMINDER_DAYS = 7
-USER_1ST_VERIFY_EMAIL_REMINDER_TEXT = (
-    "Please go to the link below to verify your email address:"
-    "\n{email_verification_url}."
-    "\nYou will not be able to use your account until it is verified."
-    "\n\nBy activating the account you confirm that you have read and agreed to"
-    " our terms ({terms_url}) and our privacy notice ({privacy_notice_url}). If"
-    " your account is not verified within 12 days we will delete it."
-)
 USER_2ND_VERIFY_EMAIL_REMINDER_DAYS = 14
-USER_2ND_VERIFY_EMAIL_REMINDER_TEXT = (
-    "Please go to the link below to verify your email address:"
-    "\n{email_verification_url}."
-    "\nYou will not be able to use your account until it is verified."
-    "\n\nBy activating the account you confirm that you have read and agreed to"
-    " our terms ({terms_url}) and our privacy notice ({privacy_notice_url}). If"
-    " your account is not verified within 5 days we will delete it."
-)
 USER_DELETE_UNVERIFIED_ACCOUNT_DAYS = 19
 
 
@@ -87,9 +69,6 @@ class FirstVerifyEmailReminderView(CronMixin, APIView):
         logging.info(f"{user_count} emails unverified.")
 
         if user_count > 0:
-            terms_url = build_absolute_google_uri(request, reverse("terms"))
-            privacy_notice_url = build_absolute_google_uri(request, reverse("privacy_notice"))
-
             sent_email_count = 0
             for email in user_queryset.values_list("email", flat=True).iterator(chunk_size=500):
                 email_verification_url = build_absolute_google_uri(
@@ -101,17 +80,10 @@ class FirstVerifyEmailReminderView(CronMixin, APIView):
                 )
 
                 try:
-                    send_email(
-                        sender=NOTIFICATION_EMAIL,
-                        recipients=[email],
-                        subject="Awaiting verification",
-                        title="Awaiting verification",
-                        text_content=USER_1ST_VERIFY_EMAIL_REMINDER_TEXT.format(
-                            email_verification_url=email_verification_url,
-                            terms_url=terms_url,
-                            privacy_notice_url=privacy_notice_url,
-                        ),
-                        replace_url={"verify_url": email_verification_url},
+                    send_dotdigital_email(
+                        campaign_ids["verify_new_user_first_reminder"],
+                        [email],
+                        personalization_values={"VERIFICATION_LINK": email_verification_url},
                     )
 
                     sent_email_count += 1
@@ -135,8 +107,6 @@ class SecondVerifyEmailReminderView(CronMixin, APIView):
         logging.info(f"{user_count} emails unverified.")
 
         if user_count > 0:
-            terms_url = build_absolute_google_uri(request, reverse("terms"))
-            privacy_notice_url = build_absolute_google_uri(request, reverse("privacy_notice"))
 
             sent_email_count = 0
             for email in user_queryset.values_list("email", flat=True).iterator(chunk_size=500):
@@ -149,17 +119,10 @@ class SecondVerifyEmailReminderView(CronMixin, APIView):
                 )
 
                 try:
-                    send_email(
-                        sender=NOTIFICATION_EMAIL,
-                        recipients=[email],
-                        subject="Your account needs verification",
-                        title="Your account needs verification",
-                        text_content=USER_2ND_VERIFY_EMAIL_REMINDER_TEXT.format(
-                            email_verification_url=email_verification_url,
-                            terms_url=terms_url,
-                            privacy_notice_url=privacy_notice_url,
-                        ),
-                        replace_url={"verify_url": email_verification_url},
+                    send_dotdigital_email(
+                        campaign_ids["verify_new_user_second_reminder"],
+                        [email],
+                        personalization_values={"VERIFICATION_LINK": email_verification_url},
                     )
 
                     sent_email_count += 1

portal/views/teacher/teach.py

@@ -804,16 +804,19 @@ def teacher_print_reminder_cards(request, access_code):
         p.setStrokeColor(black)
         p.rect(left, bottom, CARD_WIDTH, CARD_HEIGHT)
 
+        card_logo_height = CARD_HEIGHT - INTER_CARD_MARGIN * 2
+
         # logo
         p.drawImage(
             logo_image,
-            left,
+            left + INTER_CARD_MARGIN,
             bottom + INTER_CARD_MARGIN,
-            height=CARD_HEIGHT - INTER_CARD_MARGIN * 2,
+            height=card_logo_height,
             preserveAspectRatio=True,
+            anchor="w",
         )
 
-        text_left = left + logo_image.getSize()[0]
+        text_left = left + INTER_CARD_MARGIN + (logo_image.getSize()[0] / logo_image.getSize()[1]) * card_logo_height
 
         # student details
         p.setFillColor(black)