From b388d9f0ffa4ef639e9c9b86295ee5d4c1aaaed3 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 19 Nov 2024 12:12:27 -0800 Subject: [PATCH] fix notifications --- app/dao/notifications_dao.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index 040af36f7..b63489043 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -298,17 +298,21 @@ def get_notifications_for_service( if client_reference is not None: filters.append(Notification.client_reference == client_reference) - querie = Notification.query.filter(*filters) + querie = select(Notification).where(*filters) querie = _filter_query(querie, filter_dict) if personalisation: querie = querie.options(joinedload(Notification.template)) - return querie.order_by(desc(Notification.created_at)).paginate( - page=page, - per_page=page_size, - count=count_pages, - error_out=error_out, - ) + querie = querie.order_by(desc(Notification.created_at)) + print(f"QUERIE IS {querie}") + results = db.session.execute(querie).scalars() + print(f"RESULTS ARE {results}") + 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)) + print(f"PAGINATION IS {pagination}") + return pagination def _filter_query(querie, filter_dict=None):