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

chore: Added logs in notification send function (#37005)

Browse Source
This commit is contained in:
jawad khan
2025-07-11 11:46:40 +05:00
committed by GitHub
parent 5657e751bb
commit 2388112646
3 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openedx/core/djangoapps/notifications/push/tasks.py
View File

@@ -10,7 +10,7 @@ User = get_user_model()
logger = get_task_logger(__name__)
def send_ace_msg_to_push_channel(audience_ids, notification_object, sender_id):
def send_ace_msg_to_push_channel(audience_ids, notification_object):
"""
Send mobile notifications using ace to push channels.
"""

16
openedx/core/djangoapps/notifications/push/tests/test_tasks.py
View File

@@ -36,11 +36,7 @@ class SendNotificationsTest(ModuleStoreTestCase):
@mock.patch('openedx.core.djangoapps.notifications.push.tasks.ace.send')
def test_send_ace_msg_success(self, mock_ace_send):
""" Test send_ace_msg_success """
send_ace_msg_to_push_channel(
[self.user_1.id, self.user_2.id],
self.notification,
sender_id=self.user_1.id
)
send_ace_msg_to_push_channel([self.user_1.id, self.user_2.id], self.notification)
mock_ace_send.assert_called_once()
message_sent = mock_ace_send.call_args[0][0]
@@ -50,18 +46,14 @@ class SendNotificationsTest(ModuleStoreTestCase):
@mock.patch('openedx.core.djangoapps.notifications.push.tasks.ace.send')
def test_send_ace_msg_no_sender(self, mock_ace_send):
""" Test when sender is not valid """
send_ace_msg_to_push_channel(
[self.user_1.id, self.user_2.id],
self.notification,
sender_id=999
)
send_ace_msg_to_push_channel([self.user_1.id, self.user_2.id], self.notification)
mock_ace_send.assert_called_once()
@mock.patch('openedx.core.djangoapps.notifications.push.tasks.ace.send')
def test_send_ace_msg_empty_audience(self, mock_ace_send):
""" Test send_ace_msg_success with empty audience """
send_ace_msg_to_push_channel([], self.notification, sender_id=self.user_1.id)
send_ace_msg_to_push_channel([], self.notification)
mock_ace_send.assert_not_called()
@mock.patch('openedx.core.djangoapps.notifications.push.tasks.ace.send')
@@ -69,5 +61,5 @@ class SendNotificationsTest(ModuleStoreTestCase):
""" Test send_ace_msg_success with non-discussion app """
self.notification.app_name = 'ecommerce'
self.notification.save()
send_ace_msg_to_push_channel([1], self.notification, sender_id=self.user_1.id)
send_ace_msg_to_push_channel([1], self.notification)
mock_ace_send.assert_not_called()

17
openedx/core/djangoapps/notifications/tasks.py
View File

@@ -167,7 +167,7 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
for batch_user_ids in get_list_in_batches(user_ids, batch_size):
logger.debug(f'Sending notifications to {len(batch_user_ids)} users in {course_key}')
batch_user_ids = NotificationFilter().apply_filters(batch_user_ids, course_key, notification_type)
logger.debug(f'After applying filters, sending notifications to {len(batch_user_ids)} users in {course_key}')
logger.info(f'After applying filters, sending notifications to {len(batch_user_ids)} users in {course_key}')
existing_notifications = (
get_user_existing_notifications(batch_user_ids, notification_type, group_by_id, course_key)) \
@@ -233,16 +233,16 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
if grouping_enabled and existing_notifications.get(user_id, None):
group_user_notifications(new_notification, existing_notifications[user_id])
if not generated_notification:
generated_notification = new_notification
else:
notifications.append(new_notification)
if not generated_notification:
generated_notification = new_notification
generated_notification_audience.append(user_id)
# send notification to users but use bulk_create
notification_objects = Notification.objects.bulk_create(notifications)
if notification_objects and not generated_notification:
generated_notification = notification_objects[0]
Notification.objects.bulk_create(notifications)
if email_notification_mapping:
send_immediate_cadence_email(email_notification_mapping, course_key)
@@ -252,7 +252,10 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
generated_notification_audience, app_name, notification_type, course_key, content_url,
generated_notification.content, sender_id=sender_id
)
send_ace_msg_to_push_channel(push_notification_audience, generated_notification, sender_id)
info_msg = "Sending %s %s notification to ace push channel for user ids %s"
logger.info(info_msg, generated_notification.app_name,
generated_notification.notification_type, push_notification_audience)
send_ace_msg_to_push_channel(push_notification_audience, generated_notification)
def is_notification_valid(notification_type, context):