chore: enable notification feature by default (#38073)

Author: AhtishamShahid

cms/djangoapps/contentstore/tests/test_utils.py

@@ -9,7 +9,6 @@
 from django.conf import settings
 from django.test import TestCase
 from django.test.utils import override_settings
-from edx_toggles.toggles.testutils import override_waffle_flag
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locator import CourseLocator, LibraryLocator
 from openedx_events.tests.utils import OpenEdxEventsTestMixin
@@ -24,7 +23,6 @@
 from cms.djangoapps.contentstore.utils import send_course_update_notification
 from common.djangoapps.student.models import CourseEnrollment
 from common.djangoapps.student.tests.factories import GlobalStaffFactory, InstructorFactory, UserFactory
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS
 from openedx.core.djangoapps.notifications.models import Notification
 from openedx.core.djangoapps.site_configuration.tests.test_util import with_site_configuration_context
 from xmodule.modulestore import ModuleStoreEnum  # lint-amnesty, pylint: disable=wrong-import-order
@@ -938,7 +936,6 @@ def test_update_course_details_instructor_paced(self, mock_update):
         mock_update.assert_called_once_with(self.course.id, payload, mock_request.user)
 
 
-@override_waffle_flag(ENABLE_NOTIFICATIONS, active=True)
 class CourseUpdateNotificationTests(OpenEdxEventsTestMixin, ModuleStoreTestCase):
     """
     Unit tests for the course_update notification.

lms/djangoapps/discussion/rest_api/tasks.py

@@ -17,7 +17,7 @@
 from lms.djangoapps.discussion.rest_api.utils import can_user_notify_all_learners
 from openedx.core.djangoapps.django_comment_common.comment_client import Comment
 from openedx.core.djangoapps.django_comment_common.comment_client.thread import Thread
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS
+from openedx.core.djangoapps.notifications.config.waffle import DISABLE_NOTIFICATIONS
 
 
 User = get_user_model()
@@ -31,7 +31,7 @@ def send_thread_created_notification(thread_id, course_key_str, user_id, notify_
     Send notification when a new thread is created
     """
     course_key = CourseKey.from_string(course_key_str)
-    if not ENABLE_NOTIFICATIONS.is_enabled():
+    if DISABLE_NOTIFICATIONS.is_enabled():
         return
     thread = Thread(id=thread_id).retrieve()
     user = User.objects.get(id=user_id)
@@ -55,7 +55,7 @@ def send_response_notifications(thread_id, course_key_str, user_id, comment_id,
     Send notifications to users who are subscribed to the thread.
     """
     course_key = CourseKey.from_string(course_key_str)
-    if not ENABLE_NOTIFICATIONS.is_enabled():
+    if DISABLE_NOTIFICATIONS.is_enabled():
         return
     thread = Thread(id=thread_id).retrieve()
     user = User.objects.get(id=user_id)
@@ -74,7 +74,7 @@ def send_response_endorsed_notifications(thread_id, response_id, course_key_str,
     Send notifications when a response is marked answered/ endorsed
     """
     course_key = CourseKey.from_string(course_key_str)
-    if not ENABLE_NOTIFICATIONS.is_enabled():
+    if DISABLE_NOTIFICATIONS.is_enabled():
         return
     thread = Thread(id=thread_id).retrieve()
     response = Comment(id=response_id).retrieve()

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

@@ -7,7 +7,6 @@
 import ddt
 import httpretty
 from django.conf import settings
-from edx_toggles.toggles.testutils import override_waffle_flag
 from openedx_events.learning.signals import COURSE_NOTIFICATION_REQUESTED, USER_NOTIFICATION_REQUESTED
 
 from common.djangoapps.student.models import CourseEnrollment
@@ -29,7 +28,6 @@
     FORUM_ROLE_STUDENT,
     CourseDiscussionSettings
 )
-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
 
@@ -45,7 +43,6 @@ def _get_mfe_url(course_id, post_id):
 
 
 @ddt.ddt
-@override_waffle_flag(ENABLE_NOTIFICATIONS, active=True)
 class TestSendResponseNotifications(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     """
     Test for the send_response_notifications function
@@ -404,7 +401,6 @@ def _register_subscriptions_endpoint(self):
 
 
 @ddt.ddt
-@override_waffle_flag(ENABLE_NOTIFICATIONS, active=True)
 class TestSendCommentNotification(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     """
     Test case to send new_comment notification
@@ -497,7 +493,6 @@ def test_new_comment_notification(self, is_subscribed):
 @ddt.ddt
 @httpretty.activate
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
-@override_waffle_flag(ENABLE_NOTIFICATIONS, active=True)
 class TestNewThreadCreatedNotification(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     """
     Test cases related to new_discussion_post and new_question_post notification types
@@ -690,7 +685,6 @@ def test_notification_is_send_to_cohort_ids(self, cohort_text, notification_type
         self.assertEqual(handler.call_count, 1)
 
 
-@override_waffle_flag(ENABLE_NOTIFICATIONS, active=True)
 class TestResponseEndorsedNotifications(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     """
     Test case to send response endorsed notifications

openedx/core/djangoapps/enrollments/tests/test_views.py

@@ -20,7 +20,6 @@
 from django.test import Client
 from django.test.utils import override_settings
 from django.urls import reverse
-from edx_toggles.toggles.testutils import override_waffle_flag
 from freezegun import freeze_time
 from rest_framework import status
 from rest_framework.test import APITestCase
@@ -39,7 +38,6 @@
 from openedx.core.djangoapps.enrollments import api, data
 from openedx.core.djangoapps.enrollments.errors import CourseEnrollmentError
 from openedx.core.djangoapps.enrollments.views import EnrollmentUserThrottle
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS
 from openedx.core.djangoapps.oauth_dispatch.jwt import create_jwt_for_user
 from openedx.core.djangoapps.user_api.models import RetirementState, UserOrgTag, UserRetirementStatus
 from openedx.core.djangolib.testing.utils import skip_unless_lms
@@ -155,7 +153,6 @@ def _get_enrollments(self):
 
 
 @override_settings(EDX_API_KEY="i am a key")
-@override_waffle_flag(ENABLE_NOTIFICATIONS, True)
 @ddt.ddt
 @skip_unless_lms
 class EnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITestCase, EnterpriseServiceMockMixin):

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

@@ -7,27 +7,27 @@
 
 WAFFLE_NAMESPACE = 'notifications'
 
-# .. toggle_name: notifications.enable_notifications
-# .. toggle_implementation: CourseWaffleFlag
+# .. toggle_name: notifications.disable_notifications
+# .. toggle_implementation: WaffleFlag
 # .. toggle_default: False
-# .. toggle_description: Waffle flag to enable the Notifications feature
-# .. toggle_use_cases: temporary, open_edx
-# .. toggle_creation_date: 2023-05-05
+# .. toggle_description: Waffle flag to disable the Notifications feature
+# .. toggle_use_cases: open_edx
+# .. toggle_creation_date: 2026-02-03
 # .. toggle_target_removal_date: None
-# .. toggle_warning: When the flag is ON, Notifications feature is enabled.
-# .. toggle_tickets: INF-866
-ENABLE_NOTIFICATIONS = WaffleFlag(f'{WAFFLE_NAMESPACE}.enable_notifications', __name__)
+# .. toggle_warning: When the flag is ON, Notifications feature is disabled.
+# .. toggle_tickets: None
+DISABLE_NOTIFICATIONS = WaffleFlag(f'{WAFFLE_NAMESPACE}.disable_notifications', __name__)
 
-# .. toggle_name: notifications.enable_email_notifications
+# .. toggle_name: notifications.disable_email_notifications
 # .. toggle_implementation: WaffleFlag
 # .. toggle_default: False
-# .. toggle_description: Waffle flag to enable the Email Notifications feature
-# .. toggle_use_cases: temporary, open_edx
-# .. toggle_creation_date: 2024-03-25
-# .. toggle_target_removal_date: 2025-06-01
-# .. toggle_warning: When the flag is ON, Email Notifications feature is enabled.
+# .. toggle_description: Waffle flag to disable the Email Notifications feature
+# .. toggle_use_cases: open_edx
+# .. toggle_creation_date: 2026-02-03
+# .. toggle_target_removal_date: None
+# .. toggle_warning: When the flag is ON, Email Notifications feature will be disabled.
 # .. toggle_tickets: INF-1259
-ENABLE_EMAIL_NOTIFICATIONS = WaffleFlag(f'{WAFFLE_NAMESPACE}.enable_email_notifications', __name__)
+DISABLE_EMAIL_NOTIFICATIONS = WaffleFlag(f'{WAFFLE_NAMESPACE}.disable_email_notifications', __name__)
 
 # .. toggle_name: notifications.enable_push_notifications
 # .. toggle_implementation: CourseWaffleFlag

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

@@ -32,10 +32,9 @@
     get_language_preference_for_users,
     get_start_end_date,
     get_text_for_notification_type,
-    is_email_notification_flag_enabled,
 )
 from ..base_notification import COURSE_NOTIFICATION_APPS
-from ..config.waffle import ENABLE_EMAIL_NOTIFICATIONS
+from ..config.waffle import DISABLE_EMAIL_NOTIFICATIONS
 
 User = get_user_model()
 logger = get_task_logger(__name__)
@@ -76,16 +75,16 @@ def send_digest_email_to_user(
     start_date: Datetime object
     end_date: Datetime object
     """
+    if DISABLE_EMAIL_NOTIFICATIONS.is_enabled():
+        return
 
     if cadence_type not in [EmailCadence.IMMEDIATELY, EmailCadence.DAILY, EmailCadence.WEEKLY]:
         raise ValueError('Invalid cadence_type')
     logger.info(f'<Email Cadence> Sending email to user {user.username} ==Temp Log==')
     if not user.has_usable_password():
         logger.info(f'<Email Cadence> User is disabled {user.username} ==Temp Log==')
         return
-    if not is_email_notification_flag_enabled(user):
-        logger.info(f'<Email Cadence> Flag disabled for {user.username} ==Temp Log==')
-        return
+
     notifications = Notification.objects.filter(user=user, email=True,
                                                 created__gte=start_date, created__lte=end_date)
     if not notifications:
@@ -147,19 +146,21 @@ def send_immediate_cadence_email(email_notification_mapping, course_key):
     2. Second notification → Schedule buffer job (15 min)
     3. Third+ notifications → Just mark as scheduled (no new job)
     """
+    if DISABLE_EMAIL_NOTIFICATIONS.is_enabled():
+        return
+
     if not email_notification_mapping:
         return
     user_list = email_notification_mapping.keys()
     users = list(User.objects.filter(id__in=user_list))
     language_prefs = get_language_preference_for_users(user_list)
     course_name = get_course_info(course_key).get("name", course_key)
+
     for user in users:
         if not user.has_usable_password():
             logger.info(f'<Immediate Email> User is disabled {user.username}')
             continue
-        if not is_email_notification_flag_enabled(user):
-            logger.info(f'<Immediate Email> Flag disabled for {user.username}')
-            continue
+
         notification = email_notification_mapping.get(user.id, None)
         if not notification:
             logger.info(f'<Immediate Email> No notification for {user.username}')
@@ -394,7 +395,7 @@ def send_buffered_digest(
     """
     try:
         # Re-check feature flags
-        if not ENABLE_EMAIL_NOTIFICATIONS.is_enabled():
+        if DISABLE_EMAIL_NOTIFICATIONS.is_enabled():
             logger.info('Email notifications disabled, cancelling digest')
             return