fix: updated edx.ace.message_sent event (#35498)
* fix: updated edx.ace.message_sent event * fix: fixed pylint checks
This commit is contained in:
committed by
GitHub
parent
a2e2959617
commit
649bd42f9c
@@ -1,7 +1,6 @@
|
||||
"""
|
||||
Signal handlers for the bulk_email app
|
||||
"""
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.dispatch import receiver
|
||||
from eventtracking import tracker
|
||||
|
||||
@@ -32,29 +31,26 @@ def ace_email_sent_handler(sender, **kwargs):
|
||||
"""
|
||||
When an email is sent using ACE, this method will create an event to detect ace email success status
|
||||
"""
|
||||
# Fetch the message object from kwargs, defaulting to None if not present
|
||||
message = kwargs.get('message', None)
|
||||
|
||||
user_model = get_user_model()
|
||||
try:
|
||||
user_id = user_model.objects.get(email=message.recipient.email_address).id
|
||||
except user_model.DoesNotExist:
|
||||
user_id = None
|
||||
course_email = message.context.get('course_email', None)
|
||||
course_id = message.context.get('course_id')
|
||||
# Fetch the message dictionary from kwargs, defaulting to {} if not present
|
||||
message = kwargs.get('message', {})
|
||||
recipient = message.get('recipient', {})
|
||||
message_name = message.get('name', None)
|
||||
context = message.get('context', {})
|
||||
email_address = recipient.get('email', None)
|
||||
user_id = recipient.get('user_id', None)
|
||||
channel = message.get('channel', None)
|
||||
course_id = context.get('course_id', None)
|
||||
if not course_id:
|
||||
course_email = context.get('course_email', None)
|
||||
course_id = course_email.course_id if course_email else None
|
||||
try:
|
||||
channel = sender.__class__.__name__
|
||||
except AttributeError:
|
||||
channel = 'Other'
|
||||
|
||||
tracker.emit(
|
||||
'edx.ace.message_sent',
|
||||
{
|
||||
'message_type': message.name,
|
||||
'message_type': message_name,
|
||||
'channel': channel,
|
||||
'course_id': course_id,
|
||||
'user_id': user_id,
|
||||
'user_email': message.recipient.email_address,
|
||||
'user_email': email_address,
|
||||
}
|
||||
)
|
||||
|
||||
@@ -401,7 +401,7 @@ drf-yasg==1.21.7
|
||||
# via
|
||||
# django-user-tasks
|
||||
# edx-api-doc-tools
|
||||
edx-ace==1.11.1
|
||||
edx-ace==1.11.2
|
||||
# via -r requirements/edx/kernel.in
|
||||
edx-api-doc-tools==1.8.0
|
||||
# via
|
||||
|
||||
@@ -657,7 +657,7 @@ drf-yasg==1.21.7
|
||||
# -r requirements/edx/testing.txt
|
||||
# django-user-tasks
|
||||
# edx-api-doc-tools
|
||||
edx-ace==1.11.1
|
||||
edx-ace==1.11.2
|
||||
# via
|
||||
# -r requirements/edx/doc.txt
|
||||
# -r requirements/edx/testing.txt
|
||||
|
||||
@@ -481,7 +481,7 @@ drf-yasg==1.21.7
|
||||
# -r requirements/edx/base.txt
|
||||
# django-user-tasks
|
||||
# edx-api-doc-tools
|
||||
edx-ace==1.11.1
|
||||
edx-ace==1.11.2
|
||||
# via -r requirements/edx/base.txt
|
||||
edx-api-doc-tools==1.8.0
|
||||
# via
|
||||
|
||||
@@ -505,7 +505,7 @@ drf-yasg==1.21.7
|
||||
# -r requirements/edx/base.txt
|
||||
# django-user-tasks
|
||||
# edx-api-doc-tools
|
||||
edx-ace==1.11.1
|
||||
edx-ace==1.11.2
|
||||
# via -r requirements/edx/base.txt
|
||||
edx-api-doc-tools==1.8.0
|
||||
# via
|
||||
|
||||
Reference in New Issue
Block a user