Create seperate group pagination class

mathesar-foundation · Jul 1, 2021 · ae53cf1 · ae53cf1
1 parent 061d620
commit ae53cf1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/mathesar/pagination.py b/mathesar/pagination.py
@@ -11,15 +11,14 @@ class DefaultLimitOffsetPagination(LimitOffsetPagination):
     def get_paginated_response(self, data):
         return Response(OrderedDict([
             ('count', self.count),
-            ('group_count', self.group_count),
             ('results', data)
         ]))
 
 
 class TableLimitOffsetPagination(DefaultLimitOffsetPagination):
 
     def paginate_queryset(self, queryset, request, table_id,
-                          filters=[], order_by=[], group_count_by=[]):
+                          filters=[], order_by=[]):
         self.limit = self.get_limit(request)
         if self.limit is None:
             self.limit = self.default_limit
@@ -29,6 +28,26 @@ def paginate_queryset(self, queryset, request, table_id,
         self.count = table.sa_num_records
         self.request = request
 
+        return table.get_records(
+            self.limit, self.offset, filters=filters, order_by=order_by,
+        )
+
+
+class TableLimitOffsetGroupPagination(TableLimitOffsetPagination):
+    def get_paginated_response(self, data):
+        return Response(OrderedDict([
+            ('count', self.count),
+            ('group_count', self.group_count),
+            ('results', data)
+        ]))
+
+    def paginate_queryset(self, queryset, request, table_id,
+                          filters=[], order_by=[], group_count_by=[]):
+        records = super().paginate_queryset(
+            queryset, request, table_id, filters=filters, order_by=order_by
+        )
+
+        table = queryset.get(id=table_id)
         if group_count_by:
             group_count = table.get_group_counts(
                 group_count_by, self.limit, self.offset,
@@ -46,6 +65,4 @@ def paginate_queryset(self, queryset, request, table_id,
                 'results': None,
             }
 
-        return table.get_records(
-            self.limit, self.offset, filters=filters, order_by=order_by,
-        )
+        return records
diff --git a/mathesar/views/api.py b/mathesar/views/api.py
@@ -13,7 +13,9 @@
 
 from mathesar.database.utils import get_non_default_database_keys
 from mathesar.models import Table, Schema, DataFile
-from mathesar.pagination import DefaultLimitOffsetPagination, TableLimitOffsetPagination
+from mathesar.pagination import (
+    DefaultLimitOffsetPagination, TableLimitOffsetGroupPagination
+)
 from mathesar.serializers import (
     TableSerializer, SchemaSerializer, RecordSerializer, DataFileSerializer,
 )
@@ -94,7 +96,7 @@ class RecordViewSet(viewsets.ViewSet):
     # For sorting parameter formatting, see:
     # https://github.com/centerofci/sqlalchemy-filters#sort-format
     def list(self, request, table_pk=None):
-        paginator = TableLimitOffsetPagination()
+        paginator = TableLimitOffsetGroupPagination()
 
         # Use a form to parse JSON url parameters
         filter_form = RecordListFilterForm(request.GET)