Use DRF 3.1 pagination_class

Author: humitos

readthedocs/restapi/utils.py

@@ -4,6 +4,8 @@
 import hashlib
 import logging
 
+from rest_framework.pagination import PageNumberPagination
+
 from readthedocs.builds.constants import NON_REPOSITORY_VERSIONS
 from readthedocs.builds.models import Version
 from readthedocs.search.indexes import PageIndex, ProjectIndex, SectionIndex
@@ -167,3 +169,16 @@ def index_search_request(version, page_list, commit, project_scale, page_scale,
             }
         }
         page_obj.delete_document(body=delete_query)
+
+
+class RemoteOrganizationPagination(PageNumberPagination):
+    page_size = 25
+
+
+class RemoteProjectPagination(PageNumberPagination):
+    page_size = 15
+
+
+class ProjectPagination(PageNumberPagination):
+    page_size = 100
+    max_page_size = 1000

readthedocs/restapi/views/model_views.py

@@ -64,9 +64,7 @@ class ProjectViewSet(UserSelectViewSet):
     serializer_class = ProjectSerializer
     admin_serializer_class = ProjectAdminSerializer
     model = Project
-    paginate_by = 100
-    paginate_by_param = 'page_size'
-    max_paginate_by = 1000
+    pagination_class = api_utils.ProjectPagination
 
     @decorators.detail_route()
     def valid_versions(self, request, **kwargs):
@@ -241,7 +239,8 @@ class RemoteOrganizationViewSet(viewsets.ReadOnlyModelViewSet):
     renderer_classes = (JSONRenderer,)
     serializer_class = RemoteOrganizationSerializer
     model = RemoteOrganization
-    paginate_by = 25
+    pagination_class = api_utils.RemoteOrganizationPagination
+
 
     def get_queryset(self):
         return (self.model.objects.api(self.request.user)
@@ -254,6 +253,7 @@ class RemoteRepositoryViewSet(viewsets.ReadOnlyModelViewSet):
     renderer_classes = (JSONRenderer,)
     serializer_class = RemoteRepositorySerializer
     model = RemoteRepository
+    pagination_class = api_utils.RemoteProjectPagination
 
     def get_queryset(self):
         query = self.model.objects.api(self.request.user)
@@ -263,6 +263,3 @@ def get_queryset(self):
         query = query.filter(account__provider__in=[service.adapter.provider_id
                                                     for service in registry])
         return query
-
-    def get_paginate_by(self):
-        return self.request.query_params.get('page_size', 25)