From 71e4794f0292ea75c73b5532cb1783a92570074c Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Mon, 18 Nov 2024 12:08:32 -0800 Subject: [PATCH] try fixing pagination --- app/dao/inbound_sms_dao.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/dao/inbound_sms_dao.py b/app/dao/inbound_sms_dao.py index eb2b2c9a1..deae4fdc7 100644 --- a/app/dao/inbound_sms_dao.py +++ b/app/dao/inbound_sms_dao.py @@ -52,19 +52,19 @@ def dao_get_paginated_inbound_sms_for_service_for_public_api( ) filters.append(InboundSms.created_at < older_than_created_at) + page = 1 # ? + offset = (page - 1) * page_size # As part of the move to sqlalchemy 2.0, we do this manual pagination stmt = ( select(InboundSms) - .filter(*filters) + .where(*filters) .order_by(desc(InboundSms.created_at)) .limit(page_size) + .offset(offset) ) paginated_items = db.session.execute(stmt).scalars().all() - - page = 1 # ? - offset = (page - 1) * page_size - paginated_results = paginated_items[offset : offset + page_size] - pagination = Pagination(paginated_results, page, page_size, len(paginated_items)) + total_items = db.session.execute(select(func.count())).where(*filters).scalar() or 0 + pagination = Pagination(paginated_items, page, page_size, total_items) return pagination