darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-31 06:52:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added limit_days filter to get notifications dao.

Browse Source
This commit is contained in:
Adam Shimali
2016-04-28 16:10:35 +01:00
parent 23bcb08fb2
commit 4e81695c84
5 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/dao/notifications_dao.py
View File

@@ -221,10 +221,16 @@ def get_notification_by_id(notification_id):
return Notification.query.filter_by(id=notification_id).first()
def get_notifications_for_service(service_id, filter_dict=None, page=1, page_size=None):
def get_notifications_for_service(service_id, filter_dict=None, page=1, page_size=None, limit_days=None):
if page_size is None:
page_size = current_app.config['PAGE_SIZE']
query = Notification.query.filter_by(service_id=service_id)
filters = [Notification.service_id == service_id]
if limit_days is not None:
days_ago = date.today() - timedelta(days=limit_days)
filters.append(func.date(Notification.created_at) >= days_ago)
query = Notification.query.filter(*filters)
query = filter_query(query, filter_dict)
pagination = query.order_by(desc(Notification.created_at)).paginate(
page=page,

8
app/notifications/rest.py
View File

@@ -191,12 +191,14 @@ def get_all_notifications():
page = data['page'] if 'page' in data else 1
page_size = data['page_size'] if 'page_size' in data else current_app.config.get('PAGE_SIZE')
limit_days = data.get('limit_days')
pagination = notifications_dao.get_notifications_for_service(
api_user['client'],
filter_dict=data,
page=page,
page_size=page_size)
page_size=page_size,
limit_days=limit_days)
return jsonify(
notifications=notification_status_schema.dump(pagination.items, many=True).data,
page_size=page_size,
@@ -218,12 +220,14 @@ def get_all_notifications_for_service(service_id):
page = data['page'] if 'page' in data else 1
page_size = data['page_size'] if 'page_size' in data else current_app.config.get('PAGE_SIZE')
limit_days = data.get('limit_days')
pagination = notifications_dao.get_notifications_for_service(
service_id,
filter_dict=data,
page=page,
page_size=page_size)
page_size=page_size,
limit_days=limit_days)
kwargs = request.args.to_dict()
kwargs['service_id'] = service_id
return jsonify(

1
app/schemas.py
View File

@@ -245,6 +245,7 @@ class NotificationsFilterSchema(ma.Schema):
status = fields.Nested(NotificationModelSchema, only=['status'], many=True)
page = fields.Int(required=False)
page_size = fields.Int(required=False)
limit_days = fields.Int(required=False)
@pre_load
def handle_multidict(self, in_data):