standardised params for get_queryset_count_before / after

rest_framework_datatables/django_filters/backends.py

@@ -22,13 +22,13 @@ def filter_queryset(self, request, queryset, view):
         if not self.check_renderer_format(request):
             return queryset
 
-        count = self.get_queryset_count_before(view.get_queryset())
+        count = self.get_queryset_count_before(request, view.get_queryset(), view)
         self.set_count_before(view, count)
 
         # parsed datatables_query will be an attribute of the filterset
         filterset = self.get_filterset(request, queryset, view)
         if filterset is None:
-            count = self.get_queryset_count_after(queryset)
+            count = self.get_queryset_count_after(request, queryset, view)
             self.set_count_after(view, count)
             return queryset
 
@@ -39,7 +39,9 @@ def filter_queryset(self, request, queryset, view):
         if global_q:
             queryset = queryset.filter(global_q).distinct()
 
-        count = self.get_queryset_count_after(queryset)
+        count = self.get_queryset_count_after(
+            request, queryset, view
+        )
         self.set_count_after(view, count)
 
         # TODO Can we use OrderingFilter, maybe in DatatablesFilterSet, by
@@ -98,15 +100,15 @@ def get_ordering(self, request, view, filterset):
         self.append_additional_ordering(ret, view)
         return ret
 
-    def get_queryset_count_before(self, queryset):
+    def get_queryset_count_before(self, request, queryset, view):
         """
         Provide an overrideable method to return a custom count.
         This can be useful for very large tables, as calls to model.count()
         can be very expensive.
         """
         return queryset.count()
 
-    def get_queryset_count_after(self, queryset):
+    def get_queryset_count_after(self, request, queryset, view):
         """
         See
         :meth:`~rest_framework_datatables.django_filters.backends.DatatablesFilterBackend.get_queryset_count_before`.

tests/test_django_filter_backend.py

@@ -30,10 +30,10 @@ class CustomDatatablesFilterBackend(DatatablesFilterBackend):
     Override before and after counts to demonstrate performance fix.
     """
 
-    def get_queryset_count_before(self, queryset):
+    def get_queryset_count_before(self, request, queryset, view):
         return 999
 
-    def get_queryset_count_after(self, queryset):
+    def get_queryset_count_after(self, request, queryset, view):
         return 99