Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/sentry/api/paginator.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def build_queryset(self, value: object, is_prev: bool) -> QuerySet[Model]:
new_order_by = list(source.query.order_by)
index = new_order_by.index(f"-{self.key}")
new_order_by[index] = new_order_by[index][1:]
source.query.order_b = tuple(new_order_by) # type: ignore[attr-defined] # fixed in #127799
source.query.order_by = tuple(new_order_by)
else:
if asc:
queryset = queryset.order_by(self.key)
Expand Down
20 changes: 20 additions & 0 deletions tests/sentry/api/test_paginator.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,26 @@ def test_descending(self) -> None:
assert result3.next
assert not result3.prev

def test_prev_page_with_explicit_descending_queryset(self) -> None:
joined = timezone.now()

res1 = self.create_user("foo@example.com", date_joined=joined)
res2 = self.create_user("bar@example.com", date_joined=joined + timedelta(seconds=1))
res3 = self.create_user("baz@example.com", date_joined=joined + timedelta(seconds=2))

paginator = DateTimePaginator(
User.objects.order_by("-date_joined"), order_by="-date_joined"
)

result1 = paginator.get_result(limit=2, cursor=None)
assert list(result1) == [res3, res2]

result2 = paginator.get_result(limit=2, cursor=result1.next)
assert list(result2) == [res1]

result3 = paginator.get_result(limit=2, cursor=result2.prev)
assert list(result3) == [res3, res2]

def test_prev_descending_with_new(self) -> None:
joined = timezone.now()

Expand Down
Loading