Skip to content
This repository was archived by the owner on Oct 13, 2025. It is now read-only.

Sync to master - #399

Merged
arbrandes merged 7 commits into
openedx-unsupported:open-release/olive.masterfrom
arbrandes:open-release/olive.master
Nov 30, 2022
Merged

Sync to master#399
arbrandes merged 7 commits into
openedx-unsupported:open-release/olive.masterfrom
arbrandes:open-release/olive.master

Conversation

@arbrandes

@arbrandes arbrandes commented Nov 25, 2022

Copy link
Copy Markdown

Merge master into the Olive branch.

xitij2000 and others added 7 commits October 26, 2022 18:00
The user stats API had a few issues that were breaking pagination. First of all the total count of entries was reported
as the count after limiting to the per-page limit. This meant that the count would be limited to the page count even
if there were more entries. This commit adds a facet to the query that fetches the total count, and the data after
limiting. Another issue was using skip after limit, which is the incorrect order. This commit fixes that.
…earner-pagination

fix: pagination for user stats api [BD-38]
When using the default `user_activity` filter for the active threads API, the
pagination and sorting happens in Ruby instead of MongoDB. In addition, when
using the unread filter, the pagination mechanism is different. This code
introduces a fix for when they are both used together.
…nread-pagination

fix: pagination behaviour of user active threads API [BD-38]
…82/add_reverse_order_param

[BD-38][INF-544][BB-6682] feat: implement reverse_order parameter

@xitij2000 xitij2000 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! I think commit related to sorting can be potentially skipped since they add a feature here that won't be in use in Olive. But I don't see any harm in including them either.

@arbrandes

Copy link
Copy Markdown
Author

I'll leave the sorting ones in for the sake of being completely in sync with master, which might make the olive.1 and olive.2 easier. Thanks @xitij2000!

@arbrandes
arbrandes merged commit 501244a into openedx-unsupported:open-release/olive.master Nov 30, 2022
@arbrandes
arbrandes deleted the open-release/olive.master branch November 30, 2022 12:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants