TNL-171: Change topic of a previously posted post.

lms/djangoapps/django_comment_client/base/tests.py

@@ -15,7 +15,7 @@ from django_comment_client.base import views
 from django_comment_client.tests.group_id import CohortedTopicGroupIdTestMixin, NonCohortedTopicGroupIdTestMixin, GroupIdAssertionMixin
 from django_comment_client.tests.utils import CohortedContentTestCase
 from django_comment_client.tests.unicode import UnicodeTestMixin
-from django_comment_common.models import Role, FORUM_ROLE_STUDENT
+from django_comment_common.models import Role
 from django_comment_common.utils import seed_permissions_roles
 from student.tests.factories import CourseEnrollmentFactory, UserFactory
 from util.testing import UrlResetMixin
@@ -160,7 +160,6 @@ class ThreadActionGroupIdTestCase(
         )
 
 
-
 @override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)
 @patch('lms.lib.comment_client.utils.requests.request')
 class ViewsTestCase(UrlResetMixin, ModuleStoreTestCase, MockRequestSetupMixin):
@@ -369,6 +368,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_wrong_commentable_id(self, mock_get_discussion_id_map, mock_request):
+        self._test_request_error(
+            "update_thread",
+            {"thread_id": "dummy", "course_id": self.course_id.to_deprecated_string()},
+            {"body": "foo", "title": "foo", "commentable_id": "wrong_commentable"},
+            mock_request
+        )
+
     def test_create_comment_no_body(self, mock_request):
         self._test_request_error(
             "create_comment",
@@ -460,7 +468,7 @@ class ViewsTestCase(UrlResetMixin, ModuleStoreTestCase, MockRequestSetupMixin):
             "at_position_list": [],
             "closed": is_closed,
             "id": "518d4237b023791dca00000d",
-            "user_id": "1","username": "robot",
+            "user_id": "1", "username": "robot",
             "votes": {
                 "count": 0,
                 "up_count": 0,
@@ -853,13 +861,14 @@ 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('lms.lib.comment_client.utils.requests.request')
-    def _test_unicode_data(self, text, mock_request):
+    def _test_unicode_data(self, text, mock_request, mock_get_discussion_id_map):
         self._set_mock_request_data(mock_request, {
             "user_id": str(self.student.id),
             "closed": False,
         })
-        request = RequestFactory().post("dummy_url", {"body": text, "title": text})
+        request = RequestFactory().post("dummy_url", {"body": text, "title": text, "commentable_id": "test_commentable"})
         request.user = self.student
         request.view_name = "update_thread"
         response = views.update_thread(request, course_id=self.course.id.to_deprecated_string(), thread_id="dummy_thread_id")
@@ -868,6 +877,7 @@ class UpdateThreadUnicodeTestCase(ModuleStoreTestCase, UnicodeTestMixin, MockReq
         self.assertTrue(mock_request.called)
         self.assertEqual(mock_request.call_args[1]["data"]["body"], text)
         self.assertEqual(mock_request.call_args[1]["data"]["title"], text)
+        self.assertEqual(mock_request.call_args[1]["data"]["commentable_id"], "test_commentable")
 
 
 @override_settings(MODULESTORE=TEST_DATA_MIXED_MODULESTORE)

lms/djangoapps/django_comment_client/base/views.py

@@ -18,8 +18,6 @@ from opaque_keys.edx.locations import SlashSeparatedCourseKey
 
 from courseware.access import has_access
 from courseware.courses import get_course_with_access, get_course_by_id
-from course_groups.models import CourseUserGroup
-from course_groups.cohorts import get_cohort_by_id, get_cohort_id, is_commentable_cohorted
 import django_comment_client.settings as cc_settings
 from django_comment_client.utils import (
     add_courseware_context,
@@ -28,7 +26,8 @@ from django_comment_client.utils import (
     JsonError,
     JsonResponse,
     prepare_content,
-    get_group_id_for_comments_service
+    get_group_id_for_comments_service,
+    get_discussion_id_map,
 )
 from django_comment_client.permissions import check_permissions_by_view, cached_has_permission
 import lms.lib.comment_client as cc
@@ -139,12 +138,21 @@ def update_thread(request, course_id, thread_id):
         return JsonError(_("Title can't be empty"))
     if 'body' not in request.POST or not request.POST['body'].strip():
         return JsonError(_("Body can't be empty"))
+
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
     thread = cc.Thread.find(thread_id)
     thread.body = request.POST["body"]
     thread.title = request.POST["title"]
-    thread.save()
 
+    if "commentable_id" in request.POST:
+        course = get_course_with_access(request.user, 'load', course_key)
+        id_map = get_discussion_id_map(course)
+        if request.POST.get("commentable_id") in id_map:
+            thread.commentable_id = request.POST["commentable_id"]
+        else:
+            return JsonError(_("Topic doesn't exist"))
+
+    thread.save()
     if request.is_ajax():
         return ajax_content_response(request, course_key, thread.to_dict())
     else:
@@ -614,6 +622,7 @@ def upload(request, course_id):  # ajax upload file to a question or answer
         }
     })
 
+
 @require_GET
 @login_required
 def users(request, course_id):
@@ -640,7 +649,7 @@ def users(request, course_id):
     try:
         matched_user = User.objects.get(username=username)
         cc_user = cc.User.from_django_user(matched_user)
-        cc_user.course_id=course_key
+        cc_user.course_id = course_key
         cc_user.retrieve(complete=False)
         if (cc_user['threads_count'] + cc_user['comments_count']) > 0:
             user_objs.append({