codeforlife-portal 6.44.4__py2.py3-none-any.whl → 6.44.8__py2.py3-none-any.whl

codeforlife_portal-6.44.8.dist-info/METADATA

@@ -0,0 +1,73 @@
+Metadata-Version: 2.1
+Name: codeforlife-portal
+Version: 6.44.8
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Framework :: Django
+Description-Content-Type: text/markdown
+License-File: LICENSE.md
+Requires-Dist: django ==3.2.25
+Requires-Dist: django-countries ==7.3.1
+Requires-Dist: djangorestframework ==3.13.1
+Requires-Dist: django-pipeline ==2.0.8
+Requires-Dist: django-recaptcha ==2.0.6
+Requires-Dist: pyyaml ==5.4.1
+Requires-Dist: importlib-metadata ==4.13.0
+Requires-Dist: rapid-router >=4
+Requires-Dist: aimmo >=2
+Requires-Dist: reportlab ==3.6.13
+Requires-Dist: django-formtools ==2.2
+Requires-Dist: django-otp ==1.0.2
+Requires-Dist: requests ==2.32.0
+Requires-Dist: django-treebeard ==4.3.1
+Requires-Dist: django-sekizai ==2.0.0
+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.44.8
+Requires-Dist: django-ratelimit ==3.0.1
+Requires-Dist: django-preventconcurrentlogins ==0.8.2
+Requires-Dist: django-csp ==3.7
+Requires-Dist: setuptools ==65.5.1
+Requires-Dist: django-import-export
+
+# Code for Life Portal
+
+[![Workflow Status](https://github.com/ocadotechnology/codeforlife-portal/actions/workflows/ci.yml/badge.svg)](https://github.com/ocadotechnology/codeforlife-portal/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/gh/ocadotechnology/codeforlife-portal/branch/master/graph/badge.svg)](https://codecov.io/gh/ocadotechnology/codeforlife-portal)
+
+## LICENCE
+In accordance with the [Terms of Use](https://www.codeforlife.education/terms#terms)
+of the Code for Life website, all copyright, trademarks, and other
+intellectual property rights in and relating to Code for Life (including all
+content of the Code for Life website, the Rapid Router application, the
+Kurono application, related software (including any drawn and/or animated
+avatars, whether or not such avatars have any modifications) and any other
+games, applications or any other content that we make available from time to
+time) are owned by Ocado Innovation Limited.
+
+The source code of the Code for Life portal, the Rapid Router application
+and the Kurono/aimmo application are [licensed under the GNU Affero General
+Public License](https://github.com/ocadotechnology/codeforlife-workspace/blob/main/LICENSE.md).
+All other assets including images, logos, sounds etc., are not covered by
+this licence and no-one may copy, modify, distribute, show in public or
+create any derivative work from these assets.
+
+## Code for Life
+
+[Code for Life](https://www.codeforlife.education/) has been developed by Ocado Technology as a **free, open-source** project to inspire the next generation of computer scientists and to help teachers deliver the computing curriculum.
+
+This repository hosts the source code of the [main website](https://www.codeforlife.education/), which includes the registration, log in, teacher and student dashboards, the teaching materials, etc.
+
+We are open to contributors from anywhere around the world. Please read ahead if you'd like to get involved.
+
+## To get started
+
+- [Developer Guide](https://docs.codeforlife.education/developer-guide)
+
+- [Good First Issues](https://github.com/ocadotechnology/codeforlife-portal/contribute)
+
+- [How to set up your work environment](https://docs.codeforlife.education/git/common-setup)
+
+- [Testing](https://docs.codeforlife.education/git/testing)

{codeforlife_portal-6.44.4.dist-info → codeforlife_portal-6.44.8.dist-info}/RECORD

@@ -105,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=-lI-ZgjvQrCkpiM7hjvY9ScoT2ABAjdCrwMGjYbzxpk,23
+portal/__init__.py,sha256=csffnuSwbnjo5LqcdMo349n5YXfQyFDxeX6usxjUqww,23
 portal/admin.py,sha256=on1-zNRnZvf2cwBN6GVRVYRhkaksrCgfzX8XPWtkvz8,6062
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -113,7 +113,7 @@ portal/beta.py,sha256=0TCC-9_KZoM1nuzJ9FiuKR5n9JITdMYenHGQtRvn9UU,255
 portal/context_processors.py,sha256=1TrUZqnMqGa5f7ERph9EpBqojSMJvOrcpnJzTdeCLDI,133
 portal/handlers.py,sha256=gF99OfQrGcIGDnUyONhvylZNU8sl6XHYEurwu0fuiss,422
 portal/models.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-portal/urls.py,sha256=6kuMw36OQ8gRQDQjN0QCK9th15_I3nl1Z7H9za_Susg,16206
+portal/urls.py,sha256=ROGvyAo1pw1hHRLupxcbIVGjaGhZXY7AeyafxXYoa7Q,17464
 portal/wsgi.py,sha256=3yRcNxBQG30NhzrVi93bX-DrbXtsIQBc70HiW5wbOyE,401
 portal/forms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/forms/add_game.py,sha256=Z9pjNiAU3W2HthSsbz_OWzl2RuLpZ0GtA6Xe1tg7H5I,1008
@@ -185,7 +185,7 @@ portal/static/portal/img/dee.png,sha256=GQHNpaEiQt9M3qjb3wy6KOzlpKB1fNkESPe6yFZ7
 portal/static/portal/img/facebook.png,sha256=qaQdtT9dOg-7-XWnRxz8dW5Wwm6CEWq-S0hQDiLCWus,6543
 portal/static/portal/img/favicon.ico,sha256=vZMUaL5b47WxGRxlRMzp1fRlZQXevGHxBq5vOTV_tdg,481
 portal/static/portal/img/get_involved_hero.png,sha256=TD52SemoUt0xILs_WMxtoaKaSaXQVEQhSr2MgMNW8NY,176315
-portal/static/portal/img/gitbook.png,sha256=xnh_535-b64zq2O-Z1hEqTGkyYL0O74LvokV1RE1gFQ,177664
+portal/static/portal/img/gitbook.png,sha256=JgswtPQZWoIL8eY2gPEKq2RTXr6IBHVGYjzUQqgFO4o,248105
 portal/static/portal/img/gitbook_space.png,sha256=d1krFtJM36UgBu_aXW0LmGKG7QyIvp4zC6kOXBTjon0,62646
 portal/static/portal/img/github.png,sha256=NaZ4dyTsDgbTaBLJQW9hRo49uuGw6KOXZ4p7BInrVsI,63596
 portal/static/portal/img/github_hero.png,sha256=HQHyoT5IRnCGzCklqc6fJM6BOoN9ksrBN0WJD7k50ss,47014
@@ -438,7 +438,7 @@ portal/templates/portal/about.html,sha256=vXsSYlPV-3OF2fv9eHp-ErEWXwcL-HwroocE4B
 portal/templates/portal/base.html,sha256=DhZ1BC9AANRofocQeNtU6wSFMI-5WmQ-4eXemUGAuQo,11689
 portal/templates/portal/base_no_userprofile.html,sha256=PlRufyYmUUGWBZ6CvbYhJWOMTqKqdcee4xnO5--AogA,447
 portal/templates/portal/coding_club.html,sha256=aaLx9UQ8p_7Vvy3Vlh1rOufeNN0KhJ6fj4oqI6QqJcM,4518
-portal/templates/portal/contribute.html,sha256=BebXjBAMkW1IQrCcJ5syHmMpuTbBKiqT9szdZnIEan8,4001
+portal/templates/portal/contribute.html,sha256=9_sUT_RqPZspURQ_uxHylYaTsF0MvAKw5wMk7X1JiIU,4253
 portal/templates/portal/dotmailer_consent_form.html,sha256=UDdizPoKYZGybr6z9nzDV4WPhJPa-S3bIKywvVgFrxg,918
 portal/templates/portal/email_invitation_sent.html,sha256=hAMzQXE3NFGnOsQlCGuo3Aps-vazSJb5BhAN7bWT48M,641
 portal/templates/portal/email_style_template.html,sha256=VodOGssxRS9aJTjSaU7iv5qJgYe66C_gPL_98ZX_cIQ,11935
@@ -542,7 +542,7 @@ portal/tests/test_api.py,sha256=Yo5s_nEGOoG35jA39yZ6nuDOUZvuCZ8o8o8XhZos61w,1381
 portal/tests/test_captcha_forms.py,sha256=lirhIli-sHovun8VdrF0he7KRFTAd8DMCpkJ8cQNotg,1015
 portal/tests/test_class.py,sha256=V6Fkc6PqdisefKD3xs9PbfE2pKp-9e0gwQVkPUiu6bk,14150
 portal/tests/test_daily_activities.py,sha256=-siDCMGBD1ijjccHVk7eEmrk4bgTsvbh0B6hDoj2fo0,1803
-portal/tests/test_emails.py,sha256=Y26VjhPOzc2aptHBSmOW9R-do3k1QaRqUc5MiwgsAQk,9156
+portal/tests/test_emails.py,sha256=xNgOt592r2nrQu7VeBdc8kvSnw6Z5fPJqMx2-UMcyyk,9482
 portal/tests/test_helper_methods.py,sha256=-SQCDZm2XUtyXGEp0CHIb_SSC9CPD-XOSnpnY8QclHk,890
 portal/tests/test_independent_student.py,sha256=jyNpHyisCfkD-CDsjIfSxWnWTxDmkReJ-BdXEBdJoMo,27081
 portal/tests/test_invite_teacher.py,sha256=oeOaoJV1IqJSYPlaPFjnhVXdB2mq8otCTLp_lfjuCfk,12224
@@ -617,7 +617,7 @@ portal/views/about.py,sha256=-muXy17UhxCSKkjnMAkSLXiCvT_pBPlf2ykTYr794dI,443
 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/email.py,sha256=V3wXRxIjeZ4OJBVqGCQrPn-GQWKZK1PCXbR1f2Zpa_4,2174
 portal/views/home.py,sha256=J4KY66p2nRgRu1O_0IYwdgfZoTYuhQS0qpfiA1b8PTE,9855
 portal/views/legal.py,sha256=nUunsTHnhMcXBcDlg1GmUal86k9Vhinne4A2FWfq78M,342
 portal/views/organisation.py,sha256=sPDbiM7hdtpF8GKyh_4n4VPl2a-WnAgnF4q9aSvQCVI,3341
@@ -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.44.4.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-6.44.4.dist-info/METADATA,sha256=01n40MUX_ICmWOiQHo0u_C_EAyOK8arKbaQ0mldDZgU,1137
-codeforlife_portal-6.44.4.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-codeforlife_portal-6.44.4.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-6.44.4.dist-info/RECORD,,
+codeforlife_portal-6.44.8.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-6.44.8.dist-info/METADATA,sha256=d1GGfu9CPQSdWhpujDFB9VZs3tGbSaCGwC2a4l1P_nY,3474
+codeforlife_portal-6.44.8.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+codeforlife_portal-6.44.8.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-6.44.8.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "6.44.4"
+__version__ = "6.44.8"

portal/templates/portal/contribute.html

@@ -10,7 +10,7 @@
 {% block content %}
 <div class="background container">
     <section>
-        <h4>How to get involved and gain experience</h4>
+        <h3>How to get involved and gain experience</h3>
     </section>
         <div class="row">
             <div class="col-sm-6">
@@ -25,7 +25,7 @@
                 Ocado Technology deployed an army of internal volunteers who worked after hours, fuelled by
                 free pizzas and fizzy drinks.
                 </p>
-                <p>What came out of this, is what you see today, used by educators and learners from over 150
+                <p>What came out of this, is what you see today, used by educators and learners from over 180
                 countries. Our products are open-source and free forever.
                 </p>
             </div>
@@ -50,14 +50,14 @@
                 </p>
 
                 <p><b>Rapid Router</b></p>
-                <p>An introduction to coding that is aimed at Key Stages 1-3 (age 5 to 14).
+                <p>An introduction to coding that is aimed at Key Stages 1-3 (age 5 to 15).
                 Built on Blockly, it's a visual programming language similar to Scratch.
-                The levels start off with Blockly and gradually progress to Python. With 109 levels,
+                The levels start off with Blockly and gradually progress to Python. With over 100 levels,
                 Rapid Router is our flagship game with the biggest user base.
                 </p>
 
                 <p><b>Kurono</b></p>
-                <p>A multiplayer game that is aimed at older students of Key Stages 3 and up,
+                <p>A multiplayer game that is aimed at students at Key Stages 3 and up,
                 it is primarily for use in a class or a club setting. Students code in Python to
                 move their avatar around in order to complete tasks. Parts of Kurono are still in development.
                 </p>
@@ -77,8 +77,10 @@
         <div class="col-sm-6">
             <h4>How you can contribute</h4>
             <p>Today, there is a small dedicated team working full time on Code for Life.
-            In 2021, we're expecting to reach over 100,000 newly registered teachers and students.
-            We need your help to do even more.
+            Our community, made up of dedicated teachers, tutors, students, and volunteers, 
+            has played a vital part in Code For Life's growth. The resources and games are 
+            aligned to the UK National Curriculum and have reached over 265,000 active users 
+            across 180 countries, and over 600,000 users since the launch in 2014. We need your help to grow even more.
             </p>
             <p>
             If contributing to open-source projects to support education in coding and technology

portal/tests/test_emails.py

@@ -10,7 +10,6 @@ from common.helpers.emails import (
     send_dotmailer_consent_confirmation_email_to_user,
     DotmailerUserType,
 )
-from django.core import mail
 from django.test import Client
 from django.urls import reverse
 
@@ -41,19 +40,15 @@ def patch_datetime_now(monkeypatch):
     monkeypatch.setattr(datetime, "datetime", mydatetime)
 
 
-@pytest.mark.django_db
-def test_send_new_users_numbers_email():
-    client = Client()
-    response = client.get(reverse("send_new_users_report"))
-    assert response.status_code == 200
-    assert len(mail.outbox) == 1
-
-
 def test_newsletter_calls_correct_requests(mocker, monkeypatch):
     mocked_create_contact = mocker.patch("common.helpers.emails.create_contact")
-    mocked_add_to_address_book = mocker.patch("common.helpers.emails.add_contact_to_address_book")
+    mocked_add_to_address_book = mocker.patch(
+        "common.helpers.emails.add_contact_to_address_book"
+    )
 
-    add_to_dotmailer("Ray", "Charles", "ray.charles@example.com", DotmailerUserType.TEACHER)
+    add_to_dotmailer(
+        "Ray", "Charles", "ray.charles@example.com", DotmailerUserType.TEACHER
+    )
 
     mocked_create_contact.assert_called_once()
     mocked_add_to_address_book.assert_called_once()
@@ -74,10 +69,15 @@ def test_delete_account(mocker):
 
     delete_contact("example@mail.com")
 
-    mocked_delete.assert_called_once_with(DOTMAILER_DELETE_USER_BY_ID_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD))
+    mocked_delete.assert_called_once_with(
+        DOTMAILER_DELETE_USER_BY_ID_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+    )
 
 
-def test_newsletter_sends_correct_request_data(mocker, monkeypatch, patch_datetime_now):
+def test_newsletter_sends_correct_request_data(
+    mocker, monkeypatch, patch_datetime_now
+):
     mocked_post = mocker.patch("common.helpers.emails.post")
 
     expected_body1 = {
@@ -91,7 +91,13 @@ def test_newsletter_sends_correct_request_data(mocker, monkeypatch, patch_dateti
                 {"key": "FULLNAME", "value": "Ray Charles"},
             ],
         },
-        "consentFields": [{"fields": [{"key": "DATETIMECONSENTED", "value": FAKE_TIME.__str__()}]}],
+        "consentFields": [
+            {
+                "fields": [
+                    {"key": "DATETIMECONSENTED", "value": FAKE_TIME.__str__()}
+                ]
+            }
+        ],
         "preferences": [{"trout": True}],
     }
 
@@ -109,51 +115,76 @@ def test_newsletter_sends_correct_request_data(mocker, monkeypatch, patch_dateti
     create_contact("Ray", "Charles", "ray.charles@example.com")
 
     mocked_post.assert_called_once_with(
-        DOTMAILER_CREATE_CONTACT_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD), json=expected_body1
+        DOTMAILER_CREATE_CONTACT_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body1,
     )
 
-    add_contact_to_address_book("Ray", "Charles", "ray.charles@example.com", DotmailerUserType.TEACHER)
+    add_contact_to_address_book(
+        "Ray", "Charles", "ray.charles@example.com", DotmailerUserType.TEACHER
+    )
 
     assert mocked_post.call_count == 3
 
     mocked_post.assert_any_call(
-        DOTMAILER_MAIN_ADDRESS_BOOK_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD), json=expected_body2
+        DOTMAILER_MAIN_ADDRESS_BOOK_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body2,
     )
 
     mocked_post.assert_any_call(
-        DOTMAILER_TEACHER_ADDRESS_BOOK_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD), json=expected_body2
+        DOTMAILER_TEACHER_ADDRESS_BOOK_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body2,
     )
 
     mocked_post.reset_mock()
 
-    add_contact_to_address_book("Ray", "Charles", "ray.charles@example.com", DotmailerUserType.STUDENT)
+    add_contact_to_address_book(
+        "Ray", "Charles", "ray.charles@example.com", DotmailerUserType.STUDENT
+    )
 
     assert mocked_post.call_count == 2
 
     mocked_post.assert_any_call(
-        DOTMAILER_MAIN_ADDRESS_BOOK_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD), json=expected_body2
+        DOTMAILER_MAIN_ADDRESS_BOOK_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body2,
     )
 
     mocked_post.assert_any_call(
-        DOTMAILER_STUDENT_ADDRESS_BOOK_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD), json=expected_body2
+        DOTMAILER_STUDENT_ADDRESS_BOOK_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body2,
     )
 
     mocked_post.reset_mock()
 
-    add_contact_to_address_book("Ray", "Charles", "ray.charles@example.com", DotmailerUserType.NO_ACCOUNT)
+    add_contact_to_address_book(
+        "Ray",
+        "Charles",
+        "ray.charles@example.com",
+        DotmailerUserType.NO_ACCOUNT,
+    )
 
     assert mocked_post.call_count == 2
 
     mocked_post.assert_any_call(
-        DOTMAILER_MAIN_ADDRESS_BOOK_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD), json=expected_body2
+        DOTMAILER_MAIN_ADDRESS_BOOK_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body2,
     )
 
     mocked_post.assert_any_call(
-        DOTMAILER_NO_ACCOUNT_ADDRESS_BOOK_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD), json=expected_body2
+        DOTMAILER_NO_ACCOUNT_ADDRESS_BOOK_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body2,
     )
 
 
-def test_consent_calls_send_correct_request_data(mocker, monkeypatch, patch_datetime_now):
+def test_consent_calls_send_correct_request_data(
+    mocker, monkeypatch, patch_datetime_now
+):
     mocked_post = mocker.patch("common.helpers.emails.post")
     mocked_put = mocker.patch("common.helpers.emails.put")
 
@@ -181,21 +212,34 @@ def test_consent_calls_send_correct_request_data(mocker, monkeypatch, patch_date
                 {"key": "FULLNAME", "value": "Ray Charles"},
             ],
         },
-        "consentFields": [{"fields": [{"key": "DATETIMECONSENTED", "value": FAKE_TIME.__str__()}]}],
+        "consentFields": [
+            {
+                "fields": [
+                    {"key": "DATETIMECONSENTED", "value": FAKE_TIME.__str__()}
+                ]
+            }
+        ],
     }
 
-    expected_body2 = {"campaignID": DOTMAILER_THANKS_FOR_STAYING_CAMPAIGN_ID, "contactIds": ["1"]}
+    expected_body2 = {
+        "campaignID": DOTMAILER_THANKS_FOR_STAYING_CAMPAIGN_ID,
+        "contactIds": ["1"],
+    }
 
     add_consent_record_to_dotmailer_user(user)
 
     mocked_put.assert_called_once_with(
-        DOTMAILER_PUT_CONSENT_DATA_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD), json=expected_body1
+        DOTMAILER_PUT_CONSENT_DATA_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body1,
     )
 
     send_dotmailer_consent_confirmation_email_to_user(user)
 
     mocked_post.assert_called_with(
-        DOTMAILER_SEND_CAMPAIGN_URL, auth=(DOTMAILER_USER, DOTMAILER_PASSWORD), json=expected_body2
+        DOTMAILER_SEND_CAMPAIGN_URL,
+        auth=(DOTMAILER_USER, DOTMAILER_PASSWORD),
+        json=expected_body2,
     )
 
 
@@ -212,9 +256,15 @@ def test_dotmailer_consent_form(mocker, monkeypatch):
     c = Client()
     consent_form_url = reverse("consent_form")
 
-    mocked_get_user_success = mocker.patch("portal.views.dotmailer.get_dotmailer_user_by_email")
-    mocked_add_consent = mocker.patch("portal.views.dotmailer.add_consent_record_to_dotmailer_user")
-    mocked_send_campaign = mocker.patch("portal.views.dotmailer.send_dotmailer_consent_confirmation_email_to_user")
+    mocked_get_user_success = mocker.patch(
+        "portal.views.dotmailer.get_dotmailer_user_by_email"
+    )
+    mocked_add_consent = mocker.patch(
+        "portal.views.dotmailer.add_consent_record_to_dotmailer_user"
+    )
+    mocked_send_campaign = mocker.patch(
+        "portal.views.dotmailer.send_dotmailer_consent_confirmation_email_to_user"
+    )
 
     get_consent_form_response = c.get(consent_form_url)
 
@@ -244,7 +294,10 @@ def test_dotmailer_consent_form(mocker, monkeypatch):
     mocked_add_consent.assert_called_once()
     mocked_send_campaign.assert_called_once()
 
-    mocker.patch("portal.views.dotmailer.add_consent_record_to_dotmailer_user", side_effect=KeyError)
+    mocker.patch(
+        "portal.views.dotmailer.add_consent_record_to_dotmailer_user",
+        side_effect=KeyError,
+    )
 
     wrong_email_response = c.post(consent_form_url, data=good_request_data)
 
@@ -255,4 +308,7 @@ def test_dotmailer_consent_form(mocker, monkeypatch):
 
 def _is_warning_message_showing(response):
     messages = list(response.wsgi_request._messages)
-    assert messages[0].message == "Valid email address and consent required. Please try again."
+    assert (
+        messages[0].message
+        == "Valid email address and consent required. Please try again."
+    )

portal/urls.py

@@ -1,13 +1,18 @@
 from aimmo.urls import HOMEPAGE_REGEX
 from common.permissions import teacher_verified
 from django.conf.urls import include, url
-from django.urls import path
 from django.http import HttpResponse
+from django.urls import path
 from django.views.generic import RedirectView
 from django.views.generic.base import TemplateView
 from django.views.i18n import JavaScriptCatalog
 from game.views.level import play_default_level
-from two_factor.views import BackupTokensView, ProfileView, QRGeneratorView, SetupCompleteView
+from two_factor.views import (
+    BackupTokensView,
+    ProfileView,
+    QRGeneratorView,
+    SetupCompleteView,
+)
 
 from portal.helpers.decorators import ratelimit
 from portal.helpers.ratelimit import (
@@ -18,9 +23,16 @@ from portal.helpers.ratelimit import (
 )
 from portal.helpers.ratelimit import school_student_key
 from portal.helpers.regexes import ACCESS_CODE_REGEX, JWT_REGEX
+from portal.views import cron
 from portal.views.about import about, getinvolved, contribute
-from portal.views.admin import AdminChangePasswordDoneView, AdminChangePasswordView
-from portal.views.aimmo.dashboard import StudentAimmoDashboard, TeacherAimmoDashboard
+from portal.views.admin import (
+    AdminChangePasswordDoneView,
+    AdminChangePasswordView,
+)
+from portal.views.aimmo.dashboard import (
+    StudentAimmoDashboard,
+    TeacherAimmoDashboard,
+)
 from portal.views.api import (
     AnonymiseOrphanSchoolsView,
     InactiveUsersView,
@@ -29,8 +41,11 @@ from portal.views.api import (
     number_users_per_country,
     registered_users,
 )
-from portal.views.dotmailer import dotmailer_consent_form, process_newsletter_form
-from portal.views.email import send_new_users_report, verify_email
+from portal.views.dotmailer import (
+    dotmailer_consent_form,
+    process_newsletter_form,
+)
+from portal.views.email import verify_email
 from portal.views.home import (
     coding_club,
     download_student_pack,
@@ -43,7 +58,11 @@ from portal.views.home import (
 from portal.views.legal import privacy_notice, terms
 from portal.views.login import old_login_form_redirect
 from portal.views.login.independent_student import IndependentStudentLoginView
-from portal.views.login.student import StudentLoginView, StudentClassCodeView, student_direct_login
+from portal.views.login.student import (
+    StudentLoginView,
+    StudentClassCodeView,
+    student_direct_login,
+)
 from portal.views.login.teacher import TeacherLoginView
 from portal.views.organisation import organisation_leave, organisation_manage
 from portal.views.play_landing_page import play_landing_page
@@ -59,7 +78,11 @@ from portal.views.student.edit_account_details import (
     SchoolStudentEditAccountView,
     student_edit_account,
 )
-from portal.views.student.play import SchoolStudentDashboard, IndependentStudentDashboard, student_join_organisation
+from portal.views.student.play import (
+    SchoolStudentDashboard,
+    IndependentStudentDashboard,
+    student_join_organisation,
+)
 from portal.views.teach import teach
 from portal.views.teacher.dashboard import (
     dashboard_manage,
@@ -88,20 +111,36 @@ from portal.views.teacher.teach import (
     teacher_download_csv,
     teacher_view_class,
 )
-from portal.views import cron
-
 from portal.views.two_factor.core import CustomSetupView
 from portal.views.two_factor.profile import CustomDisableView
 
 js_info_dict = {"packages": ("conf.locale",)}
 
 two_factor_patterns = [
-    url(r"^account/two_factor/setup/$", CustomSetupView.as_view(), name="setup"),
+    url(
+        r"^account/two_factor/setup/$", CustomSetupView.as_view(), name="setup"
+    ),
     url(r"^account/two_factor/qrcode/$", QRGeneratorView.as_view(), name="qr"),
-    url(r"^account/two_factor/setup/complete/$", SetupCompleteView.as_view(), name="setup_complete"),
-    url(r"^account/two_factor/backup/tokens/$", teacher_verified(BackupTokensView.as_view()), name="backup_tokens"),
-    url(r"^account/two_factor/$", teacher_verified(ProfileView.as_view()), name="profile"),
-    url(r"^account/two_factor/disable/$", teacher_verified(CustomDisableView.as_view()), name="disable"),
+    url(
+        r"^account/two_factor/setup/complete/$",
+        SetupCompleteView.as_view(),
+        name="setup_complete",
+    ),
+    url(
+        r"^account/two_factor/backup/tokens/$",
+        teacher_verified(BackupTokensView.as_view()),
+        name="backup_tokens",
+    ),
+    url(
+        r"^account/two_factor/$",
+        teacher_verified(ProfileView.as_view()),
+        name="profile",
+    ),
+    url(
+        r"^account/two_factor/disable/$",
+        teacher_verified(CustomDisableView.as_view()),
+        name="disable",
+    ),
 ]
 
 
@@ -136,22 +175,51 @@ urlpatterns = [
         ),
     ),
     url(HOMEPAGE_REGEX, include("aimmo.urls")),
-    url(r"^teach/kurono/dashboard/$", TeacherAimmoDashboard.as_view(), name="teacher_aimmo_dashboard"),
-    url(r"^play/kurono/dashboard/$", StudentAimmoDashboard.as_view(), name="student_aimmo_dashboard"),
-    url(r"^favicon\.ico$", RedirectView.as_view(url="/static/portal/img/favicon.ico", permanent=True)),
-    url(r"^administration/password_change/$", AdminChangePasswordView.as_view(), name="administration_password_change"),
+    url(
+        r"^teach/kurono/dashboard/$",
+        TeacherAimmoDashboard.as_view(),
+        name="teacher_aimmo_dashboard",
+    ),
+    url(
+        r"^play/kurono/dashboard/$",
+        StudentAimmoDashboard.as_view(),
+        name="student_aimmo_dashboard",
+    ),
+    url(
+        r"^favicon\.ico$",
+        RedirectView.as_view(
+            url="/static/portal/img/favicon.ico", permanent=True
+        ),
+    ),
+    url(
+        r"^administration/password_change/$",
+        AdminChangePasswordView.as_view(),
+        name="administration_password_change",
+    ),
     url(
         r"^administration/password_change_done/$",
         AdminChangePasswordDoneView.as_view(),
         name="administration_password_change_done",
     ),
-    url(r"^mail/weekly/", send_new_users_report, name="send_new_users_report"),
-    url(r"^users/inactive/", InactiveUsersView.as_view(), name="inactive_users"),
-    url(r"^locked_out/$", TemplateView.as_view(template_name="portal/locked_out.html"), name="locked_out"),
-    url(r"^", include((two_factor_patterns, "two_factor"), namespace="two_factor")),
+    url(
+        r"^users/inactive/", InactiveUsersView.as_view(), name="inactive_users"
+    ),
+    url(
+        r"^locked_out/$",
+        TemplateView.as_view(template_name="portal/locked_out.html"),
+        name="locked_out",
+    ),
+    url(
+        r"^",
+        include((two_factor_patterns, "two_factor"), namespace="two_factor"),
+    ),
     url(r"^i18n/", include("django.conf.urls.i18n")),
     url(r"^jsi18n/$", JavaScriptCatalog.as_view(), js_info_dict),
-    url(r"^(?P<levelName>[A-Z0-9]+)/$", play_default_level, name="play_default_level"),
+    url(
+        r"^(?P<levelName>[A-Z0-9]+)/$",
+        play_default_level,
+        name="play_default_level",
+    ),
     url(r"^$", home, name="home"),
     url(r"^home-learning", home_learning, name="home-learning"),
     url(r"^register_form", register_view, name="register"),
@@ -181,8 +249,16 @@ urlpatterns = [
         )(StudentLoginView.as_view()),
         name="student_login",
     ),
-    url(r"^login/student/$", StudentClassCodeView.as_view(), name="student_login_access_code"),
-    url(r"^u/(?P<user_id>[0-9]+)/(?P<login_id>[a-z0-9]+)/$", student_direct_login, name="student_direct_login"),
+    url(
+        r"^login/student/$",
+        StudentClassCodeView.as_view(),
+        name="student_login_access_code",
+    ),
+    url(
+        r"^u/(?P<user_id>[0-9]+)/(?P<login_id>[a-z0-9]+)/$",
+        student_direct_login,
+        name="student_direct_login",
+    ),
     url(
         r"^login/independent/$",
         ratelimit(
@@ -197,32 +273,70 @@ urlpatterns = [
     ),
     url(r"^login_form", old_login_form_redirect, name="old_login_form"),
     url(r"^logout/$", logout_view, name="logout_view"),
-    url(r"^news_signup/$", process_newsletter_form, name="process_newsletter_form"),
+    url(
+        r"^news_signup/$",
+        process_newsletter_form,
+        name="process_newsletter_form",
+    ),
     url(r"^consent_form/$", dotmailer_consent_form, name="consent_form"),
     url(
         r"^verify_email/$",
-        TemplateView.as_view(template_name="portal/email_verification_needed.html"),
+        TemplateView.as_view(
+            template_name="portal/email_verification_needed.html"
+        ),
         name="email_verification",
     ),
-    url(rf"^verify_email/(?P<token>{JWT_REGEX})/$", verify_email, name="verify_email"),
-    url(r"^user/password/reset/student/$", student_password_reset, name="student_password_reset"),
-    url(r"^user/password/reset/teacher/$", teacher_password_reset, name="teacher_password_reset"),
-    url(r"^user/password/reset/done/$", password_reset_done, name="reset_password_email_sent"),
+    url(
+        rf"^verify_email/(?P<token>{JWT_REGEX})/$",
+        verify_email,
+        name="verify_email",
+    ),
+    url(
+        r"^user/password/reset/student/$",
+        student_password_reset,
+        name="student_password_reset",
+    ),
+    url(
+        r"^user/password/reset/teacher/$",
+        teacher_password_reset,
+        name="teacher_password_reset",
+    ),
+    url(
+        r"^user/password/reset/done/$",
+        password_reset_done,
+        name="reset_password_email_sent",
+    ),
     url(
         r"^user/password/reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$",
         password_reset_check_and_confirm,
         name="password_reset_check_and_confirm",
     ),
-    url(r"^user/reset_screentime_warning/$", reset_screentime_warning, name="reset_screentime_warning"),
-    url(r"^user/reset_session_time/$", lambda _: HttpResponse(status=204), name="reset_session_time"),
+    url(
+        r"^user/reset_screentime_warning/$",
+        reset_screentime_warning,
+        name="reset_screentime_warning",
+    ),
+    url(
+        r"^user/reset_session_time/$",
+        lambda _: HttpResponse(status=204),
+        name="reset_session_time",
+    ),
     url(
         r"^teacher/password/reset/complete/$",
         TemplateView.as_view(template_name="portal/reset_password_done.html"),
         name="password_reset_complete",
     ),
     url(r"^teach/$", teach, name="teach"),
-    url(r"^teach/onboarding-organisation/$", organisation_manage, name="onboarding-organisation"),
-    url(r"^teach/onboarding-classes", teacher_onboarding_create_class, name="onboarding-classes"),
+    url(
+        r"^teach/onboarding-organisation/$",
+        organisation_manage,
+        name="onboarding-organisation",
+    ),
+    url(
+        r"^teach/onboarding-classes",
+        teacher_onboarding_create_class,
+        name="onboarding-classes",
+    ),
     url(
         rf"^teach/onboarding-class/(?P<access_code>{ACCESS_CODE_REGEX})$",
         teacher_onboarding_edit_class,
@@ -238,10 +352,22 @@ urlpatterns = [
         teacher_download_csv,
         name="teacher_download_csv",
     ),
-    url(r"^invited_teacher/(?P<token>[0-9a-f]+)/$", invited_teacher, name="invited_teacher"),
+    url(
+        r"^invited_teacher/(?P<token>[0-9a-f]+)/$",
+        invited_teacher,
+        name="invited_teacher",
+    ),
     url(r"^play/$", play_landing_page, name="play"),
-    url(r"^play/details/$", SchoolStudentDashboard.as_view(), name="student_details"),
-    url(r"^play/details/independent$", IndependentStudentDashboard.as_view(), name="independent_student_details"),
+    url(
+        r"^play/details/$",
+        SchoolStudentDashboard.as_view(),
+        name="student_details",
+    ),
+    url(
+        r"^play/details/independent$",
+        IndependentStudentDashboard.as_view(),
+        name="independent_student_details",
+    ),
     url(r"^play/account/$", student_edit_account, name="student_edit_account"),
     url(
         r"^play/account/independent/$",
@@ -255,19 +381,45 @@ urlpatterns = [
         )(independentStudentEditAccountView),
         name="independent_edit_account",
     ),
-    url(r"^play/account/school_student/$", SchoolStudentEditAccountView.as_view(), name="school_student_edit_account"),
-    url(r"^play/join/$", student_join_organisation, name="student_join_organisation"),
+    url(
+        r"^play/account/school_student/$",
+        SchoolStudentEditAccountView.as_view(),
+        name="school_student_edit_account",
+    ),
+    url(
+        r"^play/join/$",
+        student_join_organisation,
+        name="student_join_organisation",
+    ),
     url(r"^about", about, name="about"),
     url(r"^getinvolved", getinvolved, name="getinvolved"),
     url(r"^contribute", contribute, name="contribute"),
     url(r"^terms", terms, name="terms"),
     url(r"^privacy-notice/$", privacy_notice, name="privacy_notice"),
-    url(r"^privacy-policy/$", privacy_notice, name="privacy_policy"),  # Keeping this to route from old URL
+    url(
+        r"^privacy-policy/$", privacy_notice, name="privacy_policy"
+    ),  # Keeping this to route from old URL
     url(r"^teach/dashboard/$", dashboard_manage, name="dashboard"),
-    url(r"^teach/dashboard/kick/(?P<pk>[0-9]+)/$", organisation_kick, name="organisation_kick"),
-    url(r"^teach/dashboard/toggle_admin/(?P<pk>[0-9]+)/$", organisation_toggle_admin, name="organisation_toggle_admin"),
-    url(r"^teach/dashboard/disable_2FA/(?P<pk>[0-9]+)/$", teacher_disable_2FA, name="teacher_disable_2FA"),
-    url(r"^teach/dashboard/school/leave/$", organisation_leave, name="organisation_leave"),
+    url(
+        r"^teach/dashboard/kick/(?P<pk>[0-9]+)/$",
+        organisation_kick,
+        name="organisation_kick",
+    ),
+    url(
+        r"^teach/dashboard/toggle_admin/(?P<pk>[0-9]+)/$",
+        organisation_toggle_admin,
+        name="organisation_toggle_admin",
+    ),
+    url(
+        r"^teach/dashboard/disable_2FA/(?P<pk>[0-9]+)/$",
+        teacher_disable_2FA,
+        name="teacher_disable_2FA",
+    ),
+    url(
+        r"^teach/dashboard/school/leave/$",
+        organisation_leave,
+        name="organisation_leave",
+    ),
     url(
         r"^teach/dashboard/student/accept/(?P<pk>[0-9]+)/$",
         teacher_accept_student_request,
@@ -278,17 +430,31 @@ urlpatterns = [
         teacher_reject_student_request,
         name="teacher_reject_student_request",
     ),
-    url(rf"^teach/class/(?P<access_code>{ACCESS_CODE_REGEX})$", teacher_view_class, name="view_class"),
     url(
-        rf"^teach/class/delete/(?P<access_code>{ACCESS_CODE_REGEX})$", teacher_delete_class, name="teacher_delete_class"
+        rf"^teach/class/(?P<access_code>{ACCESS_CODE_REGEX})$",
+        teacher_view_class,
+        name="view_class",
+    ),
+    url(
+        rf"^teach/class/delete/(?P<access_code>{ACCESS_CODE_REGEX})$",
+        teacher_delete_class,
+        name="teacher_delete_class",
     ),
     url(
         rf"^teach/class/(?P<access_code>{ACCESS_CODE_REGEX})/students/delete/$",
         teacher_delete_students,
         name="teacher_delete_students",
     ),
-    url(rf"^teach/class/edit/(?P<access_code>{ACCESS_CODE_REGEX})$", teacher_edit_class, name="teacher_edit_class"),
-    url(r"^teach/class/student/edit/(?P<pk>[0-9]+)/$", teacher_edit_student, name="teacher_edit_student"),
+    url(
+        rf"^teach/class/edit/(?P<access_code>{ACCESS_CODE_REGEX})$",
+        teacher_edit_class,
+        name="teacher_edit_class",
+    ),
+    url(
+        r"^teach/class/student/edit/(?P<pk>[0-9]+)/$",
+        teacher_edit_student,
+        name="teacher_edit_student",
+    ),
     url(
         rf"^teach/class/(?P<access_code>{ACCESS_CODE_REGEX})/password_reset/$",
         teacher_class_password_reset,
@@ -304,9 +470,15 @@ urlpatterns = [
         teacher_move_students,
         name="teacher_move_students",
     ),
-    url(r"^teach/dashboard/resend_invite/(?P<token>[0-9a-f]+)/$", resend_invite_teacher, name="resend_invite_teacher"),
     url(
-        r"^teach/dashboard/toggle_admin_invite/(?P<invite_id>[0-9]+)/$", invite_toggle_admin, name="invite_toggle_admin"
+        r"^teach/dashboard/resend_invite/(?P<token>[0-9a-f]+)/$",
+        resend_invite_teacher,
+        name="resend_invite_teacher",
+    ),
+    url(
+        r"^teach/dashboard/toggle_admin_invite/(?P<invite_id>[0-9]+)/$",
+        invite_toggle_admin,
+        name="invite_toggle_admin",
     ),
     url(
         r"^teach/dashboard/delete_teacher_invite/(?P<token>[0-9a-f]+)$",
@@ -320,7 +492,9 @@ urlpatterns = [
     ),
     url(r"^delete/account/$", delete_account, name="delete_account"),
     url(
-        r"^schools/anonymise/(?P<start_id>\d+)/", AnonymiseOrphanSchoolsView.as_view(), name="anonymise_orphan_schools"
+        r"^schools/anonymise/(?P<start_id>\d+)/",
+        AnonymiseOrphanSchoolsView.as_view(),
+        name="anonymise_orphan_schools",
     ),
     url(
         r"^api/",
@@ -345,6 +519,14 @@ urlpatterns = [
         ),
     ),
     url(r"^codingClub/$", coding_club, name="codingClub"),
-    url(r"^codingClub/(?P<student_pack_type>[3-4])/", download_student_pack, name="download_student_pack"),
-    url(r"^removeFakeAccounts/", RemoveFakeAccounts.as_view(), name="remove_fake_accounts"),
+    url(
+        r"^codingClub/(?P<student_pack_type>[3-4])/",
+        download_student_pack,
+        name="download_student_pack",
+    ),
+    url(
+        r"^removeFakeAccounts/",
+        RemoveFakeAccounts.as_view(),
+        name="remove_fake_accounts",
+    ),
 ]

portal/views/email.py

@@ -1,38 +1,47 @@
 from datetime import timedelta
 
 import jwt
-from common.helpers.emails import NOTIFICATION_EMAIL, send_email
-from common.models import School, Student, Teacher
+from common.models import Teacher
 from common.permissions import logged_in_as_independent_student
 from django.conf import settings
 from django.contrib import messages as messages
 from django.contrib.auth.models import User
-from django.db.models import Count
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import reverse_lazy
 from django.utils import timezone
-from django_countries import countries
-
-from portal.app_settings import CONTACT_FORM_EMAILS
 
 
 def verify_email(request, token):
     decoded_jwt = jwt.decode(token, settings.SECRET_KEY, algorithms=["HS256"])
 
     user_found = User.objects.filter(email=decoded_jwt["email"]).first()
-    usertype = "TEACHER" if Teacher.objects.filter(new_user=user_found).exists() else "INDEP_STUDENT"
+    usertype = (
+        "TEACHER"
+        if Teacher.objects.filter(new_user=user_found).exists()
+        else "INDEP_STUDENT"
+    )
     is_expired = decoded_jwt["expires"] < timezone.now().timestamp()
 
     is_changing_email = decoded_jwt["new_email"] != ""
-    updated_email = decoded_jwt["new_email"] if is_changing_email else decoded_jwt["email"]
+    updated_email = (
+        decoded_jwt["new_email"] if is_changing_email else decoded_jwt["email"]
+    )
 
     if not user_found or is_expired:
-        return render(request, "portal/email_verification_failed.html", {"usertype": usertype})
+        return render(
+            request,
+            "portal/email_verification_failed.html",
+            {"usertype": usertype},
+        )
 
     is_user_verified = user_found.userprofile.is_verified
     if is_user_verified and not is_changing_email:
-        return render(request, "portal/email_verification_failed.html", {"usertype": usertype})
+        return render(
+            request,
+            "portal/email_verification_failed.html",
+            {"usertype": usertype},
+        )
 
     if not is_user_verified or is_changing_email:
         user_found.email = updated_email
@@ -41,7 +50,9 @@ def verify_email(request, token):
         user_found.userprofile.save()
         user_found.save()
 
-    messages.success(request, "Your email address was successfully verified, please log in.")
+    messages.success(
+        request, "Your email address was successfully verified, please log in."
+    )
 
     if logged_in_as_independent_student(user_found):
         login_url = "independent_student_login"
@@ -53,43 +64,7 @@ def verify_email(request, token):
 
 def has_verification_failed(verifications):
     return (
-        len(verifications) > 1 or verifications[0].verified or (verifications[0].expiry - timezone.now()) < timedelta()
-    )
-
-
-def send_new_users_report(request):
-    new_users_count = User.objects.filter(date_joined__gte=timezone.now() - timedelta(days=7)).count()
-    users_count = User.objects.count()
-    active_users = User.objects.filter(last_login__gte=timezone.now() - timedelta(days=7)).count()
-    school_count = School.objects.count()
-    teacher_count = Teacher.objects.count()
-    student_count = Student.objects.count()
-    schools_countries = School.objects.values("country").annotate(nb_countries=Count("id")).order_by("-nb_countries")
-    nb_countries = schools_countries.count()
-    countries_count = "\n".join(
-        "{}: {}".format(dict(countries)[k["country"]], k["nb_countries"]) for k in schools_countries[:3]
-    )
-    send_email(
-        NOTIFICATION_EMAIL,
-        CONTACT_FORM_EMAILS,
-        "new users",
-        "There are {new_users} new users this week!\n"
-        "The total number of registered users is now: {users}\n"
-        "Current number of schools: {schools}\n"
-        "Current number of teachers: {teachers}\n"
-        "Current number of students: {students}\n"
-        "Number of users that last logged in during the last week: {active_users}\n"
-        "Number of countries with registered schools: {countries}\n"
-        "Top 3 - schools per country:\n{countries_counter}".format(
-            new_users=new_users_count,
-            users=users_count,
-            schools=school_count,
-            teachers=teacher_count,
-            students=student_count,
-            countries=nb_countries,
-            active_users=active_users,
-            countries_counter=countries_count,
-        ),
-        "new users",
+        len(verifications) > 1
+        or verifications[0].verified
+        or (verifications[0].expiry - timezone.now()) < timedelta()
     )
-    return HttpResponse("success")

codeforlife_portal-6.44.4.dist-info/METADATA

@@ -1,33 +0,0 @@
-Metadata-Version: 2.1
-Name: codeforlife-portal
-Version: 6.44.4
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Framework :: Django
-License-File: LICENSE.md
-Requires-Dist: django ==3.2.25
-Requires-Dist: django-countries ==7.3.1
-Requires-Dist: djangorestframework ==3.13.1
-Requires-Dist: django-pipeline ==2.0.8
-Requires-Dist: django-recaptcha ==2.0.6
-Requires-Dist: pyyaml ==5.4.1
-Requires-Dist: importlib-metadata ==4.13.0
-Requires-Dist: rapid-router >=4
-Requires-Dist: aimmo >=2
-Requires-Dist: reportlab ==3.6.13
-Requires-Dist: django-formtools ==2.2
-Requires-Dist: django-otp ==1.0.2
-Requires-Dist: requests ==2.31.0
-Requires-Dist: django-treebeard ==4.3.1
-Requires-Dist: django-sekizai ==2.0.0
-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.44.4
-Requires-Dist: django-ratelimit ==3.0.1
-Requires-Dist: django-preventconcurrentlogins ==0.8.2
-Requires-Dist: django-csp ==3.7
-Requires-Dist: setuptools ==65.5.1
-Requires-Dist: django-import-export
-