From f88181c3c8376d356070892bb7beafe291c1973e Mon Sep 17 00:00:00 2001
From: alangsto <46360176+alangsto@users.noreply.github.com>
Date: Fri, 19 Feb 2021 14:15:09 -0500
Subject: [PATCH] update context key/value pair being used for approved email
(#26635)
---
lms/djangoapps/verify_student/tests/test_views.py | 7 ++++---
lms/djangoapps/verify_student/views.py | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lms/djangoapps/verify_student/tests/test_views.py b/lms/djangoapps/verify_student/tests/test_views.py
index bd0435d54d7..a5f224c22f2 100644
--- a/lms/djangoapps/verify_student/tests/test_views.py
+++ b/lms/djangoapps/verify_student/tests/test_views.py
@@ -1479,12 +1479,13 @@ class TestPhotoVerificationResultsCallback(ModuleStoreTestCase, TestVerification
"""
return True
- def _assert_verification_approved_email(self):
+ def _assert_verification_approved_email(self, expiration_date):
"""Check that a verification approved email was sent."""
self.assertEqual(len(mail.outbox), 1)
email = mail.outbox[0]
self.assertEqual(email.subject, 'Your édX ID verification was approved!')
self.assertIn('Your édX ID verification photos have been approved', email.body)
+ self.assertIn(expiration_date.strftime("%m/%d/%Y"), email.body)
def _assert_verification_denied_email(self):
"""Check that a verification approved email was sent."""
@@ -1607,7 +1608,7 @@ class TestPhotoVerificationResultsCallback(ModuleStoreTestCase, TestVerification
self.assertEqual(attempt.expiration_datetime.date(), expiration_datetime.date())
self.assertIsNone(old_verification.expiry_email_date)
self.assertEqual(response.content.decode('utf-8'), 'OK!')
- self._assert_verification_approved_email()
+ self._assert_verification_approved_email(expiration_datetime.date())
@patch(
'lms.djangoapps.verify_student.ssencrypt.has_valid_signature',
@@ -1641,7 +1642,7 @@ class TestPhotoVerificationResultsCallback(ModuleStoreTestCase, TestVerification
self.assertEqual(attempt.status, u'approved')
self.assertEqual(attempt.expiration_datetime.date(), expiration_datetime.date())
self.assertEqual(response.content.decode('utf-8'), 'OK!')
- self._assert_verification_approved_email()
+ self._assert_verification_approved_email(expiration_datetime.date())
@patch(
'lms.djangoapps.verify_student.ssencrypt.has_valid_signature',
diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py
index 0ed1bb8e298..d8f32afe3e0 100644
--- a/lms/djangoapps/verify_student/views.py
+++ b/lms/djangoapps/verify_student/views.py
@@ -1118,8 +1118,8 @@ def results_callback(request): # lint-amnesty, pylint: disable=too-many-stateme
log.debug(u'Approving verification for {}'.format(receipt_id))
attempt.approve()
- expiry_date = datetime.date.today() + datetime.timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
- email_context = {'user': user, 'expiry_date': expiry_date.strftime("%m/%d/%Y")}
+ expiration_datetime = attempt.expiration_datetime.date()
+ email_context = {'user': user, 'expiration_datetime': expiration_datetime.strftime("%m/%d/%Y")}
send_verification_approved_email(context=email_context)
elif result == "FAIL":
--
GitLab