TNL-549: Fix thread editing.

lms/djangoapps/django_comment_client/base/tests.py

@@ -181,8 +181,11 @@ class ViewsTestCase(UrlResetMixin, ModuleStoreTestCase, MockRequestSetupMixin):
         super(ViewsTestCase, self).setUp(create_user=False)
 
         # create a course
-        self.course = CourseFactory.create(org='MITx', course='999',
-                                           display_name='Robot Super Course')
+        self.course = CourseFactory.create(
+            org='MITx', course='999',
+            discussion_topics={"Some Topic": {"id": "some_topic"}},
+            display_name='Robot Super Course',
+        )
         self.course_id = self.course.id
         # seed the forums permissions and roles
         call_command('seed_permissions_roles', self.course_id.to_deprecated_string())
@@ -605,7 +608,15 @@ class ViewsTestCase(UrlResetMixin, ModuleStoreTestCase, MockRequestSetupMixin):
             mock_request
         )
 
-    @patch('django_comment_client.base.views.get_discussion_id_map', return_value={"test_commentable": {}})
+    def test_update_thread_course_topic(self, mock_request):
+        self._setup_mock_request(mock_request)
+        response = self.client.post(
+            reverse("update_thread", kwargs={"thread_id": "dummy", "course_id": self.course_id.to_deprecated_string()}),
+            data={"body": "foo", "title": "foo", "commentable_id": "some_topic"}
+        )
+        self.assertEqual(response.status_code, 200)
+
+    @patch('django_comment_client.base.views.get_discussion_categories_ids', return_value=["test_commentable"])
     def test_update_thread_wrong_commentable_id(self, mock_get_discussion_id_map, mock_request):
         self._test_request_error(
             "update_thread",
@@ -1101,7 +1112,7 @@ class UpdateThreadUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin, MockReq
         self.student = UserFactory.create()
         CourseEnrollmentFactory(user=self.student, course_id=self.course.id)
 
-    @patch('django_comment_client.base.views.get_discussion_id_map', return_value={"test_commentable": {}})
+    @patch('django_comment_client.base.views.get_discussion_categories_ids', return_value=["test_commentable"])
     @patch('lms.lib.comment_client.utils.requests.request')
     def _test_unicode_data(self, text, mock_request, mock_get_discussion_id_map):
         self._set_mock_request_data(mock_request, {

lms/djangoapps/django_comment_client/base/views.py

@@ -40,7 +40,7 @@ from django_comment_client.utils import (
     permalink,
     add_thread_group_name,
     get_group_id_for_comments_service,
-    get_discussion_id_map,
+    get_discussion_categories_ids
 )
 from util.html import strip_tags
 from django_comment_client.permissions import check_permissions_by_view, cached_has_permission

lms/djangoapps/django_comment_client/tests/test_utils.py

@@ -212,7 +212,6 @@ class CategoryMapTestCase(ModuleStoreTestCase):
         self.course.cohort_config = {"cohorted": False, "cohorted_discussions": ["Topic_A"]}
         check_cohorted_topics([])
 
-
     def test_single_inline(self):
         self.create_discussion("Chapter", "Discussion")
         self.assertCategoryMapEquals(

lms/djangoapps/django_comment_client/utils.py

@@ -96,7 +96,7 @@ def _filter_unstarted_categories(category_map):
     unfiltered_queue = [category_map]
     filtered_queue = [result_map]
 
-    while len(unfiltered_queue) > 0:
+    while unfiltered_queue:
 
         unfiltered_map = unfiltered_queue.pop()
         filtered_map = filtered_queue.pop()