From 14f144e7ea6d80398cf3e3c38454126356baff21 Mon Sep 17 00:00:00 2001
From: Bishwas Bhandari <bishwasbh@gmail.com>
Date: Sat, 9 Mar 2024 10:55:26 +0545
Subject: [PATCH] cursor pagination betterified added

---
 djapy/core/__pycache__/dec.cpython-311.pyc | Bin 12745 -> 12797 bytes
 djapy/core/dec.py                          |   1 +
 djapy/core/pagination/cursor_pagination.py |  20 ++++++++++----------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/djapy/core/__pycache__/dec.cpython-311.pyc b/djapy/core/__pycache__/dec.cpython-311.pyc
index c42382d1827383214eaab0b649da3e657b5e13d2..6d2f7fb6e2899d9285ee96fd494f3e2eabc056c9 100644
GIT binary patch
delta 510
zcmX?^{5P3*IWI340}zzHew}K#k@u(s<E71)CA=6JOD4-nonk7{oXjsQCC12*!qLed
zFA7o#0-fAIp4j9+QqqiilO?2OWhEfuKpBn-#!iNKNjRT9UUG7fv^KXCOr*qoa)-33
zu?&n4R1Ig>umN?m$IBwg!PzCYlRro+GRjXDlCflTm|QO;DaqN%nGRB~2veWO-pL8#
zZ?2PJ;$l>q+^DvQwV)_7uVk{K`Z~4=KxIV}Ctp?1VvL;ZpmCX*n^R@7nC3*0uN(}#
zLKlRTF7hZ};ZeT8qx?WlY4aLQVMfNOlMiSam<2Mj%6?!Vjr^LnSxtK-BV+I63p!nl
zlO{*&Dlx9#T&FvkIUt>pQS<`?h@4OXp>N0-Zg9C^>37A%|Dufl2WF7m15wEjtYD>V
z48r0Qil=CPU<Y$K803`~*j<q`+7NP4&hi6i`s74IX&tZ>7ef?d65|JMFb8Y{#C$Yz
I@(M#m07sX8YybcN

delta 511
zcmeyHd@`ALIWI340}$+a`8t(%BkxfO#x0vKOL#FdrcRcVIwg|A(a9b!0#X11o!mg4
z=wvBrX=@#b2#8E)SjNo2uo{RV0H{VB&gQ6K>|}_Sfb-eoB_<b0YjaD&L`qC2FOxPk
zmWJ_xs^RP!HlS|yco`%)IJ?ApGM|hhqugWz8B0dH$@M~#lAN8K=^*tAF!g!totz;4
z<~cG<T#Sm7=c_H6?4iDftskhMXu{-Q>RF6llT$S=GjnnBO}5sY$ohecL0)<D15IH@
z#wnA(Xc?FVFtW;iU?7eBnzA`cdnF@d&tw+eF2;$I`*oEV*KOXUJDJ%!jge9G0|SVh
zPywND$QW*LxnSvc#l-)jjQ<B_klX`N$q%exrECns;uDIeXntT%o7`Y1;sF-q0t#Lb
o*SI32c|phaqLA$YmWx6zAGo1%QH)89P!8B4h&5>B<U59n0MOleNB{r;

diff --git a/djapy/core/dec.py b/djapy/core/dec.py
index 3f30800..32070ba 100644
--- a/djapy/core/dec.py
+++ b/djapy/core/dec.py
@@ -227,6 +227,7 @@ def _wrapped_view(request: HttpRequest, *args, **view_kwargs):
                 name: (type_name_, default)
                 for name, type_name_, default in pagination_class.query
             }
+            print(extra_query_dict)
 
         _wrapped_view.djapy = True
         _wrapped_view.openapi = openapi
diff --git a/djapy/core/pagination/cursor_pagination.py b/djapy/core/pagination/cursor_pagination.py
index bc11a9c..1604843 100644
--- a/djapy/core/pagination/cursor_pagination.py
+++ b/djapy/core/pagination/cursor_pagination.py
@@ -13,13 +13,13 @@ class CursorPagination(BasePagination):
     """Cursor-based pagination."""
 
     query = [
-        ('cursor', str, '0'),
-        ('limit', conint(gt=0), 10)
+        ('cursor', conint(ge=0), 0),
+        ('limit', conint(ge=0), 1)
     ]
 
     class response(Schema, Generic[G_TYPE]):
         items: G_TYPE
-        cursor: str
+        cursor: int | None
         limit: int
         has_next: bool
 
@@ -31,15 +31,15 @@ def make_data(cls, queryset, info):
             cursor = info.context['input_data']['cursor']
             limit = info.context['input_data']['limit']
 
-            queryset = queryset.order_by('id')  # order by some field in a unique, sequential manner
-            # Convert the cursor to integer and get the subset
-            cursor = int(cursor)
-            queryset_subset = queryset.filter(id__gt=cursor)[:limit]
+            queryset = queryset.order_by('id')
 
-            has_next = len(queryset.filter(id__gt=cursor)) > limit
+            queryset_with_cursor = queryset.filter(id__gt=cursor)
 
-            # After processing the queryset, the cursor will be set to the id of the last item
-            cursor = str(queryset_subset.last().id) if has_next else None
+            has_next = queryset_with_cursor.count() > limit
+
+            queryset_subset = list(queryset_with_cursor[:limit])
+
+            cursor = queryset_subset[-1].id if queryset_subset and has_next else None
 
             return {
                 "items": queryset_subset,