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

Update the query for the notifications activity page to return the data for the days of retention if set.

Browse Source
This commit is contained in:
Rebecca Law
2018-07-19 14:28:15 +01:00
parent 9674005c71
commit dae29a1b61
4 changed files with 67 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/service/rest.py
View File

@@ -29,6 +29,7 @@ from app.dao.service_data_retention_dao import (
fetch_service_data_retention_by_id,
insert_service_data_retention,
update_service_data_retention,
fetch_service_data_retention_by_notification_type
)
from app.dao.service_sms_sender_dao import (
archive_sms_sender,
@@ -324,15 +325,20 @@ def get_service_history(service_id):
@service_blueprint.route('/<uuid:service_id>/notifications', methods=['GET'])
def get_all_notifications_for_service(service_id):
data = notifications_filter_schema.load(request.args).data
notification_type = data.get('template_type')[0] if data.get('template_type') else None
if data.get('to'):
notification_type = data.get('template_type')[0] if data.get('template_type') else None
return search_for_notification_by_to_field(service_id=service_id,
search_term=data['to'],
statuses=data.get('status'),
notification_type=notification_type)
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')
days_of_retention = None
if notification_type:
days_of_retention = fetch_service_data_retention_by_notification_type(
service_id=service_id,
notification_type=notification_type).days_of_retention
limit_days = days_of_retention if days_of_retention else data.get('limit_days')
include_jobs = data.get('include_jobs', True)
include_from_test_key = data.get('include_from_test_key', False)
include_one_off = data.get('include_one_off', True)