Merge branch 'main' into feature/sort-nested-relationships

Author: igorbenav

fastcrud/crud/fast_crud.py

@@ -2225,12 +2225,7 @@ async def get_multi_by_cursor(
         result = await db.execute(stmt)
         data = [dict(row) for row in result.mappings()]
 
-        next_cursor = None
-        if len(data) == limit:
-            if sort_order == "asc":
-                next_cursor = data[-1][sort_column]
-            else:
-                data[0][sort_column]
+        next_cursor = data[-1][sort_column] if len(data) == limit else None
 
         return {"data": data, "next_cursor": next_cursor}
 

tests/sqlalchemy/crud/test_get_multi_by_cursor.py

@@ -169,3 +169,47 @@ async def test_get_multi_by_cursor_desc_with_cursor_filter(async_session, test_d
         assert (
             record["id"] < first_page_last_id
         ), "Each ID in the second page should be less than the last ID of the first page"
+
+
+@pytest.mark.asyncio
+async def test_get_multi_by_cursor_descending_order(async_session, test_data):
+    for item in test_data:
+        async_session.add(ModelTest(**item))
+    await async_session.commit()
+
+    crud = FastCRUD(ModelTest)
+    
+    first_page = await crud.get_multi_by_cursor(
+        db=async_session,
+        limit=2,
+        sort_column="id",
+        sort_order="desc"
+    )
+    next_cursor = first_page["next_cursor"]
+    item1, item2 = first_page["data"][0]["id"], first_page["data"][1]["id"]
+    
+    assert len(first_page["data"]) == 2
+    assert first_page["data"][0]["id"] == 11  # Should start with highest ID
+    assert first_page["data"][1]["id"] == 10
+    assert first_page["next_cursor"] == 10  # Next cursor should be the last ID in the result
+
+    while next_cursor is not None:
+        next_page = await crud.get_multi_by_cursor(
+            db=async_session,
+            cursor=next_cursor,
+            limit=2,
+            sort_column="id",
+            sort_order="desc"
+        )
+        next_cursor = next_page["next_cursor"]
+        if len(next_page["data"]) == 2:
+            assert next_page["data"][0]["id"] == item1 - 2
+            assert next_page["data"][1]["id"] == item2 - 2
+            assert next_cursor == item2 - 2
+            item1 -= 2
+            item2 -= 2
+        else:
+            assert next_page["data"][0]["id"] == item1 - 2
+            assert next_cursor is None
+
+