mirror of
https://github.com/GSA/notifications-api.git
synced 2026-01-11 05:01:12 -05:00
revert
This commit is contained in:
@@ -298,19 +298,17 @@ def get_notifications_for_service(
|
||||
if client_reference is not None:
|
||||
filters.append(Notification.client_reference == client_reference)
|
||||
|
||||
query = select(Notification).where(*filters)
|
||||
query = Notification.query.filter(*filters)
|
||||
query = _filter_query(query, filter_dict)
|
||||
if personalisation:
|
||||
query = query.options(joinedload(Notification.template))
|
||||
|
||||
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
|
||||
return query.order_by(desc(Notification.created_at)).paginate(
|
||||
page=page,
|
||||
per_page=page_size,
|
||||
count=count_pages,
|
||||
error_out=error_out,
|
||||
)
|
||||
|
||||
|
||||
def _filter_query(query, filter_dict=None):
|
||||
|
||||
Reference in New Issue
Block a user