mirror of
https://github.com/GSA/notifications-api.git
synced 2026-08-24 16:23:44 -04:00
fix notifications
This commit is contained in:
@@ -298,17 +298,21 @@ def get_notifications_for_service(
|
|||||||
if client_reference is not None:
|
if client_reference is not None:
|
||||||
filters.append(Notification.client_reference == client_reference)
|
filters.append(Notification.client_reference == client_reference)
|
||||||
|
|
||||||
querie = Notification.query.filter(*filters)
|
querie = select(Notification).where(*filters)
|
||||||
querie = _filter_query(querie, filter_dict)
|
querie = _filter_query(querie, filter_dict)
|
||||||
if personalisation:
|
if personalisation:
|
||||||
querie = querie.options(joinedload(Notification.template))
|
querie = querie.options(joinedload(Notification.template))
|
||||||
|
|
||||||
return querie.order_by(desc(Notification.created_at)).paginate(
|
querie = querie.order_by(desc(Notification.created_at))
|
||||||
page=page,
|
print(f"QUERIE IS {querie}")
|
||||||
per_page=page_size,
|
results = db.session.execute(querie).scalars()
|
||||||
count=count_pages,
|
print(f"RESULTS ARE {results}")
|
||||||
error_out=error_out,
|
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):
|
def _filter_query(querie, filter_dict=None):
|
||||||
|
|||||||
Reference in New Issue
Block a user