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

Fix: Correct Pagination for User Table Filter - 1430 #1513

Merged
merged 3 commits into from
Dec 20, 2024
Merged

Fix: Correct Pagination for User Table Filter - 1430 #1513

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3b77f6
fix: correct pagination to reflect filtered user count
hamed-valiollahi Dec 19, 2024
45c8c73
fix: remove unnecessary condition for get_users_paginated
hamed-valiollahi Dec 19, 2024
5b9ac63
Merge branch 'release-0.2.0' into fix/hamed-pagination-user-table-1430
hamed-valiollahi Dec 20, 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
6 changes: 3 additions & 3 deletions backend/lcfs/web/api/user/services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ async def get_all_users(self, pagination: PaginationRequestSchema) -> UsersSchem
Get all users
"""
users, total_count = await self.repo.get_users_paginated(pagination=pagination)
if len(users) == 0:
raise DataNotFoundException("No users found")
hamed-valiollahi marked this conversation as resolved.
Show resolved Hide resolved
return UsersSchema(
pagination=PaginationResponseSchema(
total=total_count,
page=pagination.page,
size=pagination.size,
total_pages=math.ceil(total_count / pagination.size),
total_pages=(
math.ceil(total_count / pagination.size) if total_count > 0 else 0
),
),
users=users,
)
Expand Down
Loading