From 0d44f29904c8a87f7a838b3ee889a8a2ea52cfeb Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 19 Nov 2024 09:15:00 -0800 Subject: [PATCH] fix --- app/dao/notifications_dao.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index f60775da9..d4bd411b6 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -298,17 +298,19 @@ def get_notifications_for_service( if client_reference is not None: filters.append(Notification.client_reference == client_reference) - query = Notification.query.filter(*filters) + query = select(Notification).where(*filters) query = _filter_query(query, filter_dict) if personalisation: query = query.options(joinedload(Notification.template)) - return query.order_by(desc(Notification.created_at)).paginate( - page=page, - per_page=page_size, - count=count_pages, - error_out=error_out, - ) + query = query.order_by(desc(Notification.created_at)) + results = db.session.execute(query).scalars().all() + + page_size = current_app.config["PAGE_SIZE"] + offset = (page - 1) * page_size + paginated_results = results[offset : offset + page_size] + pagination = Pagination(paginated_results, page, page_size, len(results)) + return pagination def _filter_query(query, filter_dict=None):