Skip to content
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

Jump to bottom

Fix calculation of has_next_page in resolve_connection_from_cache #622

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Fix calculation of has_next_page in resolve_connection_from_cache #622

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
810c045
Fix calculation of `has_next_page` in `resolve_connection_from_cache`.
SupImDos Sep 3, 2024
0bb44eb
Add smoke test for the fix.
SupImDos Sep 3, 2024
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
8 changes: 6 additions & 2 deletions strawberry_django/relay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,15 @@ def resolve_connection_from_cache(
for node in result
]
has_previous_page = (
nodes[0]._strawberry_row_number > 1 # type: ignore
result[0]._strawberry_row_number > 1 # type: ignore
if result
else False
)
Comment on lines 190 to +194
Copy link
Contributor

Choose a reason for hiding this comment

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

suggestion: Consider refactoring to improve robustness and performance

The current implementation could raise an IndexError if result is empty. Additionally, accessing result[0] and result[-1] multiple times may impact performance for larger lists. Consider refactoring like this:

if not result:
    has_previous_page = False
    has_next_page = False
else:
    first_item = result[0]
    last_item = result[-1]
    has_previous_page = first_item._strawberry_row_number > 1
    has_next_page = last_item._strawberry_row_number < last_item._strawberry_total_count

This approach handles the empty list case first and optimizes list access. It also maintains the corrected logic for has_next_page, which is an improvement over the previous version.

Suggested change
has_previous_page = (
nodes[0]._strawberry_row_number > 1 # type: ignore
result[0]._strawberry_row_number > 1 # type: ignore
if result
else False
)
if not result:
has_previous_page = False
else:
first_item = result[0]
has_previous_page = first_item._strawberry_row_number > 1

has_next_page = (
result[-1]._strawberry_row_number < result[-1]._strawberry_total_count # type: ignore
if result
else False
)
has_next_page = result._strawberry_row_number < result if result else False

return cls(
edges=edges,
Expand Down