From b5c74652aaad5298c70ddcd4619452b6f046fb93 Mon Sep 17 00:00:00 2001 From: wajeeha-khalid Date: Mon, 12 Oct 2015 14:51:58 +0500 Subject: [PATCH] MA-1240 - DiscussionAPI: fixed thread-list order-by RecentActivity --- lms/djangoapps/discussion_api/api.py | 2 +- lms/djangoapps/discussion_api/tests/test_api.py | 14 +++++++------- lms/djangoapps/discussion_api/tests/test_views.py | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lms/djangoapps/discussion_api/api.py b/lms/djangoapps/discussion_api/api.py index 12dd914bd1..15b35d5ac0 100644 --- a/lms/djangoapps/discussion_api/api.py +++ b/lms/djangoapps/discussion_api/api.py @@ -291,7 +291,7 @@ def get_thread_list( if exclusive_param_count > 1: # pragma: no cover raise ValueError("More than one mutually exclusive param passed to get_thread_list") - cc_map = {"last_activity_at": "date", "comment_count": "comments", "vote_count": "votes"} + cc_map = {"last_activity_at": "activity", "comment_count": "comments", "vote_count": "votes"} if order_by not in cc_map: raise ValidationError({ "order_by": diff --git a/lms/djangoapps/discussion_api/tests/test_api.py b/lms/djangoapps/discussion_api/tests/test_api.py index 7168f7d159..acb06ff2fc 100644 --- a/lms/djangoapps/discussion_api/tests/test_api.py +++ b/lms/djangoapps/discussion_api/tests/test_api.py @@ -552,7 +552,7 @@ class GetThreadListTest(CommentsServiceMockMixin, UrlResetMixin, SharedModuleSto self.assert_last_query_params({ "user_id": [unicode(self.user.id)], "course_id": [unicode(self.course.id)], - "sort_key": ["date"], + "sort_key": ["activity"], "sort_order": ["desc"], "page": ["1"], "per_page": ["1"], @@ -565,7 +565,7 @@ class GetThreadListTest(CommentsServiceMockMixin, UrlResetMixin, SharedModuleSto self.assert_last_query_params({ "user_id": [unicode(self.user.id)], "course_id": [unicode(self.course.id)], - "sort_key": ["date"], + "sort_key": ["activity"], "sort_order": ["desc"], "page": ["6"], "per_page": ["14"], @@ -776,7 +776,7 @@ class GetThreadListTest(CommentsServiceMockMixin, UrlResetMixin, SharedModuleSto self.assert_last_query_params({ "user_id": [unicode(self.user.id)], "course_id": [unicode(self.course.id)], - "sort_key": ["date"], + "sort_key": ["activity"], "sort_order": ["desc"], "page": ["1"], "per_page": ["10"], @@ -804,7 +804,7 @@ class GetThreadListTest(CommentsServiceMockMixin, UrlResetMixin, SharedModuleSto self.assert_last_query_params({ "user_id": [unicode(self.user.id)], "course_id": [unicode(self.course.id)], - "sort_key": ["date"], + "sort_key": ["activity"], "sort_order": ["desc"], "page": ["1"], "per_page": ["11"], @@ -831,7 +831,7 @@ class GetThreadListTest(CommentsServiceMockMixin, UrlResetMixin, SharedModuleSto self.assert_last_query_params({ "user_id": [unicode(self.user.id)], "course_id": [unicode(self.course.id)], - "sort_key": ["date"], + "sort_key": ["activity"], "sort_order": ["desc"], "page": ["1"], "per_page": ["11"], @@ -840,7 +840,7 @@ class GetThreadListTest(CommentsServiceMockMixin, UrlResetMixin, SharedModuleSto }) @ddt.data( - ("last_activity_at", "date"), + ("last_activity_at", "activity"), ("comment_count", "comments"), ("vote_count", "votes") ) @@ -900,7 +900,7 @@ class GetThreadListTest(CommentsServiceMockMixin, UrlResetMixin, SharedModuleSto self.assert_last_query_params({ "user_id": [unicode(self.user.id)], "course_id": [unicode(self.course.id)], - "sort_key": ["date"], + "sort_key": ["activity"], "sort_order": [http_query], "page": ["1"], "per_page": ["11"], diff --git a/lms/djangoapps/discussion_api/tests/test_views.py b/lms/djangoapps/discussion_api/tests/test_views.py index 9556ad9f8c..27287a8c7a 100644 --- a/lms/djangoapps/discussion_api/tests/test_views.py +++ b/lms/djangoapps/discussion_api/tests/test_views.py @@ -235,7 +235,7 @@ class ThreadViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): self.assert_last_query_params({ "user_id": [unicode(self.user.id)], "course_id": [unicode(self.course.id)], - "sort_key": ["date"], + "sort_key": ["activity"], "sort_order": ["desc"], "page": ["1"], "per_page": ["10"], @@ -257,7 +257,7 @@ class ThreadViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): self.assert_last_query_params({ "user_id": [unicode(self.user.id)], "course_id": [unicode(self.course.id)], - "sort_key": ["date"], + "sort_key": ["activity"], "sort_order": ["desc"], "recursive": ["False"], "page": ["1"], @@ -280,7 +280,7 @@ class ThreadViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): self.assert_last_query_params({ "user_id": [unicode(self.user.id)], "course_id": [unicode(self.course.id)], - "sort_key": ["date"], + "sort_key": ["activity"], "sort_order": ["desc"], "page": ["18"], "per_page": ["4"], @@ -302,7 +302,7 @@ class ThreadViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): self.assert_last_query_params({ "user_id": [unicode(self.user.id)], "course_id": [unicode(self.course.id)], - "sort_key": ["date"], + "sort_key": ["activity"], "sort_order": ["desc"], "page": ["1"], "per_page": ["10"], @@ -333,7 +333,7 @@ class ThreadViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): ) @ddt.data( - ("last_activity_at", "date"), + ("last_activity_at", "activity"), ("comment_count", "comments"), ("vote_count", "votes") ) @@ -381,7 +381,7 @@ class ThreadViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase): self.assert_last_query_params({ "user_id": [unicode(self.user.id)], "course_id": [unicode(self.course.id)], - "sort_key": ["date"], + "sort_key": ["activity"], "recursive": ["False"], "page": ["1"], "per_page": ["10"],