Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13421 from edx/TNL-5404

Browse Source 
TNL-5404: Default to not requesting responses when grabbing a single thread.
This commit is contained in:
Robert Raposa
2016-09-08 11:01:58 -04:00
committed by GitHub
parent 948c1bd8ae 26891bc0fd
commit 6f0e097115
6 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/djangoapps/discussion/views.py
View File

@@ -294,6 +294,7 @@ def single_thread(request, course_key, discussion_id, thread_id):
# the comments service.
try:
thread = cc.Thread.find(thread_id).retrieve(
with_responses=True,
recursive=request.is_ajax(),
user_id=request.user.id,
response_skip=request.GET.get("resp_skip"),

1
lms/djangoapps/discussion_api/api.py
View File

@@ -96,6 +96,7 @@ def _get_thread_and_context(request, thread_id, retrieve_kwargs=None):
"""
retrieve_kwargs = retrieve_kwargs or {}
try:
retrieve_kwargs["with_responses"] = True
if "mark_as_read" not in retrieve_kwargs:
retrieve_kwargs["mark_as_read"] = False
cc_thread = Thread(id=thread_id).retrieve(**retrieve_kwargs)

7
lms/djangoapps/discussion_api/tests/test_api.py
View File

@@ -631,6 +631,7 @@ class GetThreadListTest(CommentsServiceMockMixin, UrlResetMixin, SharedModuleSto
"page": ["1"],
"per_page": ["1"],
"recursive": ["False"],
"with_responses": ["True"],
"commentable_ids": ["topic_x,topic_meow"]
})
@@ -644,6 +645,7 @@ class GetThreadListTest(CommentsServiceMockMixin, UrlResetMixin, SharedModuleSto
"page": ["6"],
"per_page": ["14"],
"recursive": ["False"],
"with_responses": ["True"],
})
def test_thread_content(self):
@@ -857,6 +859,7 @@ class GetThreadListTest(CommentsServiceMockMixin, UrlResetMixin, SharedModuleSto
"page": ["1"],
"per_page": ["10"],
"recursive": ["False"],
"with_responses": ["True"],
"text": ["test search string"],
})
@@ -923,6 +926,7 @@ class GetThreadListTest(CommentsServiceMockMixin, UrlResetMixin, SharedModuleSto
"per_page": ["11"],
"recursive": ["False"],
query: ["true"],
"with_responses": ["True"],
})
@ddt.data(
@@ -965,6 +969,7 @@ class GetThreadListTest(CommentsServiceMockMixin, UrlResetMixin, SharedModuleSto
"page": ["1"],
"per_page": ["11"],
"recursive": ["False"],
"with_responses": ["True"],
})
@ddt.data("asc", "desc")
@@ -995,6 +1000,7 @@ class GetThreadListTest(CommentsServiceMockMixin, UrlResetMixin, SharedModuleSto
"page": ["1"],
"per_page": ["11"],
"recursive": ["False"],
"with_responses": ["True"],
})
@@ -1181,6 +1187,7 @@ class GetCommentListTest(CommentsServiceMockMixin, SharedModuleStoreTestCase):
"mark_as_read": ["False"],
"resp_skip": ["70"],
"resp_limit": ["14"],
"with_responses": ["True"]
}
)

8
lms/djangoapps/discussion_api/tests/test_views.py
View File

@@ -432,6 +432,7 @@ class ThreadViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase, Pro
"page": ["1"],
"per_page": ["10"],
"recursive": ["False"],
"with_responses": ["True"],
})
@ddt.data("unread", "unanswered")
@@ -452,6 +453,7 @@ class ThreadViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase, Pro
"sort_key": ["activity"],
"sort_order": ["desc"],
"recursive": ["False"],
"with_responses": ["True"],
"page": ["1"],
"per_page": ["10"],
query: ["true"],
@@ -477,6 +479,7 @@ class ThreadViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase, Pro
"page": ["18"],
"per_page": ["4"],
"recursive": ["False"],
"with_responses": ["True"],
})
def test_text_search(self):
@@ -504,6 +507,7 @@ class ThreadViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase, Pro
"page": ["1"],
"per_page": ["10"],
"recursive": ["False"],
"with_responses": ["True"],
"text": ["test search string"],
})
@@ -598,6 +602,7 @@ class ThreadViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase, Pro
"page": ["1"],
"per_page": ["10"],
"sort_key": [cc_query],
"with_responses": ["True"],
})
@ddt.data("asc", "desc")
@@ -620,6 +625,7 @@ class ThreadViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase, Pro
"page": ["1"],
"per_page": ["10"],
"sort_order": [query],
"with_responses": ["True"],
})
def test_mutually_exclusive(self):
@@ -1130,6 +1136,7 @@ class CommentViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase, Pr
"resp_limit": ["10"],
"user_id": [str(self.user.id)],
"mark_as_read": ["False"],
"with_responses": ["True"],
}
)
@@ -1163,6 +1170,7 @@ class CommentViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase, Pr
"resp_limit": ["4"],
"user_id": [str(self.user.id)],
"mark_as_read": ["False"],
"with_responses": ["True"],
}
)

8
lms/djangoapps/django_comment_client/base/tests.py
View File

@@ -734,7 +734,7 @@ class ViewsTestCase(
('get', '{prefix}/threads/518d4237b023791dca00000d'.format(prefix=CS_PREFIX)),
{
'data': None,
'params': {'mark_as_read': True, 'request_id': ANY},
'params': {'mark_as_read': True, 'request_id': ANY, 'with_responses': False},
'headers': ANY,
'timeout': 5
}
@@ -752,7 +752,7 @@ class ViewsTestCase(
('get', '{prefix}/threads/518d4237b023791dca00000d'.format(prefix=CS_PREFIX)),
{
'data': None,
'params': {'mark_as_read': True, 'request_id': ANY},
'params': {'mark_as_read': True, 'request_id': ANY, 'with_responses': False},
'headers': ANY,
'timeout': 5
}
@@ -812,7 +812,7 @@ class ViewsTestCase(
('get', '{prefix}/threads/518d4237b023791dca00000d'.format(prefix=CS_PREFIX)),
{
'data': None,
'params': {'mark_as_read': True, 'request_id': ANY},
'params': {'mark_as_read': True, 'request_id': ANY, 'with_responses': False},
'headers': ANY,
'timeout': 5
}
@@ -830,7 +830,7 @@ class ViewsTestCase(
('get', '{prefix}/threads/518d4237b023791dca00000d'.format(prefix=CS_PREFIX)),
{
'data': None,
'params': {'mark_as_read': True, 'request_id': ANY},
'params': {'mark_as_read': True, 'request_id': ANY, 'with_responses': False},
'headers': ANY,
'timeout': 5
}

4
lms/lib/comment_client/thread.py
View File

@@ -48,7 +48,8 @@ class Thread(models.Model):
default_params = {'page': 1,
'per_page': 20,
'course_id': query_params['course_id'],
'recursive': False}
'recursive': False,
'with_responses': True}
params = merge_dict(default_params, strip_blank(strip_none(query_params)))
if query_params.get('text'):
@@ -131,6 +132,7 @@ class Thread(models.Model):
url = self.url(action='get', params=self.attributes)
request_params = {
'recursive': kwargs.get('recursive'),
'with_responses': kwargs.get('with_responses', False),
'user_id': kwargs.get('user_id'),
'mark_as_read': kwargs.get('mark_as_read', True),
'resp_skip': kwargs.get('response_skip'),