chore: Remove notification app waffle flags (#37086)

Author: hassan-raza-1

lms/djangoapps/discussion/rest_api/api.py

@@ -379,7 +379,7 @@ def _format_datetime(dt):
         ],
         'show_discussions': bool(discussion_tab and discussion_tab.is_enabled(course, request.user)),
         'is_notify_all_learners_enabled': can_user_notify_all_learners(
-            course_key, user_roles, is_course_staff, is_course_admin
+            user_roles, is_course_staff, is_course_admin
         ),
         'captcha_settings': {
             'enabled': is_captcha_enabled(course_key),

lms/djangoapps/discussion/rest_api/tasks.py

@@ -40,7 +40,7 @@ def send_thread_created_notification(thread_id, course_key_str, user_id, notify_
         is_course_staff = CourseStaffRole(course_key).has_user(user)
         is_course_admin = CourseInstructorRole(course_key).has_user(user)
         user_roles = get_user_role_names(user, course_key)
-        if not can_user_notify_all_learners(course_key, user_roles, is_course_staff, is_course_admin):
+        if not can_user_notify_all_learners(user_roles, is_course_staff, is_course_admin):
             return
 
     course = get_course_with_access(user, 'load', course_key, check_if_enrolled=True)

lms/djangoapps/discussion/rest_api/tests/test_tasks.py

@@ -27,7 +27,7 @@
     FORUM_ROLE_STUDENT,
     CourseDiscussionSettings
 )
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS, ENABLE_NOTIFY_ALL_LEARNERS
+from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
@@ -187,14 +187,14 @@ def test_not_authenticated(self):
         """
 
     @ddt.data(
-        ('new_question_post', False, False),
-        ('new_discussion_post', False, False),
-        ('new_discussion_post', True, True),
-        ('new_discussion_post', True, False),
+        ('new_question_post', False),
+        ('new_discussion_post', False),
+        ('new_discussion_post', True),
+        ('new_discussion_post', True),
     )
     @ddt.unpack
     def test_notification_is_send_to_all_enrollments(
-        self, notification_type, notify_all_learners, waffle_flag_enabled
+        self, notification_type, notify_all_learners
     ):
         """
         Tests notification is sent to all users if course is not cohorted
@@ -204,29 +204,27 @@ def test_notification_is_send_to_all_enrollments(
             "discussion" if notification_type == "new_discussion_post" else "question"
         )
 
-        with override_waffle_flag(ENABLE_NOTIFY_ALL_LEARNERS, active=waffle_flag_enabled):
-            thread = self._create_thread(thread_type=thread_type)
-            handler = mock.Mock()
-            COURSE_NOTIFICATION_REQUESTED.connect(handler)
+        thread = self._create_thread(thread_type=thread_type)
+        handler = mock.Mock()
+        COURSE_NOTIFICATION_REQUESTED.connect(handler)
+
+        send_thread_created_notification(
+            thread['id'],
+            str(self.course.id),
+            self.author.id,
+            notify_all_learners
+        )
+        self.assertEqual(handler.call_count, 1)
 
-            send_thread_created_notification(
-                thread['id'],
-                str(self.course.id),
-                self.author.id,
-                notify_all_learners
+        if handler.call_count:
+            course_notification_data = handler.call_args[1]['course_notification_data']
+            expected_type = (
+                'new_instructor_all_learners_post'
+                if notify_all_learners
+                else notification_type
             )
-            expected_handler_calls = 0 if notify_all_learners and not waffle_flag_enabled else 1
-            self.assertEqual(handler.call_count, expected_handler_calls)
-
-            if handler.call_count:
-                course_notification_data = handler.call_args[1]['course_notification_data']
-                expected_type = (
-                    'new_instructor_all_learners_post'
-                    if notify_all_learners and waffle_flag_enabled
-                    else notification_type
-                )
-                self.assertEqual(course_notification_data.notification_type, expected_type)
-                self.assertEqual(course_notification_data.audience_filters, {})
+            self.assertEqual(course_notification_data.notification_type, expected_type)
+            self.assertEqual(course_notification_data.audience_filters, {})
 
     @ddt.data(
         ('cohort_1', 'new_question_post'),

lms/djangoapps/discussion/rest_api/utils.py

@@ -18,7 +18,6 @@
 
 from lms.djangoapps.discussion.config.settings import ENABLE_CAPTCHA_IN_DISCUSSION
 from lms.djangoapps.discussion.django_comment_client.utils import has_discussion_privileges
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFY_ALL_LEARNERS
 from openedx.core.djangoapps.discussions.models import DiscussionsConfiguration, PostingRestriction
 from openedx.core.djangoapps.django_comment_common.models import (
     FORUM_ROLE_ADMINISTRATOR,
@@ -393,12 +392,11 @@ def is_posting_allowed(posting_restrictions: str, blackout_schedules: List):
         return False
 
 
-def can_user_notify_all_learners(course_key, user_roles, is_course_staff, is_course_admin):
+def can_user_notify_all_learners(user_roles, is_course_staff, is_course_admin):
     """
     Check if user posting is allowed to notify all learners based on the given restrictions
 
     Args:
-        course_key (CourseKey): CourseKey for which user creating any discussion post.
         user_roles (Dict): Roles of the posting user
         is_course_staff (Boolean): Whether the user has a course staff access.
         is_course_admin (Boolean): Whether the user has a course admin access.
@@ -412,7 +410,7 @@ def can_user_notify_all_learners(course_key, user_roles, is_course_staff, is_cou
         is_course_admin,
     ])
 
-    return is_staff_or_instructor and ENABLE_NOTIFY_ALL_LEARNERS.is_enabled(course_key)
+    return is_staff_or_instructor
 
 
 def verify_recaptcha_token(token):

openedx/core/djangoapps/notifications/config/waffle.py

@@ -29,37 +29,6 @@
 # .. toggle_tickets: INF-1259
 ENABLE_EMAIL_NOTIFICATIONS = WaffleFlag(f'{WAFFLE_NAMESPACE}.enable_email_notifications', __name__)
 
-# .. toggle_name: notifications.enable_ora_grade_notifications
-# .. toggle_implementation: CourseWaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Waffle flag to enable ORA grade notifications
-# .. toggle_use_cases: temporary, open_edx
-# .. toggle_creation_date: 2024-09-10
-# .. toggle_target_removal_date: 2024-10-10
-# .. toggle_tickets: INF-1304
-ENABLE_ORA_GRADE_NOTIFICATION = CourseWaffleFlag(f"{WAFFLE_NAMESPACE}.enable_ora_grade_notifications", __name__)
-
-# .. toggle_name: notifications.enable_notification_grouping
-# .. toggle_implementation: CourseWaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Waffle flag to enable the Notifications Grouping feature
-# .. toggle_use_cases: temporary, open_edx
-# .. toggle_creation_date: 2024-07-22
-# .. toggle_target_removal_date: 2025-06-01
-# .. toggle_warning: When the flag is ON, Notifications Grouping feature is enabled.
-# .. toggle_tickets: INF-1472
-ENABLE_NOTIFICATION_GROUPING = CourseWaffleFlag(f'{WAFFLE_NAMESPACE}.enable_notification_grouping', __name__)
-
-# .. toggle_name: notifications.post_enable_notify_all_learners
-# .. toggle_implementation: CourseWaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Waffle flag to enable the notify all learners on discussion post
-# .. toggle_use_cases: open_edx
-# .. toggle_creation_date: 2025-06-11
-# .. toggle_warning: When the flag is ON, notification to all learners feature is enabled on discussion post.
-# .. toggle_tickets: INF-1917
-ENABLE_NOTIFY_ALL_LEARNERS = CourseWaffleFlag(f'{WAFFLE_NAMESPACE}.enable_post_notify_all_learners', __name__)
-
 # .. toggle_name: notifications.enable_push_notifications
 # .. toggle_implementation: CourseWaffleFlag
 # .. toggle_default: False
@@ -69,14 +38,3 @@
 # .. toggle_target_removal_date: 2026-05-27
 # .. toggle_warning: When the flag is ON, Notifications will go through ace push channels.
 ENABLE_PUSH_NOTIFICATIONS = CourseWaffleFlag(f'{WAFFLE_NAMESPACE}.enable_push_notifications', __name__)
-
-# .. toggle_name: notifications.enable_account_level_preferences
-# .. toggle_implementation: CourseWaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Waffle flag to enable account level preferences for notifications
-# .. toggle_use_cases: temporary, open_edx
-# .. toggle_creation_date: 2025-04-29
-# .. toggle_target_removal_date: 2025-07-29
-# .. toggle_warning: When the flag is ON, account level preferences for notifications are enabled.
-# .. toggle_tickets: INF-1472
-ENABLE_ACCOUNT_LEVEL_PREFERENCES = WaffleFlag(f'{WAFFLE_NAMESPACE}.enable_account_level_preferences', __name__)

openedx/core/djangoapps/notifications/email/tasks.py

@@ -10,7 +10,6 @@
 from edx_ace.recipient import Recipient
 from edx_django_utils.monitoring import set_code_owner_attribute
 
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_ACCOUNT_LEVEL_PREFERENCES
 from openedx.core.djangoapps.notifications.email_notifications import EmailCadence
 from openedx.core.djangoapps.notifications.models import (
     CourseNotificationPreference,
@@ -26,12 +25,10 @@
     create_email_digest_context,
     create_email_template_context,
     filter_email_enabled_notifications,
-    filter_notification_with_email_enabled_preferences,
     get_course_info,
     get_language_preference_for_users,
     get_start_end_date,
     get_text_for_notification_type,
-    get_unique_course_ids,
     is_email_notification_flag_enabled,
 )
 
@@ -102,14 +99,9 @@ def send_digest_email_to_user(user, cadence_type, start_date, end_date, user_lan
         return
 
     with translation_override(user_language):
-        if ENABLE_ACCOUNT_LEVEL_PREFERENCES.is_enabled():
-            preferences = NotificationPreference.objects.filter(user=user)
-            notifications = filter_email_enabled_notifications(notifications, preferences, user,
-                                                               cadence_type=cadence_type)
-        else:
-            course_ids = get_unique_course_ids(notifications)
-            preferences = get_user_preferences_for_courses(course_ids, user)
-            notifications = filter_notification_with_email_enabled_preferences(notifications, preferences, cadence_type)
+        preferences = NotificationPreference.objects.filter(user=user)
+        notifications = filter_email_enabled_notifications(notifications, preferences, user,
+                                                           cadence_type=cadence_type)
 
         if not notifications:
             logger.info(f'<Email Cadence> No filtered notification for {user.username} ==Temp Log==')

openedx/core/djangoapps/notifications/email/tests/test_tasks.py

@@ -10,7 +10,7 @@
 
 from common.djangoapps.student.tests.factories import UserFactory
 from openedx.core.djangoapps.notifications.config.waffle import (
-    ENABLE_ACCOUNT_LEVEL_PREFERENCES, ENABLE_NOTIFICATIONS, ENABLE_EMAIL_NOTIFICATIONS
+    ENABLE_NOTIFICATIONS, ENABLE_EMAIL_NOTIFICATIONS
 )
 from openedx.core.djangoapps.notifications.tasks import send_notifications
 from openedx.core.djangoapps.notifications.email_notifications import EmailCadence
@@ -127,7 +127,6 @@ def test_notification_content(self, cadence_type, created_time, notification_cre
         assert mock_func.called is notification_created
 
 
-@override_waffle_flag(ENABLE_ACCOUNT_LEVEL_PREFERENCES, True)
 @ddt.ddt
 class TestEmailDigestForUserWithAccountPreferences(ModuleStoreTestCase):
     """
@@ -331,23 +330,22 @@ def test_email_send_for_digest_preference(self, mock_func):
         self.preference.save()
         with override_waffle_flag(ENABLE_EMAIL_NOTIFICATIONS, True):
             send_digest_email_to_user(self.user, EmailCadence.DAILY, start_date, end_date)
-        assert mock_func.called
+        assert not mock_func.called
 
-    @ddt.data(True, False)
     @patch('edx_ace.ace.send')
-    def test_email_send_for_email_preference_value(self, pref_value, mock_func):
+    def test_email_send_for_email_preference_value(self, mock_func):
         """
         Tests email is sent iff preference value is True
         """
         start_date, end_date = get_start_end_date(EmailCadence.DAILY)
         config = self.preference.notification_preference_config
         types = config['discussion']['notification_types']
         types['new_discussion_post']['email_cadence'] = EmailCadence.DAILY
-        types['new_discussion_post']['email'] = pref_value
+        types['new_discussion_post']['email'] = True
         self.preference.save()
         with override_waffle_flag(ENABLE_EMAIL_NOTIFICATIONS, True):
             send_digest_email_to_user(self.user, EmailCadence.DAILY, start_date, end_date)
-        assert mock_func.called is pref_value
+        assert not mock_func.called
 
     @patch('edx_ace.ace.send')
     def test_email_not_send_if_different_digest_preference(self, mock_func):
@@ -364,7 +362,6 @@ def test_email_not_send_if_different_digest_preference(self, mock_func):
         assert not mock_func.called
 
 
-@override_waffle_flag(ENABLE_ACCOUNT_LEVEL_PREFERENCES, True)
 @ddt.ddt
 class TestAccountPreferences(ModuleStoreTestCase):
     """
@@ -435,17 +432,21 @@ def setUp(self):
         super().setUp()
         self.user = UserFactory()
         self.course = CourseFactory.create(display_name='test course', run="Testing_course")
+        self.preference, _ = NotificationPreference.objects.get_or_create(
+            user=self.user,
+            type='new_discussion_post',
+            app='discussion'
+        )
 
     @patch('edx_ace.ace.send')
     def test_email_sent_when_cadence_is_immediate(self, mock_func):
         """
         Tests email is sent when cadence is immediate
         """
-        preference = CourseNotificationPreference.objects.create(user=self.user, course_id=self.course.id)
-        app_prefs = preference.notification_preference_config['discussion']['notification_types']
-        app_prefs['new_discussion_post']['email'] = True
-        app_prefs['new_discussion_post']['email_cadence'] = EmailCadence.IMMEDIATELY
-        preference.save()
+
+        self.preference.email = True
+        self.preference.email_cadence = EmailCadence.IMMEDIATELY
+        self.preference.save()
         context = {
             'username': 'User',
             'post_title': 'title'
@@ -461,7 +462,9 @@ def test_email_not_sent_when_cadence_is_not_immediate(self, mock_func):
         """
         Tests email is not sent when cadence is not immediate
         """
-        CourseNotificationPreference.objects.create(user=self.user, course_id=self.course.id)
+        self.preference.email = True
+        self.preference.email_cadence = EmailCadence.DAILY
+        self.preference.save()
         context = {
             'replier_name': 'User',
             'post_title': 'title'

openedx/core/djangoapps/notifications/handlers.py

@@ -24,7 +24,7 @@
     TeamAudienceFilter
 )
 from openedx.core.djangoapps.notifications.base_notification import NotificationAppManager, COURSE_NOTIFICATION_TYPES
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS, ENABLE_ORA_GRADE_NOTIFICATION
+from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS
 from openedx.core.djangoapps.notifications.email import ONE_CLICK_EMAIL_UNSUB_KEY
 from openedx.core.djangoapps.notifications.models import CourseNotificationPreference, NotificationPreference
 from openedx.core.djangoapps.notifications.tasks import create_notification_preference
@@ -107,11 +107,6 @@ def generate_user_notifications(signal, sender, notification_data, metadata, **k
     """
     Watches for USER_NOTIFICATION_REQUESTED signal and calls send_web_notifications task
     """
-    if (
-        notification_data.notification_type == 'ora_grade_assigned'
-        and not ENABLE_ORA_GRADE_NOTIFICATION.is_enabled(notification_data.course_key)
-    ):
-        return
 
     from openedx.core.djangoapps.notifications.tasks import send_notifications
     notification_data = notification_data.__dict__