From 0bfdf93d15ab6c58b8fc83b525355542ae42ddc3 Mon Sep 17 00:00:00 2001 From: Hassan Raza Date: Thu, 27 Mar 2025 01:19:05 +0500 Subject: [PATCH 1/2] fix: Enable ORA new submissions course notification preference --- openedx/core/djangoapps/notifications/base_notification.py | 6 +++--- openedx/core/djangoapps/notifications/models.py | 2 +- openedx/core/djangoapps/notifications/tests/test_views.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openedx/core/djangoapps/notifications/base_notification.py b/openedx/core/djangoapps/notifications/base_notification.py index 17ec8cda45d7..899046e440ed 100644 --- a/openedx/core/djangoapps/notifications/base_notification.py +++ b/openedx/core/djangoapps/notifications/base_notification.py @@ -191,12 +191,12 @@ 'email_template': '', 'filters': [FILTER_AUDIT_EXPIRED_USERS_WITH_NO_ROLE] }, - 'ora_staff_notification': { + 'ora_staff_notifications': { 'notification_app': 'grading', - 'name': 'ora_staff_notification', + 'name': 'ora_staff_notifications', 'is_core': False, 'info': '', - 'web': False, + 'web': True, 'email': False, 'push': False, 'email_cadence': EmailCadence.DAILY, diff --git a/openedx/core/djangoapps/notifications/models.py b/openedx/core/djangoapps/notifications/models.py index ed9c58e50698..e3bad0016ee8 100644 --- a/openedx/core/djangoapps/notifications/models.py +++ b/openedx/core/djangoapps/notifications/models.py @@ -25,7 +25,7 @@ ADDITIONAL_NOTIFICATION_CHANNEL_SETTINGS = ['email_cadence'] # Update this version when there is a change to any course specific notification type or app. -COURSE_NOTIFICATION_CONFIG_VERSION = 12 +COURSE_NOTIFICATION_CONFIG_VERSION = 13 def get_course_notification_preference_config(): diff --git a/openedx/core/djangoapps/notifications/tests/test_views.py b/openedx/core/djangoapps/notifications/tests/test_views.py index 952cda06d528..e624995b050a 100644 --- a/openedx/core/djangoapps/notifications/tests/test_views.py +++ b/openedx/core/djangoapps/notifications/tests/test_views.py @@ -369,8 +369,8 @@ def _expected_api_response(self, course=None): 'enabled': True, 'core_notification_types': [], 'notification_types': { - 'ora_staff_notification': { - 'web': False, + 'ora_staff_notifications': { + 'web': True, 'email': False, 'push': False, 'email_cadence': 'Daily', @@ -1088,7 +1088,7 @@ def setUp(self): "email": True, "email_cadence": "Daily" }, - "ora_staff_notification": { + "ora_staff_notifications": { "web": False, "push": False, "email": False, From cb2fc7d1bdc371d1360e9469f88bcf5b8b4bbd1e Mon Sep 17 00:00:00 2001 From: Hassan Raza Date: Thu, 10 Apr 2025 13:09:25 +0500 Subject: [PATCH 2/2] fix: update edx-ora2 version --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 13f8da5438cc..29c056d6712f 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -828,7 +828,7 @@ openedx-mongodbproxy==0.2.2 # via -r requirements/edx/kernel.in optimizely-sdk==5.2.0 # via -r requirements/edx/bundled.in -ora2==6.15.0 +ora2==6.15.1 # via -r requirements/edx/bundled.in packaging==24.2 # via diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 76d63f0cb0d8..d7f7674bd6f6 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1396,7 +1396,7 @@ optimizely-sdk==5.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -ora2==6.15.0 +ora2==6.15.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 099fafb7bd67..d3372e8dc678 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -1000,7 +1000,7 @@ openedx-mongodbproxy==0.2.2 # via -r requirements/edx/base.txt optimizely-sdk==5.2.0 # via -r requirements/edx/base.txt -ora2==6.15.0 +ora2==6.15.1 # via -r requirements/edx/base.txt packaging==24.2 # via diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 4edc93f95fee..174a06ed72f3 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1058,7 +1058,7 @@ openedx-mongodbproxy==0.2.2 # via -r requirements/edx/base.txt optimizely-sdk==5.2.0 # via -r requirements/edx/base.txt -ora2==6.15.0 +ora2==6.15.1 # via -r requirements/edx/base.txt packaging==24.2 # via