update various serializers to use IDs instead of URLs

oser_backend/api/urls.py

@@ -20,12 +20,6 @@ urlpatterns = [
 
 router = routers.DefaultRouter(trailing_slash=True)
 
-# Visits views
-router.register('visits', visits_views.VisitViewSet)
-router.register('visit-participants', visits_views.VisitParticipantsViewSet,
-                base_name='visit-participants')
-router.register('places', visits_views.PlaceViewSet)
-
 # Users views
 router.register('users', users_views.UserViewSet)
 router.register('tutors', users_views.TutorViewSet)
@@ -33,14 +27,21 @@ router.register('students', users_views.StudentViewSet)
 
 # Tutoring views
 router.register('schools', tutoring_views.SchoolViewSet)
-router.register('tutoring/groups', tutoring_views.TutoringGroupViewSet,
+router.register('groups', tutoring_views.TutoringGroupViewSet,
                 base_name='tutoring_group')
-router.register('tutoring/sessions', tutoring_views.TutoringSessionViewSet,
+router.register('sessions', tutoring_views.TutoringSessionViewSet,
                 base_name='tutoring_session')
 
 # Register views
 router.register('registrations', register_views.RegistrationViewSet)
 
+# Visits views
+router.register('visits', visits_views.VisitViewSet)
+router.register('visit-participants', visits_views.VisitParticipantsViewSet,
+                base_name='visit-participants')
+router.register('places', visits_views.PlaceViewSet)
+
+
 # Showcase site views
 router.register('articles', showcase_site_views.ArticleViewSet)
 router.register('categories', showcase_site_views.CategoryViewSet)

oser_backend/core/serializers.py

@@ -15,7 +15,7 @@ class DocumentSerializer(serializers.HyperlinkedModelSerializer):
 
     class Meta:  # noqa
         model = Document
-        fields = ('url', 'title', 'slug', 'content')
+        fields = ('title', 'slug', 'content', 'url')
         extra_kwargs = {
             'url': {
                 'view_name': 'api:document-detail',

oser_backend/showcase_site/serializers.py

@@ -56,9 +56,9 @@ class ArticleSerializer(serializers.HyperlinkedModelSerializer):
 
     class Meta:  # noqa
         model = Article
-        fields = ('id', 'url', 'title', 'slug', 'introduction',
+        fields = ('id', 'title', 'slug', 'introduction',
                   'content', 'published', 'modified', 'image',
-                  'display_image', 'pinned', 'categories',)
+                  'display_image', 'pinned', 'categories', 'url',)
         extra_kwargs = {
             'slug': {'read_only': True},
             'url': {'view_name': 'api:article-detail'},

oser_backend/tests/test_showcase_site/test_article_api.py

@@ -41,9 +41,9 @@ class TestArticleSerializer(SerializerTestCaseMixin, TestCase):
     factory_class = ArticleFactory
 
     expected_fields = (
-        'id', 'url', 'title', 'slug', 'content', 'introduction',
+        'id', 'title', 'slug', 'content', 'introduction',
         'published', 'modified',
-        'image', 'display_image', 'pinned', 'categories',
+        'image', 'display_image', 'pinned', 'categories', 'url',
     )
 
     def get_object(self):

oser_backend/tests/test_tutoring/test_tutoring_group.py

@@ -33,7 +33,7 @@ class TutoringGroupTest(ModelTestCase):
     def test_get_absolute_url(self):
         self.client.force_login(UserFactory.create())
         response = self.client.get(
-            '/api/tutoring/groups/{}/'.format(self.obj.pk))
+            '/api/groups/{}/'.format(self.obj.pk))
         self.assertEqual(200, response.status_code)
 
     def test_tutors_many_to_many_relationship(self):

oser_backend/tests/test_tutoring/test_tutoring_group_api.py

@@ -14,7 +14,7 @@ class TutoringGroupEndpointsTest(HyperlinkedAPITestCase):
     serializer_class = TutoringGroupSerializer
 
     def perform_list(self):
-        url = '/api/tutoring/groups/'
+        url = '/api/groups/'
         response = self.client.get(url)
         return response
 
@@ -24,7 +24,7 @@ class TutoringGroupEndpointsTest(HyperlinkedAPITestCase):
 
     def perform_retrieve(self):
         obj = self.factory.create()
-        url = '/api/tutoring/groups/{obj.pk}/'.format(obj=obj)
+        url = '/api/groups/{obj.pk}/'.format(obj=obj)
         response = self.client.get(url)
         return response
 

oser_backend/tests/test_tutoring/test_tutoring_session.py

@@ -34,7 +34,7 @@ class TutoringSessionTest(ModelTestCase):
         self.obj = TutoringSessionFactory.create()
 
     def test_get_absolute_url(self):
-        url = '/api/tutoring/sessions/{}/'.format(self.obj.pk)
+        url = '/api/sessions/{}/'.format(self.obj.pk)
         response = self.client.get(url)
         self.assertEqual(200, response.status_code)
 

oser_backend/tutoring/serializers.py

@@ -15,10 +15,9 @@ class SchoolSerializer(serializers.HyperlinkedModelSerializer):
     """
 
     address = AddressSerializer()
-    students = serializers.HyperlinkedRelatedField(
+    students = serializers.PrimaryKeyRelatedField(
         many=True,
         queryset=Student.objects.all(),
-        view_name='api:student-detail',
         help_text='Lycéens inscrits à ce lycée',
     )
     students_count = serializers.IntegerField(source='students.count',
@@ -26,8 +25,8 @@ class SchoolSerializer(serializers.HyperlinkedModelSerializer):
 
     class Meta:  # noqa
         model = School
-        fields = ('uai_code', 'url', 'name', 'address', 'students',
-                  'students_count',)
+        fields = ('uai_code', 'name', 'address', 'students',
+                  'students_count', 'url',)
         extra_kwargs = {
             'url': {'view_name': 'api:school-detail'},
             'uai_code': {'read_only': True},
@@ -49,19 +48,16 @@ class SchoolSerializer(serializers.HyperlinkedModelSerializer):
 class TutoringGroupSerializer(serializers.HyperlinkedModelSerializer):
     """Serializer for TutoringGroup."""
 
-    tutors = serializers.HyperlinkedRelatedField(
+    tutors = serializers.PrimaryKeyRelatedField(
         many=True,
         read_only=True,
-        view_name='api:tutor-detail',
     )
-    students = serializers.HyperlinkedRelatedField(
+    students = serializers.PrimaryKeyRelatedField(
         many=True,
         read_only=True,
-        view_name='api:student-detail',
     )
-    school = serializers.HyperlinkedRelatedField(
+    school = serializers.PrimaryKeyRelatedField(
         read_only=True,
-        view_name='api:school-detail',
     )
     students_count = serializers.IntegerField(source='students.count',
                                               read_only=True)
@@ -70,8 +66,8 @@ class TutoringGroupSerializer(serializers.HyperlinkedModelSerializer):
 
     class Meta:  # noqa
         model = TutoringGroup
-        fields = ('id', 'url', 'name', 'tutors', 'students', 'school',
-                  'students_count', 'tutors_count',)
+        fields = ('id', 'name', 'tutors', 'students', 'school',
+                  'students_count', 'tutors_count', 'url',)
         extra_kwargs = {
             'url': {'view_name': 'api:tutoring_group-detail'},
         }
@@ -94,8 +90,8 @@ class TutoringSessionSerializer(serializers.HyperlinkedModelSerializer):
 
     class Meta:  # noqa
         model = TutoringSession
-        fields = ('id', 'url', 'date', 'start_time', 'end_time',
-                  'tutoring_group',)
+        fields = ('id', 'date', 'start_time', 'end_time',
+                  'tutoring_group', 'url',)
         extra_kwargs = {
             'url': {'view_name': 'api:tutoring_session-detail'},
         }

oser_backend/users/serializers.py

@@ -5,6 +5,7 @@ from rest_framework import serializers
 
 from core.serializers import AddressSerializer
 from tutoring.models import School, TutoringGroup
+from tutoring.serializers import TutoringGroupSerializer
 
 from .models import Student, Tutor
 
@@ -32,19 +33,13 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
 class TutorSerializer(serializers.HyperlinkedModelSerializer):
     """Hyperlinked serializer for Tutor."""
 
-    user = serializers.HyperlinkedRelatedField(
-        queryset=User.objects.all(),
-        view_name='api:user-detail',
-    )
-    tutoring_groups = serializers.HyperlinkedRelatedField(
-        many=True,
-        read_only=True,
-        view_name='api:tutoring_group-detail',
-    )
+    user = UserSerializer()
+    tutoring_groups = serializers.PrimaryKeyRelatedField(
+        many=True, read_only=True)
 
     class Meta:  # noqa
         model = Tutor
-        fields = ('user_id', 'user', 'promotion', 'tutoring_groups', 'url',)
+        fields = ('user', 'promotion', 'tutoring_groups', 'url',)
         extra_kwargs = {
             'url': {'view_name': 'api:tutor-detail'},
         }
@@ -53,29 +48,23 @@ class TutorSerializer(serializers.HyperlinkedModelSerializer):
 class StudentSerializer(serializers.HyperlinkedModelSerializer):
     """Hyperlinked serializer for Student."""
 
-    user = serializers.HyperlinkedRelatedField(
-        queryset=User.objects.all(),
-        view_name='api:user-detail',
-    )
-    tutoring_group = serializers.HyperlinkedRelatedField(
+    user = UserSerializer()
+    tutoring_group = serializers.PrimaryKeyRelatedField(
         queryset=TutoringGroup.objects.all(),
-        view_name='api:student-tutoringgroup',
     )
-    school = serializers.HyperlinkedRelatedField(
+    school = serializers.PrimaryKeyRelatedField(
         queryset=School.objects.all(),
-        view_name='api:school-detail',
     )
-    visits = serializers.HyperlinkedRelatedField(
+    visits = serializers.PrimaryKeyRelatedField(
         source='user.visit_set',
         many=True,
-        view_name='api:visit-detail',
         read_only=True)
     address = AddressSerializer()
 
     class Meta:  # noqa
         model = Student
-        fields = ('user_id', 'url', 'user', 'address', 'tutoring_group',
-                  'school', 'visits',)
+        fields = ('user_id', 'user', 'address', 'tutoring_group',
+                  'school', 'visits', 'url',)
         extra_kwargs = {
             'url': {'view_name': 'api:student-detail'},
         }

oser_backend/visits/serializers.py

@@ -49,14 +49,15 @@ class VisitSerializer(serializers.HyperlinkedModelSerializer):
 
     class Meta:  # noqa
         model = Visit
-        fields = ('id', 'url', 'title', 'summary', 'description', 'place',
+        fields = ('id', 'title', 'summary', 'description', 'place',
                   'date', 'passed',
                   'deadline', 'registrations_open',
                   'participants',
                   'organizers',
                   'attached_files',
                   'image',
-                  'fact_sheet',)
+                  'fact_sheet',
+                  'url',)
         extra_kwargs = {
             'url': {'view_name': 'api:visit-detail'},
         }
@@ -76,7 +77,7 @@ class VisitParticipantReadSerializer(serializers.HyperlinkedModelSerializer):
 
     class Meta:  # noqa
         model = VisitParticipant
-        fields = ('id', 'url', 'user', 'visit', 'present')
+        fields = ('id', 'user', 'visit', 'present', 'url')
         extra_kwargs = {
             'url': {'view_name': 'api:visit-participants-detail'},
         }