Open in Gmail
Open in
Outlook
diff --git a/portal/tests/test_emails.py b/portal/tests/test_emails.py
index b48f5f2a9..beb03cd26 100644
--- a/portal/tests/test_emails.py
+++ b/portal/tests/test_emails.py
@@ -10,7 +10,6 @@
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 now(cls):
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."
+ )
diff --git a/portal/tests/test_independent_student.py b/portal/tests/test_independent_student.py
index 0589fd809..0f0c35c79 100644
--- a/portal/tests/test_independent_student.py
+++ b/portal/tests/test_independent_student.py
@@ -283,7 +283,7 @@ def test_login_not_verified(self, mock_send_dotdigital_email):
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)
+ page.has_login_failed("independent_student_login_form", INVALID_LOGIN_MESSAGE)
assert page.has_login_failed("independent_student_login_form", INVALID_LOGIN_MESSAGE)
verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
@@ -471,7 +471,9 @@ def test_join_class_nonexistent_class(self):
)
assert self.is_join_class_page(page)
- assert page.has_join_request_failed("Cannot find the school or club and/or class")
+ assert page.has_join_request_failed(
+ "The class code you entered either does not exist or is not currently accepting join requests. Please double check that you have entered the correct class code and contact the teacher of the class to ensure their class is currently accepting join requests."
+ )
def test_join_class_not_accepting_requests(self):
teacher_email, _ = signup_teacher_directly()
@@ -490,7 +492,9 @@ def test_join_class_not_accepting_requests(self):
)
assert self.is_join_class_page(page)
- assert page.has_join_request_failed("Cannot find the school or club and/or class")
+ assert page.has_join_request_failed(
+ "The class code you entered either does not exist or is not currently accepting join requests. Please double check that you have entered the correct class code and contact the teacher of the class to ensure their class is currently accepting join requests."
+ )
def test_join_class_revoked(self):
teacher_email, _ = signup_teacher_directly()
diff --git a/portal/tests/test_views.py b/portal/tests/test_views.py
index a2e30f86a..a512449f5 100644
--- a/portal/tests/test_views.py
+++ b/portal/tests/test_views.py
@@ -53,8 +53,11 @@ class TestTeacherViews(TestCase):
@classmethod
def setUpTestData(cls):
cls.email, cls.password = signup_teacher_directly()
+ cls.school = create_organisation_directly(cls.email)
_, _, cls.class_access_code = create_class_directly(cls.email)
- _, _, cls.student = create_school_student_directly(cls.class_access_code)
+ _, cls.password_student, cls.student = create_school_student_directly(
+ cls.class_access_code
+ )
def login(self):
c = Client()
@@ -63,7 +66,9 @@ def login(self):
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"
@@ -97,7 +102,9 @@ def test_reminder_cards(self):
# 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
@@ -136,7 +143,9 @@ def test_csv(self):
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()
@@ -175,7 +184,9 @@ def test_organisation_kick_has_correct_permissions(self):
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(
@@ -221,6 +232,48 @@ def test_daily_activity_student_details(self):
with pytest.raises(Exception):
count_student_details_click("Wrong download method")
+ def test_release_verified_student(self):
+ c = Client()
+ student_login_url = reverse(
+ "student_login", args=[self.class_access_code]
+ )
+ response = c.post(
+ student_login_url,
+ {
+ "username": self.student.new_user.first_name,
+ "password": self.password_student,
+ },
+ )
+ assert response.status_code == 302
+
+ student = Student.objects.get(pk=self.student.pk)
+ assert student.user.is_verified
+
+ c.logout()
+ c.login(username=self.email, password=self.password)
+
+ release_url = reverse(
+ "teacher_dismiss_students", args=[self.class_access_code]
+ )
+ response = c.post(
+ release_url,
+ {
+ "form-TOTAL_FORMS": 1,
+ "form-INITIAL_FORMS": 1,
+ "form-MIN_NUM_FORMS": 0,
+ "form-MAX_NUM_FORMS": 1000,
+ "form-0-orig_name": self.student.new_user.first_name,
+ "form-0-name": self.student.new_user.first_name,
+ "form-0-email": "independent@gmail.com",
+ "form-0-confirm_email": "independent@gmail.com",
+ "submit_dismiss": "",
+ },
+ )
+ assert response.status_code == 302
+
+ student = Student.objects.get(pk=self.student.pk)
+ assert not student.user.is_verified
+
class TestLoginViews(TestCase):
@classmethod
@@ -238,7 +291,9 @@ def _set_up_test_data(self):
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,
@@ -271,9 +326,16 @@ def _create_and_login_school_student(self, next_url=False):
_, _, 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})
@@ -312,7 +374,9 @@ def test_teacher_session(self):
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
@@ -354,7 +418,9 @@ def test_student_session_class_link(self):
_, _, 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
@@ -375,7 +441,9 @@ def test_student_login_failed(self):
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
@@ -401,7 +469,9 @@ def test_indep_student_session(self):
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
@@ -523,7 +593,9 @@ def test_student_dashboard_view(self):
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")
@@ -602,7 +674,9 @@ def test_delete_account(self, mock_send_dotdigital_email: Mock):
# 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
mock_send_dotdigital_email.assert_called_once()
@@ -684,7 +758,9 @@ def test_delete_account_admin(self, mock_send_dotdigital_email: Mock):
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)
@@ -715,7 +791,9 @@ def test_delete_account_admin(self, mock_send_dotdigital_email: Mock):
self.assertEqual(mock_send_dotdigital_email.call_count, 2)
# 2 teachers left
- teachers = Teacher.objects.filter(school=school).order_by("new_user__last_name", "new_user__first_name")
+ 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
@@ -727,7 +805,9 @@ def test_delete_account_admin(self, mock_send_dotdigital_email: Mock):
# 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
@@ -785,13 +865,17 @@ def test_logged_in_as_admin_check(self):
c.logout()
@patch("common.helpers.emails.send_dotdigital_email")
- def test_registrations_increment_data(self, mock_send_dotdigital_email: Mock):
+ 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"),
@@ -811,7 +895,10 @@ def test_registrations_increment_data(self, mock_send_dotdigital_email: Mock):
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"),
@@ -833,7 +920,10 @@ def test_registrations_increment_data(self, mock_send_dotdigital_email: Mock):
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)
@@ -849,7 +939,10 @@ def test_registrations_increment_data(self, mock_send_dotdigital_email: Mock):
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
@@ -868,8 +961,12 @@ def generic(
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
@@ -888,7 +985,9 @@ def setUp(self):
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)
@@ -904,11 +1003,17 @@ def send_verify_email_reminder(
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
@@ -919,9 +1024,13 @@ def send_verify_email_reminder(
self.client.get(reverse(view_name))
if assert_called:
- mock_send_dotdigital_email.assert_any_call(ANY, [self.teacher_user.email], personalization_values=ANY)
+ mock_send_dotdigital_email.assert_any_call(
+ ANY, [self.teacher_user.email], personalization_values=ANY
+ )
- mock_send_dotdigital_email.assert_any_call(ANY, [self.indy_user.email], personalization_values=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 mock_send_dotdigital_email.call_count == 2
@@ -931,22 +1040,40 @@ def send_verify_email_reminder(
mock_send_dotdigital_email.reset_mock()
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)
+ 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
+ )
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)
+ 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]:
@@ -1011,7 +1138,9 @@ def anonymise_unverified_users(
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
@@ -1034,16 +1163,30 @@ def anonymise_unverified_users(
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()
diff --git a/portal/urls.py b/portal/urls.py
index d2846c9b5..70aedfedc 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -24,9 +24,15 @@
)
from portal.helpers.regexes import ACCESS_CODE_REGEX, JWT_REGEX
from portal.views import cron
-from portal.views.about import about, contribute, getinvolved
-from portal.views.admin import AdminChangePasswordDoneView, AdminChangePasswordView
-from portal.views.aimmo.dashboard import StudentAimmoDashboard, TeacherAimmoDashboard
+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.api import (
AnonymiseOrphanSchoolsView,
InactiveUsersView,
@@ -35,8 +41,11 @@
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,
@@ -50,8 +59,8 @@
from portal.views.login import old_login_form_redirect
from portal.views.login.independent_student import IndependentStudentLoginView
from portal.views.login.student import (
- StudentClassCodeView,
StudentLoginView,
+ StudentClassCodeView,
student_direct_login,
)
from portal.views.login.teacher import TeacherLoginView
@@ -70,8 +79,8 @@
student_edit_account,
)
from portal.views.student.play import (
- IndependentStudentDashboard,
SchoolStudentDashboard,
+ IndependentStudentDashboard,
student_join_organisation,
)
from portal.views.teach import teach
@@ -109,12 +118,30 @@
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",
+ ),
]
@@ -149,22 +176,51 @@
),
),
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
[A-Z0-9]+)/$", play_default_level, name="play_default_level"),
+ url(
+ r"^(?P[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"),
@@ -194,8 +250,16 @@
)(StudentLoginView.as_view()),
name="student_login",
),
- url(r"^login/student/$", StudentClassCodeView.as_view(), name="student_login_access_code"),
- url(r"^u/(?P[0-9]+)/(?P[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[0-9]+)/(?P[a-z0-9]+)/$",
+ student_direct_login,
+ name="student_direct_login",
+ ),
url(
r"^login/independent/$",
ratelimit(
@@ -210,32 +274,70 @@
),
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{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{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[0-9A-Za-z]+)-(?P.+)/$",
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_REGEX})$",
teacher_onboarding_edit_class,
@@ -251,10 +353,22 @@
teacher_download_csv,
name="teacher_download_csv",
),
- url(r"^invited_teacher/(?P[0-9a-f]+)/$", invited_teacher, name="invited_teacher"),
+ url(
+ r"^invited_teacher/(?P[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/$",
@@ -268,19 +382,45 @@
)(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[0-9]+)/$", organisation_kick, name="organisation_kick"),
- url(r"^teach/dashboard/toggle_admin/(?P[0-9]+)/$", organisation_toggle_admin, name="organisation_toggle_admin"),
- url(r"^teach/dashboard/disable_2FA/(?P[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[0-9]+)/$",
+ organisation_kick,
+ name="organisation_kick",
+ ),
+ url(
+ r"^teach/dashboard/toggle_admin/(?P[0-9]+)/$",
+ organisation_toggle_admin,
+ name="organisation_toggle_admin",
+ ),
+ url(
+ r"^teach/dashboard/disable_2FA/(?P[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[0-9]+)/$",
teacher_accept_student_request,
@@ -291,17 +431,31 @@
teacher_reject_student_request,
name="teacher_reject_student_request",
),
- url(rf"^teach/class/(?P{ACCESS_CODE_REGEX})$", teacher_view_class, name="view_class"),
url(
- rf"^teach/class/delete/(?P{ACCESS_CODE_REGEX})$", teacher_delete_class, name="teacher_delete_class"
+ rf"^teach/class/(?P{ACCESS_CODE_REGEX})$",
+ teacher_view_class,
+ name="view_class",
+ ),
+ url(
+ rf"^teach/class/delete/(?P{ACCESS_CODE_REGEX})$",
+ teacher_delete_class,
+ name="teacher_delete_class",
),
url(
rf"^teach/class/(?P{ACCESS_CODE_REGEX})/students/delete/$",
teacher_delete_students,
name="teacher_delete_students",
),
- url(rf"^teach/class/edit/(?P{ACCESS_CODE_REGEX})$", teacher_edit_class, name="teacher_edit_class"),
- url(r"^teach/class/student/edit/(?P[0-9]+)/$", teacher_edit_student, name="teacher_edit_student"),
+ url(
+ rf"^teach/class/edit/(?P{ACCESS_CODE_REGEX})$",
+ teacher_edit_class,
+ name="teacher_edit_class",
+ ),
+ url(
+ r"^teach/class/student/edit/(?P[0-9]+)/$",
+ teacher_edit_student,
+ name="teacher_edit_student",
+ ),
url(
rf"^teach/class/(?P{ACCESS_CODE_REGEX})/password_reset/$",
teacher_class_password_reset,
@@ -317,9 +471,15 @@
teacher_move_students,
name="teacher_move_students",
),
- url(r"^teach/dashboard/resend_invite/(?P[0-9a-f]+)/$", resend_invite_teacher, name="resend_invite_teacher"),
url(
- r"^teach/dashboard/toggle_admin_invite/(?P[0-9]+)/$", invite_toggle_admin, name="invite_toggle_admin"
+ r"^teach/dashboard/resend_invite/(?P[0-9a-f]+)/$",
+ resend_invite_teacher,
+ name="resend_invite_teacher",
+ ),
+ url(
+ r"^teach/dashboard/toggle_admin_invite/(?P[0-9]+)/$",
+ invite_toggle_admin,
+ name="invite_toggle_admin",
),
url(
r"^teach/dashboard/delete_teacher_invite/(?P[0-9a-f]+)$",
@@ -333,7 +493,9 @@
),
url(r"^delete/account/$", delete_account, name="delete_account"),
url(
- r"^schools/anonymise/(?P\d+)/", AnonymiseOrphanSchoolsView.as_view(), name="anonymise_orphan_schools"
+ r"^schools/anonymise/(?P\d+)/",
+ AnonymiseOrphanSchoolsView.as_view(),
+ name="anonymise_orphan_schools",
),
url(
r"^api/",
@@ -358,7 +520,15 @@
),
),
url(r"^codingClub/$", coding_club, name="codingClub"),
- url(r"^codingClub/(?P[3-4])/", download_student_pack, name="download_student_pack"),
- url(r"^removeFakeAccounts/", RemoveFakeAccounts.as_view(), name="remove_fake_accounts"),
+ url(
+ r"^codingClub/(?P[3-4])/",
+ download_student_pack,
+ name="download_student_pack",
+ ),
+ url(
+ r"^removeFakeAccounts/",
+ RemoveFakeAccounts.as_view(),
+ name="remove_fake_accounts",
+ ),
url(r"^tenYears/", ten_year_map_page, name="tenYears"),
]
diff --git a/portal/views/email.py b/portal/views/email.py
index 3d31a643d..671b0dd88 100644
--- a/portal/views/email.py
+++ b/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")
diff --git a/portal/views/teacher/teach.py b/portal/views/teacher/teach.py
index 23ffd108d..afdf370d1 100644
--- a/portal/views/teacher/teach.py
+++ b/portal/views/teacher/teach.py
@@ -552,15 +552,16 @@ def process_dismiss_student_form(request, formset, klass, access_code):
student.new_user.first_name = data["name"]
student.new_user.username = data["email"]
student.new_user.email = data["email"]
+ student.user.is_verified = False
student.save()
student.new_user.save()
- student.new_user.userprofile.save()
+ student.user.save()
# log the data
joinrelease = JoinReleaseStudent.objects.create(student=student, action_type=JoinReleaseStudent.RELEASE)
joinrelease.save()
- send_verification_email(request, student.new_user, data)
+ send_verification_email(request, student.new_user, data, school=klass.teacher.school)
if not failed_users:
messages.success(request, "The students have been released successfully from the class.")
diff --git a/setup.py b/setup.py
index 8223adf1b..d9e36ec22 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,9 @@
from setuptools import find_packages, setup
with open("portal/__init__.py", "r") as fd:
- version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1)
+ version = re.search(
+ r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE
+ ).group(1)
try:
from semantic_release import setup_hook
@@ -17,6 +19,8 @@
setup(
name="codeforlife-portal",
version=version,
+ long_description=open("README.md", "r").read(),
+ long_description_content_type="text/markdown",
packages=find_packages(),
include_package_data=True,
install_requires=[
@@ -32,7 +36,7 @@
"reportlab==3.6.13",
"django-formtools==2.2",
"django-otp==1.0.2", # we needed to fix this due to a wide ranged dependency in django-two-factor-auth
- "requests==2.31.0",
+ "requests==2.32.2",
"django-treebeard==4.3.1",
"django-sekizai==2.0.0",
"django-classy-tags==2.0.0",
@@ -46,6 +50,10 @@
"setuptools==65.5.1",
"django-import-export",
],
- classifiers=["Programming Language :: Python", "Programming Language :: Python :: 3.8", "Framework :: Django"],
+ classifiers=[
+ "Programming Language :: Python",
+ "Programming Language :: Python :: 3.8",
+ "Framework :: Django",
+ ],
zip_safe=False,
)
