feat: remove last cs_comments service references (#37503)

This commit removes all remaining references to cs_comments_service
except the ForumsConfig model. The only purpose of keeping the model
and table around is so that the webapp processes don't start throwing
errors during deployment because they're running the old code for a
few minutes after the database migration has run. We can drop
ForumsConfig and add the drop-table migration after Ulmo is cut.

Also bumps the openedx-forum version to 0.3.7

---------

Co-authored-by: Taimoor  Ahmed <[email protected]>

Author: taimoor-ahmed-1

common/djangoapps/student/tests/test_admin_views.py

@@ -200,7 +200,7 @@ def test_username_is_readonly_for_user(self):
 
         Changing the username is still possible using the database or from the model directly.
 
-        However, changing the username might cause issues with the logs and/or the cs_comments_service since it
+        However, changing the username might cause issues with the logs and/or the forum service since it
         stores the username in a different database.
         """
         request = Mock()

lms/djangoapps/course_goals/tests/test_user_activity.py

@@ -20,7 +20,6 @@
 from common.djangoapps.student.tests.factories import UserFactory
 from common.djangoapps.util.testing import UrlResetMixin
 from lms.djangoapps.course_goals.models import UserActivity
-from openedx.core.djangoapps.django_comment_common.models import ForumsConfig
 from openedx.features.course_experience import ENABLE_COURSE_GOALS
 
 User = get_user_model()
@@ -53,10 +52,6 @@ def setUp(self):
         self.request = RequestFactory().get('foo')
         self.request.user = self.user
 
-        config = ForumsConfig.current()
-        config.enabled = True
-        config.save()
-
     def test_mfe_tabs_call_user_activity(self):
         '''
         New style tabs call one of two metadata endpoints

lms/djangoapps/discussion/django_comment_client/base/tests_v2.py

@@ -48,7 +48,6 @@
 )
 from lms.djangoapps.discussion.django_comment_client.tests.utils import (
     CohortedTestCase,
-    ForumsEnableMixin,
 )
 from lms.djangoapps.teams.tests.factories import (
     CourseTeamFactory,
@@ -397,7 +396,6 @@ def update_thread_helper(self):
 @disable_signal(views, "comment_flagged")
 @disable_signal(views, "thread_flagged")
 class ViewsTestCase(
-    ForumsEnableMixin,
     MockForumApiMixin,
     UrlResetMixin,
     SharedModuleStoreTestCase,
@@ -1019,7 +1017,6 @@ def test_follow_unfollow_thread_signals(self, view_name, signal):
 
 @disable_signal(views, "comment_endorsed")
 class ViewPermissionsTestCase(
-    ForumsEnableMixin,
     UrlResetMixin,
     SharedModuleStoreTestCase,
     MockForumApiMixin,
@@ -1733,7 +1730,7 @@ def test_create_sub_comment(self, user, commentable_id, status_code):
 @disable_signal(views, "comment_created")
 @ddt.ddt
 class ForumEventTestCase(
-    ForumsEnableMixin, SharedModuleStoreTestCase, MockForumApiMixin
+        SharedModuleStoreTestCase, MockForumApiMixin
 ):
     """
     Forum actions are expected to launch analytics events. Test these here.
@@ -2018,7 +2015,6 @@ def test_comment_event(self, mock_emit):
 
 @disable_signal(views, "thread_edited")
 class UpdateThreadUnicodeTestCase(
-    ForumsEnableMixin,
     SharedModuleStoreTestCase,
     UnicodeTestMixin,
     MockForumApiMixin,
@@ -2084,7 +2080,7 @@ def _test_unicode_data(self, text, mock_get_discussion_id_map):
 
 
 class CreateThreadUnicodeTestCase(
-    ForumsEnableMixin, SharedModuleStoreTestCase, UnicodeTestMixin, MockForumApiMixin
+        SharedModuleStoreTestCase, UnicodeTestMixin, MockForumApiMixin
 ):
 
     @classmethod
@@ -2136,7 +2132,7 @@ def _test_unicode_data(self, text):
 
 @disable_signal(views, "comment_created")
 class CreateCommentUnicodeTestCase(
-    ForumsEnableMixin, SharedModuleStoreTestCase, UnicodeTestMixin, MockForumApiMixin
+        SharedModuleStoreTestCase, UnicodeTestMixin, MockForumApiMixin
 ):
 
     @classmethod
@@ -2189,7 +2185,7 @@ def _test_unicode_data(self, text):
 
 @disable_signal(views, "comment_edited")
 class UpdateCommentUnicodeTestCase(
-    ForumsEnableMixin, SharedModuleStoreTestCase, UnicodeTestMixin, MockForumApiMixin
+        SharedModuleStoreTestCase, UnicodeTestMixin, MockForumApiMixin
 ):
     @classmethod
     def setUpClass(cls):  # pylint: disable=super-method-not-called
@@ -2236,7 +2232,7 @@ def _test_unicode_data(self, text):
 
 @disable_signal(views, "comment_created")
 class CreateSubCommentUnicodeTestCase(
-    ForumsEnableMixin, SharedModuleStoreTestCase, UnicodeTestMixin, MockForumApiMixin
+        SharedModuleStoreTestCase, UnicodeTestMixin, MockForumApiMixin
 ):
     """
     Make sure comments under a response can handle unicode.
@@ -2294,7 +2290,7 @@ def _test_unicode_data(self, text):
             del Thread.commentable_id
 
 
-class UsersEndpointTestCase(ForumsEnableMixin, SharedModuleStoreTestCase, MockForumApiMixin):
+class UsersEndpointTestCase(SharedModuleStoreTestCase, MockForumApiMixin):
 
     @classmethod
     def setUpClass(cls):  # pylint: disable=super-method-not-called
@@ -2468,7 +2464,7 @@ def _create_and_transform_event(**kwargs):
 
 
 @ddt.ddt
-class ForumThreadViewedEventTransformerTestCase(ForumsEnableMixin, UrlResetMixin, ModuleStoreTestCase):
+class ForumThreadViewedEventTransformerTestCase(UrlResetMixin, ModuleStoreTestCase):
     """
     Test that the ForumThreadViewedEventTransformer transforms events correctly
     and without raising exceptions.

lms/djangoapps/discussion/django_comment_client/tests/test_utils.py

@@ -39,12 +39,10 @@
 )
 from openedx.core.djangoapps.django_comment_common.comment_client.utils import (
     CommentClientMaintenanceError,
-    perform_request,
 )
 from openedx.core.djangoapps.django_comment_common.models import (
     CourseDiscussionSettings,
     DiscussionsIdMapping,
-    ForumsConfig,
     assign_role
 )
 from openedx.core.djangoapps.django_comment_common.utils import seed_permissions_roles
@@ -1650,35 +1648,6 @@ def test_divided_outside_group(self, check_condition_function):
                                                                                     'can_report': True}
 
 
-class ClientConfigurationTestCase(TestCase):
-    """Simple test cases to ensure enabling/disabling the use of the comment service works as intended."""
-
-    def test_disabled(self):
-        """Ensures that an exception is raised when forums are disabled."""
-        config = ForumsConfig.current()
-        config.enabled = False
-        config.save()
-
-        with pytest.raises(CommentClientMaintenanceError):
-            perform_request('GET', 'http://www.google.com')
-
-    @patch('requests.request')
-    def test_enabled(self, mock_request):
-        """Ensures that requests proceed normally when forums are enabled."""
-        config = ForumsConfig.current()
-        config.enabled = True
-        config.save()
-
-        response = Mock()
-        response.status_code = 200
-        response.json = lambda: {}
-
-        mock_request.return_value = response
-
-        result = perform_request('GET', 'http://www.google.com')
-        assert result == {}
-
-
 def set_discussion_division_settings(
     course_key, enable_cohorts=False, always_divide_inline_discussions=False,
     divided_discussions=[], division_scheme=CourseDiscussionSettings.COHORT

lms/djangoapps/discussion/django_comment_client/tests/utils.py

@@ -13,24 +13,12 @@
 from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
 from common.djangoapps.util.testing import UrlResetMixin
 from openedx.core.djangoapps.course_groups.tests.helpers import CohortFactory
-from openedx.core.djangoapps.django_comment_common.models import CourseDiscussionSettings, ForumsConfig, Role
+from openedx.core.djangoapps.django_comment_common.models import CourseDiscussionSettings, Role
 from openedx.core.djangoapps.django_comment_common.utils import seed_permissions_roles
 from openedx.core.lib.teams_config import TeamsConfig
 
 
-class ForumsEnableMixin:
-    """
-    Ensures that the forums are enabled for a given test class.
-    """
-    def setUp(self):
-        super().setUp()
-
-        config = ForumsConfig.current()
-        config.enabled = True
-        config.save()
-
-
-class CohortedTestCase(ForumsEnableMixin, UrlResetMixin, SharedModuleStoreTestCase):
+class CohortedTestCase(UrlResetMixin, SharedModuleStoreTestCase):
     """
     Sets up a course with a student, a moderator and their cohorts.
     """

lms/djangoapps/discussion/plugins.py

@@ -20,7 +20,7 @@
 
 class DiscussionTab(TabFragmentViewMixin, EnrolledTab):
     """
-    A tab for the cs_comments_service forums.
+    A tab for the forums.
     """
 
     type = 'discussion'

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

@@ -16,7 +16,6 @@
 from common.djangoapps.student.tests.factories import (
     UserFactory
 )
-from lms.djangoapps.discussion.django_comment_client.tests.utils import ForumsEnableMixin
 from lms.djangoapps.discussion.rest_api.api import get_user_comments
 from lms.djangoapps.discussion.rest_api.tests.utils import (
     ForumMockUtilsMixin,
@@ -29,7 +28,7 @@
 
 @ddt.ddt
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
-class GetUserCommentsTest(ForumsEnableMixin, ForumMockUtilsMixin, SharedModuleStoreTestCase):
+class GetUserCommentsTest(ForumMockUtilsMixin, SharedModuleStoreTestCase):
     """
     Tests for get_user_comments.
     """

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

@@ -43,9 +43,6 @@
 )
 from common.djangoapps.util.testing import UrlResetMixin
 from common.test.utils import MockSignalHandlerMixin, disable_signal
-from lms.djangoapps.discussion.django_comment_client.tests.utils import (
-    ForumsEnableMixin,
-)
 from lms.djangoapps.discussion.tests.utils import (
     make_minimal_cs_comment,
     make_minimal_cs_thread,
@@ -183,7 +180,6 @@ def _set_course_discussion_blackout(course, user_id):
 @disable_signal(api, "thread_voted")
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
 class CreateThreadTest(
-    ForumsEnableMixin,
     UrlResetMixin,
     SharedModuleStoreTestCase,
     MockSignalHandlerMixin,
@@ -601,7 +597,6 @@ def test_following(self):
     new=mock.Mock(),
 )
 class CreateCommentTest(
-    ForumsEnableMixin,
     UrlResetMixin,
     SharedModuleStoreTestCase,
     MockSignalHandlerMixin,
@@ -1039,7 +1034,6 @@ def test_invalid_field(self):
 @disable_signal(api, "thread_voted")
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
 class UpdateThreadTest(
-    ForumsEnableMixin,
     UrlResetMixin,
     SharedModuleStoreTestCase,
     MockSignalHandlerMixin,
@@ -1699,7 +1693,6 @@ def test_update_thread_with_close_reason_code(self, role_name, closed, mock_emit
 @disable_signal(api, "comment_voted")
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
 class UpdateCommentTest(
-    ForumsEnableMixin,
     UrlResetMixin,
     SharedModuleStoreTestCase,
     MockSignalHandlerMixin,
@@ -2303,7 +2296,6 @@ def test_update_comment_with_edit_reason_code(self, role_name, mock_emit):
 @disable_signal(api, "thread_deleted")
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
 class DeleteThreadTest(
-    ForumsEnableMixin,
     UrlResetMixin,
     SharedModuleStoreTestCase,
     MockSignalHandlerMixin,
@@ -2482,7 +2474,6 @@ def test_group_access(self, role_name, course_is_cohorted, thread_group_state):
 @disable_signal(api, "comment_deleted")
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
 class DeleteCommentTest(
-    ForumsEnableMixin,
     UrlResetMixin,
     SharedModuleStoreTestCase,
     MockSignalHandlerMixin,
@@ -2672,7 +2663,6 @@ def test_group_access(self, role_name, course_is_cohorted, thread_group_state):
 @ddt.ddt
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
 class RetrieveThreadTest(
-    ForumsEnableMixin,
     UrlResetMixin,
     SharedModuleStoreTestCase,
     ForumMockUtilsMixin,
@@ -2829,7 +2819,7 @@ def test_course_id_mismatch(self):
 @ddt.ddt
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
 class GetThreadListTest(
-    ForumsEnableMixin, ForumMockUtilsMixin, UrlResetMixin, SharedModuleStoreTestCase
+        ForumMockUtilsMixin, UrlResetMixin, SharedModuleStoreTestCase
 ):
     """Test for get_thread_list"""
 
@@ -3464,7 +3454,7 @@ def test_invalid_order_direction(self):
 @ddt.ddt
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
 class GetCommentListTest(
-    ForumsEnableMixin, SharedModuleStoreTestCase, ForumMockUtilsMixin
+        SharedModuleStoreTestCase, ForumMockUtilsMixin
 ):
     """Test for get_comment_list"""
 
@@ -4235,7 +4225,7 @@ def test_other_providers_ordering_error(self):
 
 @mock.patch.dict("django.conf.settings.FEATURES", {"DISABLE_START_DATES": False})
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
-class GetCourseTopicsTest(ForumMockUtilsMixin, ForumsEnableMixin, UrlResetMixin, ModuleStoreTestCase):
+class GetCourseTopicsTest(ForumMockUtilsMixin, UrlResetMixin, ModuleStoreTestCase):
     """Test for get_course_topics"""
     @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
     def setUp(self):
@@ -4673,7 +4663,7 @@ def test_discussion_topic(self):
 @override_settings(DISCUSSION_MODERATION_EDIT_REASON_CODES={"test-edit-reason": "Test Edit Reason"})
 @override_settings(DISCUSSION_MODERATION_CLOSE_REASON_CODES={"test-close-reason": "Test Close Reason"})
 @ddt.ddt
-class GetCourseTest(ForumsEnableMixin, UrlResetMixin, SharedModuleStoreTestCase):
+class GetCourseTest(UrlResetMixin, SharedModuleStoreTestCase):
     """Test for get_course"""
     @classmethod
     def setUpClass(cls):
@@ -4754,7 +4744,7 @@ def test_privileged_roles(self, role):
 
 @ddt.ddt
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
-class GetCourseTestBlackouts(ForumsEnableMixin, UrlResetMixin, ModuleStoreTestCase):
+class GetCourseTestBlackouts(UrlResetMixin, ModuleStoreTestCase):
     """
     Tests of get_course for courses that have blackout dates.
     """

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

@@ -16,7 +16,6 @@
 
 from common.djangoapps.student.tests.factories import UserFactory
 from common.djangoapps.util.testing import UrlResetMixin
-from lms.djangoapps.discussion.django_comment_client.tests.utils import ForumsEnableMixin
 from lms.djangoapps.discussion.rest_api.serializers import CommentSerializer, ThreadSerializer, get_context
 from lms.djangoapps.discussion.rest_api.tests.utils import (
     ForumMockUtilsMixin,
@@ -36,7 +35,7 @@
 
 
 @ddt.ddt
-class CommentSerializerDeserializationTest(ForumsEnableMixin, ForumMockUtilsMixin, SharedModuleStoreTestCase):
+class CommentSerializerDeserializationTest(ForumMockUtilsMixin, SharedModuleStoreTestCase):
     """Tests for ThreadSerializer deserialization."""
     @classmethod
     def setUpClass(cls):
@@ -387,7 +386,6 @@ def test_update_non_updatable(self, field):
 
 @ddt.ddt
 class ThreadSerializerDeserializationTest(
-        ForumsEnableMixin,
         ForumMockUtilsMixin,
         UrlResetMixin,
         SharedModuleStoreTestCase
@@ -535,7 +533,7 @@ def test_create_anonymous_to_peers(self):
 
 
 @ddt.ddt
-class SerializerTestMixin(ForumsEnableMixin, UrlResetMixin, ForumMockUtilsMixin):
+class SerializerTestMixin(UrlResetMixin, ForumMockUtilsMixin):
     """
     Test Mixin for Serializer tests
     """

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

@@ -11,7 +11,6 @@
 from common.djangoapps.student.roles import CourseInstructorRole, CourseStaffRole
 from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
 from lms.djangoapps.discussion.django_comment_client.tests.factories import RoleFactory
-from lms.djangoapps.discussion.django_comment_client.tests.utils import ForumsEnableMixin
 from lms.djangoapps.discussion.rest_api.tests.utils import CommentsServiceMockMixin
 from lms.djangoapps.discussion.rest_api.utils import (
     discussion_open_for_user,
@@ -182,7 +181,7 @@ def test_remove_empty_sequentials(self):
 
 
 @ddt.ddt
-class TestBlackoutDates(ForumsEnableMixin, CommentsServiceMockMixin, ModuleStoreTestCase):
+class TestBlackoutDates(CommentsServiceMockMixin, ModuleStoreTestCase):
     """
     Test for the is_posting_allowed function
     """