Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
oser-backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hamza Touizrat
oser-backend
Commits
29c3c041
Commit
29c3c041
authored
Dec 28, 2017
by
florimondmanca
Browse files
Options
Downloads
Patches
Plain Diff
add tutoringgroup view to student api
parent
854dfe5a
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
oser_cs/tests/test_api/test_student_api.py
+9
-1
9 additions, 1 deletion
oser_cs/tests/test_api/test_student_api.py
oser_cs/users/views.py
+19
-9
19 additions, 9 deletions
oser_cs/users/views.py
with
28 additions
and
10 deletions
oser_cs/tests/test_api/test_student_api.py
+
9
−
1
View file @
29c3c041
"""
Student API tests.
"""
from
rest_framework
import
status
from
tests.factory
import
StudentFactory
,
TutoringGroupFactory
,
UserFactory
from
tests.test_api.mixins
import
ProfileEndpointsTestMixin
from
tests.utils.api
import
HyperlinkedAPITestCase
...
...
@@ -61,4 +62,11 @@ class StudentEndpointsTest(ProfileEndpointsTestMixin, HyperlinkedAPITestCase):
return
response
def
test_retrieve_tutoring_group
(
self
):
pass
# TODO
def
perform_retrieve_tutoring_group
():
obj
=
self
.
factory
.
create
()
response
=
self
.
client
.
get
(
'
/api/students/{}/tutoringgroup/
'
.
format
(
obj
.
pk
))
return
response
self
.
assertRequiresAuth
(
perform_retrieve_tutoring_group
,
expected_status_code
=
status
.
HTTP_200_OK
)
This diff is collapsed.
Click to expand it.
oser_cs/users/views.py
+
19
−
9
View file @
29c3c041
"""
Users API views.
"""
from
django.contrib.auth
import
get_user_model
from
rest_framework
import
viewsets
from
rest_framework.mixins
import
(
ListModelMixin
,
RetrieveModelMixin
,
CreateModelMixin
,
)
from
dry_rest_permissions.generics
import
DRYPermissions
from
.models
import
Tutor
,
Student
,
SchoolStaffMember
from
.serializers
import
(
UserSerializer
,
UserCreateSerializer
,
UserUpdateSerializer
,
TutorSerializer
,
StudentSerializer
,
SchoolStaffMembersSerializer
,
)
from
rest_framework
import
viewsets
from
rest_framework.decorators
import
detail_route
from
rest_framework.response
import
Response
from
tutoring.serializers
import
TutoringGroupSerializer
from
.models
import
SchoolStaffMember
,
Student
,
Tutor
from
.serializers
import
(
SchoolStaffMembersSerializer
,
StudentSerializer
,
TutorSerializer
,
UserCreateSerializer
,
UserSerializer
,
UserUpdateSerializer
)
User
=
get_user_model
()
...
...
@@ -104,6 +105,15 @@ class StudentViewSet(ProfileViewSet):
queryset
=
Student
.
objects
.
all
()
serializer_class
=
StudentSerializer
@detail_route
()
def
tutoringgroup
(
self
,
request
,
pk
=
None
):
"""
Retrieve the tutoring group of a student.
"""
student
=
self
.
get_object
()
tutoring_group
=
student
.
tutoring_group
serializer
=
TutoringGroupSerializer
(
tutoring_group
,
context
=
{
'
request
'
:
request
})
return
Response
(
serializer
.
data
)
class
SchoolStaffMemberViewSet
(
ProfileViewSet
):
"""
API endpoint that allows school staff members to be viewed or edited.
"""
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment