Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
4cc23bc6
Commit
4cc23bc6
authored
Apr 12, 2017
by
Calen Pennington
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Attempt to reduce the number of database calls for user_api serialization
parent
0c82bae9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
9 deletions
+4
-9
openedx/core/djangoapps/user_api/serializers.py
+1
-6
openedx/core/djangoapps/user_api/views.py
+3
-3
No files found.
openedx/core/djangoapps/user_api/serializers.py
View file @
4cc23bc6
...
@@ -22,12 +22,7 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
...
@@ -22,12 +22,7 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
"""
"""
Return the name attribute from the user profile object if profile exists else none
Return the name attribute from the user profile object if profile exists else none
"""
"""
try
:
return
user
.
profile
.
name
profile
=
UserProfile
.
objects
.
get
(
user
=
user
)
except
UserProfile
.
DoesNotExist
:
return
None
return
profile
.
name
def
get_preferences
(
self
,
user
):
def
get_preferences
(
self
,
user
):
"""
"""
...
...
openedx/core/djangoapps/user_api/views.py
View file @
4cc23bc6
...
@@ -956,7 +956,7 @@ class UserViewSet(viewsets.ReadOnlyModelViewSet):
...
@@ -956,7 +956,7 @@ class UserViewSet(viewsets.ReadOnlyModelViewSet):
"""
"""
authentication_classes
=
(
authentication
.
SessionAuthentication
,)
authentication_classes
=
(
authentication
.
SessionAuthentication
,)
permission_classes
=
(
ApiKeyHeaderPermission
,)
permission_classes
=
(
ApiKeyHeaderPermission
,)
queryset
=
User
.
objects
.
all
()
.
prefetch_related
(
"preferences"
)
queryset
=
User
.
objects
.
all
()
.
prefetch_related
(
"preferences"
)
.
select_related
(
"profile"
)
serializer_class
=
UserSerializer
serializer_class
=
UserSerializer
paginate_by
=
10
paginate_by
=
10
paginate_by_param
=
"page_size"
paginate_by_param
=
"page_size"
...
@@ -982,7 +982,7 @@ class ForumRoleUsersListView(generics.ListAPIView):
...
@@ -982,7 +982,7 @@ class ForumRoleUsersListView(generics.ListAPIView):
raise
ParseError
(
'course_id must be specified'
)
raise
ParseError
(
'course_id must be specified'
)
course_id
=
SlashSeparatedCourseKey
.
from_deprecated_string
(
course_id_string
)
course_id
=
SlashSeparatedCourseKey
.
from_deprecated_string
(
course_id_string
)
role
=
Role
.
objects
.
get_or_create
(
course_id
=
course_id
,
name
=
name
)[
0
]
role
=
Role
.
objects
.
get_or_create
(
course_id
=
course_id
,
name
=
name
)[
0
]
users
=
role
.
users
.
all
()
users
=
role
.
users
.
prefetch_related
(
"preferences"
)
.
select_related
(
"profile"
)
.
all
()
return
users
return
users
...
@@ -1011,7 +1011,7 @@ class PreferenceUsersListView(generics.ListAPIView):
...
@@ -1011,7 +1011,7 @@ class PreferenceUsersListView(generics.ListAPIView):
paginate_by_param
=
"page_size"
paginate_by_param
=
"page_size"
def
get_queryset
(
self
):
def
get_queryset
(
self
):
return
User
.
objects
.
filter
(
preferences__key
=
self
.
kwargs
[
"pref_key"
])
.
prefetch_related
(
"preferences"
)
return
User
.
objects
.
filter
(
preferences__key
=
self
.
kwargs
[
"pref_key"
])
.
prefetch_related
(
"preferences"
)
.
select_related
(
"profile"
)
class
UpdateEmailOptInPreference
(
APIView
):
class
UpdateEmailOptInPreference
(
APIView
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment