Skip to content

feat: added sort by recent activity for activity stats api #31252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
muhammadadeeltajamul merged 1 commit into from
Nov 7, 2022
Merged

feat: added sort by recent activity for activity stats api #31252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lms/djangoapps/discussion/rest_api/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1694,7 +1694,7 @@ def get_course_discussion_user_stats(
order_by = order_by or UserOrdering.BY_FLAGS
else:
order_by = order_by or UserOrdering.BY_ACTIVITY
if order_by != UserOrdering.BY_ACTIVITY:
if order_by == UserOrdering.BY_FLAGS:
raise ValidationError({"order_by": "Invalid value"})

if not ENABLE_LEARNERS_STATS.is_enabled(course_key):
Expand Down
1 change: 1 addition & 0 deletions lms/djangoapps/discussion/rest_api/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
class UserOrdering(TextChoices):
BY_ACTIVITY = 'activity'
BY_FLAGS = 'flagged'
BY_RECENT_ACTIVITY = 'recency'


class _PaginationForm(Form):
Expand Down
2 changes: 2 additions & 0 deletions lms/djangoapps/discussion/rest_api/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2960,9 +2960,11 @@ def test_moderator_user(self):
@ddt.data(
("moderator", "flagged", "flagged"),
("moderator", "activity", "activity"),
("moderator", "recency", "recency"),
("moderator", None, "flagged"),
("user", None, "activity"),
("user", "activity", "activity"),
("user", "recency", "recency"),
)
@ddt.unpack
@mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
Expand Down