Removed discussions.forum_response_notifications and discussions.send_notifications_for_course

lms/djangoapps/discussion/config/waffle.py

-"""
-This module contains various configuration settings via
-waffle switches for the Discussions app.
-"""
-from openedx.core.djangoapps.waffle_utils import CourseWaffleFlag, WaffleFlagNamespace, WaffleSwitchNamespace
-
-# Namespace
-WAFFLE_NAMESPACE = u'discussions'
-
-# Switches
-FORUM_RESPONSE_NOTIFICATIONS = u'forum_response_notifications'
-
-SEND_NOTIFICATIONS_FOR_COURSE = CourseWaffleFlag(
-    waffle_namespace=WaffleFlagNamespace(name=WAFFLE_NAMESPACE),
-    flag_name=u'send_notifications_for_course',
-    flag_undefined_default=False
-)
-
-
-def waffle():
-    """
-    Returns the namespaced, cached, audited Waffle class for Discussions.
-    """
-    return WaffleSwitchNamespace(name=WAFFLE_NAMESPACE, log_prefix=u'Discussions: ')

lms/djangoapps/discussion/signals/handlers.py

@@ -7,7 +7,7 @@ from django.dispatch import receiver
 from opaque_keys.edx.keys import CourseKey
 
 from django_comment_common import signals
-from lms.djangoapps.discussion.config.waffle import waffle, FORUM_RESPONSE_NOTIFICATIONS, SEND_NOTIFICATIONS_FOR_COURSE
+from lms.djangoapps.discussion.config.waffle import waffle, FORUM_RESPONSE_NOTIFICATIONS
 from lms.djangoapps.discussion import tasks
 from openedx.core.djangoapps.site_configuration.models import SiteConfiguration
 from openedx.core.djangoapps.theming.helpers import get_current_site
@@ -21,14 +21,6 @@ ENABLE_FORUM_NOTIFICATIONS_FOR_SITE_KEY = 'enable_forum_notifications'
 
 @receiver(signals.comment_created)
 def send_discussion_email_notification(sender, user, post, **kwargs):
-    if not waffle().is_enabled(FORUM_RESPONSE_NOTIFICATIONS):
-        log.debug('Discussion: Response notifications waffle switch not enabled')
-        return
-
-    if not SEND_NOTIFICATIONS_FOR_COURSE.is_enabled(CourseKey.from_string(post.thread.course_id)):
-        log.debug('Discussion: Response notifications not enabled for course: %s.', post.thread.course_id)
-        return
-
     current_site = get_current_site()
     if current_site is None:
         log.info('Discussion: No current site, not sending notification about post: %s.', post.id)

lms/djangoapps/discussion/tests/test_signals.py

@@ -2,7 +2,6 @@ from django.test import TestCase
 import mock
 
 from django_comment_common import signals
-from lms.djangoapps.discussion.config.waffle import waffle, FORUM_RESPONSE_NOTIFICATIONS, SEND_NOTIFICATIONS_FOR_COURSE
 from lms.djangoapps.discussion.signals.handlers import ENABLE_FORUM_NOTIFICATIONS_FOR_SITE_KEY
 from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory, SiteConfigurationFactory
 from openedx.core.djangoapps.waffle_utils.testutils import override_waffle_flag
@@ -19,54 +18,44 @@ class SendMessageHandlerTestCase(TestCase):
 
     @mock.patch('lms.djangoapps.discussion.signals.handlers.get_current_site')
     @mock.patch('lms.djangoapps.discussion.signals.handlers.send_message')
-    @override_waffle_flag(SEND_NOTIFICATIONS_FOR_COURSE, True)
     def test_comment_created_signal_sends_message(self, mock_send_message, mock_get_current_site):
         site_config = SiteConfigurationFactory.create(site=self.site)
         site_config.values[ENABLE_FORUM_NOTIFICATIONS_FOR_SITE_KEY] = True
         site_config.save()
         mock_get_current_site.return_value = self.site
-        with waffle().override(FORUM_RESPONSE_NOTIFICATIONS):
-            signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
+        signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
 
-            mock_send_message.assert_called_once_with(self.post, mock_get_current_site.return_value)
+        mock_send_message.assert_called_once_with(self.post, mock_get_current_site.return_value)
 
     @mock.patch('lms.djangoapps.discussion.signals.handlers.send_message')
-    @override_waffle_flag(SEND_NOTIFICATIONS_FOR_COURSE, True)
     def test_comment_created_signal_message_not_sent_without_waffle_switch(self, mock_send_message):
-        with waffle().override(FORUM_RESPONSE_NOTIFICATIONS, active=False):
-            signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
+        signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
 
-            self.assertFalse(mock_send_message.called)
+        self.assertFalse(mock_send_message.called)
 
     @mock.patch('lms.djangoapps.discussion.signals.handlers.send_message')
     def test_comment_created_signal_message_not_sent_without_course_waffle_flag(self, mock_send_message):
-        with waffle().override(FORUM_RESPONSE_NOTIFICATIONS, active=True):
-            signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
+        signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
 
-            self.assertFalse(mock_send_message.called)
+        self.assertFalse(mock_send_message.called)
 
     @mock.patch('lms.djangoapps.discussion.signals.handlers.get_current_site', return_value=None)
     @mock.patch('lms.djangoapps.discussion.signals.handlers.send_message')
-    @override_waffle_flag(SEND_NOTIFICATIONS_FOR_COURSE, True)
     def test_comment_created_signal_message_not_sent_without_site(self, mock_send_message, mock_get_current_site):
-        with waffle().override(FORUM_RESPONSE_NOTIFICATIONS, active=True):
-            signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
+        signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
 
-            self.assertFalse(mock_send_message.called)
+        self.assertFalse(mock_send_message.called)
 
     @mock.patch('lms.djangoapps.discussion.signals.handlers.get_current_site')
     @mock.patch('lms.djangoapps.discussion.signals.handlers.send_message')
-    @override_waffle_flag(SEND_NOTIFICATIONS_FOR_COURSE, True)
     def test_comment_created_signal_msg_not_sent_without_site_config(self, mock_send_message, mock_get_current_site):
         mock_get_current_site.return_value = self.site
-        with waffle().override(FORUM_RESPONSE_NOTIFICATIONS):
-            signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
+        signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
 
-            self.assertFalse(mock_send_message.called)
+        self.assertFalse(mock_send_message.called)
 
     @mock.patch('lms.djangoapps.discussion.signals.handlers.get_current_site')
     @mock.patch('lms.djangoapps.discussion.signals.handlers.send_message')
-    @override_waffle_flag(SEND_NOTIFICATIONS_FOR_COURSE, True)
     def test_comment_created_signal_msg_not_sent_with_site_config_disabled(
             self, mock_send_message, mock_get_current_site
     ):
@@ -74,7 +63,6 @@ class SendMessageHandlerTestCase(TestCase):
         site_config.values[ENABLE_FORUM_NOTIFICATIONS_FOR_SITE_KEY] = False
         site_config.save()
         mock_get_current_site.return_value = self.site
-        with waffle().override(FORUM_RESPONSE_NOTIFICATIONS):
-            signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
+        signals.comment_created.send(sender=self.sender, user=self.user, post=self.post)
 
-            self.assertFalse(mock_send_message.called)
+        self.assertFalse(mock_send_message.called)

lms/djangoapps/discussion/tests/test_tasks.py

@@ -17,7 +17,6 @@ from django_comment_common.signals import comment_created
 from edx_ace.recipient import Recipient
 from edx_ace.renderers import EmailRenderer
 from edx_ace.utils import date
-from lms.djangoapps.discussion.config.waffle import waffle, FORUM_RESPONSE_NOTIFICATIONS, SEND_NOTIFICATIONS_FOR_COURSE
 from lms.djangoapps.discussion.signals.handlers import ENABLE_FORUM_NOTIFICATIONS_FOR_SITE_KEY
 from lms.djangoapps.discussion.tasks import _should_send_message
 from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
@@ -166,7 +165,6 @@ class TaskTestCase(ModuleStoreTestCase):
         self.permalink_patcher.stop()
 
     @ddt.data(True, False)
-    @override_waffle_flag(SEND_NOTIFICATIONS_FOR_COURSE, True)
     def test_send_discussion_email_notification(self, user_subscribed):
         if user_subscribed:
             non_matching_id = 'not-a-match'
@@ -188,9 +186,8 @@ class TaskTestCase(ModuleStoreTestCase):
         site_config = SiteConfigurationFactory.create(site=site)
         site_config.values[ENABLE_FORUM_NOTIFICATIONS_FOR_SITE_KEY] = True
         site_config.save()
-        with waffle().override(FORUM_RESPONSE_NOTIFICATIONS):
-            with mock.patch('lms.djangoapps.discussion.signals.handlers.get_current_site', return_value=site):
-                comment_created.send(sender=None, user=user, post=comment)
+        with mock.patch('lms.djangoapps.discussion.signals.handlers.get_current_site', return_value=site):
+            comment_created.send(sender=None, user=user, post=comment)
 
         if user_subscribed:
             expected_message_context = get_base_template_context(site)
@@ -232,7 +229,6 @@ class TaskTestCase(ModuleStoreTestCase):
             self.assertTrue(self.mock_permalink in rendered_email.body_html)
             self.assertTrue(message.context['site'].domain in rendered_email.body_html)
 
-    @override_waffle_flag(SEND_NOTIFICATIONS_FOR_COURSE, True)
     def run_should_not_send_email_test(self, comment_dict):
         self.mock_request.side_effect = make_mock_responder(
             subscribed_thread_ids=[self.discussion_id],
@@ -241,8 +237,7 @@ class TaskTestCase(ModuleStoreTestCase):
         )
         user = mock.Mock()
         comment = cc.Comment.find(id=comment_dict['id']).retrieve()
-        with waffle().override(FORUM_RESPONSE_NOTIFICATIONS):
-            comment_created.send(sender=None, user=user, post=comment)
+        comment_created.send(sender=None, user=user, post=comment)
 
         actual_result = _should_send_message({
             'thread_author_id': self.thread_author.id,