Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: update to edx-ace 1.0.0

Browse Source 
The new version switches how you specify recipients, to use
lms_user_id instead of usernames.

AA-489
This commit is contained in:
Michael Terry
2021-03-09 16:03:48 -05:00
parent f54e3752fa
commit 570a869bd3
22 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openedx/core/djangoapps/ace_common/tests/mixins.py
View File

@@ -82,7 +82,7 @@ class EmailTemplateTagMixin(object):
self.message = Message(
app_label='test_app_label',
name='test_name',
recipient=Recipient(username='test_user'),
recipient=Recipient(lms_user_id=123),
context={},
send_uuid=uuid.uuid4(),
)

2
openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py
View File

@@ -272,7 +272,7 @@ class ScheduleSendEmailTestMixin(FilteredQueryCountMixin): # lint-amnesty, pyli
}
self._update_schedule_config(schedule_config_kwargs)
mock_message.from_string.return_value.recipient.username = user.username
mock_message.from_string.return_value.recipient.lms_user_id = user.id
mock_msg = Mock()
self.deliver_task(self.site_config.site.id, mock_msg)
if is_enabled:

6
openedx/core/djangoapps/schedules/resolvers.py
View File

@@ -88,7 +88,7 @@ class BinnedSchedulesBaseResolver(PrefixedDebugLoggerMixin, RecipientResolver):
for (user, language, context) in self.schedules_for_bin():
msg = msg_type.personalize(
Recipient(
user.username,
user.id,
self.override_recipient_email or user.email,
),
language,
@@ -370,7 +370,7 @@ class CourseUpdateResolver(BinnedSchedulesBaseResolver):
for (user, language, context) in self.schedules_for_bin():
msg = InstructorLedCourseUpdate().personalize(
Recipient(
user.username,
user.id,
self.override_recipient_email or user.email,
),
language,
@@ -451,7 +451,7 @@ class CourseNextSectionUpdate(PrefixedDebugLoggerMixin, RecipientResolver):
for (user, language, context) in schedules:
msg = CourseUpdate().personalize(
Recipient(
user.username,
user.id,
self.override_recipient_email or user.email,
),
language,

2
openedx/core/djangoapps/schedules/tasks.py
View File

@@ -277,7 +277,7 @@ def _schedule_send(msg_str, site_id, delivery_config_var, log_prefix): # lint-a
if _is_delivery_enabled(site, delivery_config_var, log_prefix):
msg = Message.from_string(msg_str)
user = User.objects.get(username=msg.recipient.username)
user = User.objects.get(id=msg.recipient.lms_user_id)
with emulate_http_request(site=site, user=user):
_annonate_send_task_for_monitoring(msg)
LOG.debug(u'%s: Sending message = %s', log_prefix, msg_str)

2
openedx/core/djangoapps/user_api/accounts/views.py
View File

@@ -456,7 +456,7 @@ class DeactivateLogoutView(APIView):
default=settings.LANGUAGE_CODE
)
notification = DeletionNotificationMessage().personalize(
recipient=Recipient(username='', email_address=user_email),
recipient=Recipient(lms_user_id=0, email_address=user_email),
language=language_code,
user_context=notification_context,
)

6
openedx/core/djangoapps/user_authn/views/password_reset.py
View File

@@ -128,7 +128,7 @@ def send_password_reset_success_email(user, request):
)
msg = PasswordResetSuccess(context=message_context).personalize(
recipient=Recipient(user.username, user.email),
recipient=Recipient(user.id, user.email),
language=user_language_preference,
user_context={"name": user.profile.name},
)
@@ -165,7 +165,7 @@ def send_password_reset_email_for_user(user, request, preferred_email=None):
})
msg = PasswordReset().personalize(
recipient=Recipient(user.username, preferred_email or user.email),
recipient=Recipient(user.id, preferred_email or user.email),
language=user_language_preference,
user_context=message_context,
)
@@ -628,7 +628,7 @@ def password_change_request_handler(request):
})
msg = PasswordReset().personalize(
recipient=Recipient(username='', email_address=email),
recipient=Recipient(lms_user_id=0, email_address=email),
language=settings.LANGUAGE_CODE,
user_context=message_context,
)