Skip to content

Try to fix user tests #358

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

Closed
duckduckgrayduck wants to merge 1 commit into from
Closed

Try to fix user tests #358

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
20 changes: 17 additions & 3 deletions documentcloud/users/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,23 @@ def retrieve(self, request, *args, **kwargs):
return super().retrieve(request, *args, **kwargs)

def get_queryset(self):
return User.objects.get_viewable(self.request.user).preload(
self.request.user, self.request.query_params.get("expand", "")
)
"""
Return viewable users, with optional prefetching to avoid N+1 queries.
"""
expand = self.request.query_params.get("expand", "")

# Base queryset
qs = User.objects.get_viewable(self.request.user)

# Prefetch related fields if expanding organization
if "organization" in expand:
qs = qs.select_related(
"organization", # user's active organization
"organization__parent", # organization's parent
).prefetch_related(
"organization__groups" # organization's groups
)
return qs.preload(self.request.user, expand)

def get_object(self):
"""Allow one to lookup themselves by specifying `me` as the pk"""
Expand Down
Loading