From 6ccf7cc80a3cce2f9882b0016916f5571a5eba11 Mon Sep 17 00:00:00 2001 From: Guilherme de Freitas Date: Thu, 5 Nov 2026 10:11:49 +0000 Subject: [PATCH] Catch underflow for paginated samples --- src/lims_utils/database.py | 3 ++- tests/database/test_paginate.py | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/lims_utils/database.py b/src/lims_utils/database.py index e79ad8f..57ec6af 100644 --- a/src/lims_utils/database.py +++ b/src/lims_utils/database.py @@ -70,7 +70,8 @@ def paginate( if total: if page < 0: - page = (total // limit) + page + actual_page = (total // limit) + page + page = 0 if actual_page < 0 else actual_page new_query = query.limit(limit).offset((page) * limit) diff --git a/tests/database/test_paginate.py b/tests/database/test_paginate.py index b88fc99..7376d74 100644 --- a/tests/database/test_paginate.py +++ b/tests/database/test_paginate.py @@ -49,6 +49,19 @@ def test_paginate_reverse(mock_session): assert query_eq(mock_session.call_args.args[0], query.limit(20).offset(80)) +@patch.object(fs, "execute") +def test_paginate_reverse_underflow(mock_session): + """Should catch underflow if page is negative and absolute value is greater than total pages""" + + mock_session.return_value.all.return_value = [] + with get_session(lambda: fs): + # Page total is 5 + response = db.paginate(query, 20, -8, precounted_total=100) + assert response.page == 0 + + assert query_eq(mock_session.call_args.args[0], query.limit(20).offset(0)) + + def test_total_zero(): """Should return empty list if total is 0"""