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

fix: sender list was empty in notification generated event (#33590)

Browse Source
This commit is contained in:
Muhammad Adeel Tajamul
2023-10-26 06:49:20 +05:00
committed by GitHub
parent e024d2b62d
commit 808390ace8
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,13 +92,15 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
course_key = CourseKey.from_string(course_key)
if not ENABLE_NOTIFICATIONS.is_enabled(course_key):
return
user_ids = list(set(user_ids))
batch_size = settings.NOTIFICATION_CREATION_BATCH_SIZE
notifications_generated = False
notification_content = ''
sender_id = context.pop('sender_id', None)
default_web_config = get_default_values_of_preference(app_name, notification_type).get('web', True)
default_web_config = get_default_values_of_preference(app_name, notification_type).get('web', False)
generated_notification_audience = []
for batch_user_ids in get_list_in_batches(user_ids, batch_size):
# check if what is preferences of user and make decision to send notification or not
preferences = CourseNotificationPreference.objects.filter(
@@ -111,7 +113,7 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
preferences = create_notification_pref_if_not_exists(batch_user_ids, preferences, course_key)
if not preferences:
return
continue
for preference in preferences:
preference = update_user_preference(preference, preference.user_id, course_key)
@@ -138,17 +140,19 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
course_id=course_key,
)
)
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 notifications_generated:
notifications_generated = True
notification_content = notification_objects[0].content
if notifications_generated:
notification_generated_event(
batch_user_ids, app_name, notification_type, course_key, content_url, notification_content,
sender_id=sender_id
)
if notifications_generated:
notification_generated_event(
generated_notification_audience, app_name, notification_type, course_key, content_url,
notification_content, sender_id=sender_id
)
def update_user_preference(preference: CourseNotificationPreference, user_id, course_id):

7
openedx/core/djangoapps/notifications/tests/test_tasks.py
View File

@@ -124,7 +124,12 @@ class SendNotificationsTest(ModuleStoreTestCase):
content_url = 'https://example.com/'
# Call the `send_notifications` function.
send_notifications([self.user.id], str(self.course_1.id), app_name, notification_type, context, content_url)
with patch('openedx.core.djangoapps.notifications.tasks.notification_generated_event') as event_mock:
send_notifications([self.user.id], str(self.course_1.id), app_name, notification_type, context, content_url)
assert event_mock.called
assert event_mock.call_args[0][0] == [self.user.id]
assert event_mock.call_args[0][1] == app_name
assert event_mock.call_args[0][2] == notification_type
# Assert that `Notification` objects have been created for the users.
notification = Notification.objects.filter(user_id=self.user.id).first()