From 331f0eb7b36ee2686598b412cdec74f012df081b Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 19 Nov 2024 12:43:05 -0800 Subject: [PATCH] fix notifications --- app/dao/notifications_dao.py | 1 - tests/app/dao/notification_dao/test_notification_dao.py | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/dao/notifications_dao.py b/app/dao/notifications_dao.py index ead5591a9..d4385efed 100644 --- a/app/dao/notifications_dao.py +++ b/app/dao/notifications_dao.py @@ -307,7 +307,6 @@ def get_notifications_for_service( print(f"QUERIE IS {querie}") results = db.session.execute(querie).scalars().all() 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)) diff --git a/tests/app/dao/notification_dao/test_notification_dao.py b/tests/app/dao/notification_dao/test_notification_dao.py index e954410ce..1179a29c2 100644 --- a/tests/app/dao/notification_dao/test_notification_dao.py +++ b/tests/app/dao/notification_dao/test_notification_dao.py @@ -952,6 +952,11 @@ def test_should_return_notifications_including_one_offs_by_default( assert len(include_one_offs_by_default) == 2 +# TODO this test fails with the sqlalchemy 2.0 upgrade, but +# it seems like it was wrong to begin with. Clearly 2 notifications +# are created, so it seems like the count should be 2, and there is +# no reason to null out or override the pagination object just because +# a flag is being passed. def test_should_not_count_pages_when_given_a_flag(sample_user, sample_template): create_notification(sample_template) notification = create_notification(sample_template) @@ -959,7 +964,7 @@ def test_should_not_count_pages_when_given_a_flag(sample_user, sample_template): pagination = get_notifications_for_service( sample_template.service_id, count_pages=False, page_size=1 ) - assert len(pagination.items) == 2 + assert len(pagination.items) == 1 assert pagination.total is None assert pagination.items[0].id == notification.id