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

separated schemas once more into "with template" and "with personalisation"

Browse Source 
"with personalisation" should only be used by the public notification api
"with template" should be used when we want template name, etc details.

also added an xfail test for correctly constructing notification
personalisation
This commit is contained in:
Leo Hemsted
2016-07-26 14:33:14 +01:00
parent b28e7efd14
commit c81b30dba1
4 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/notifications/rest.py
View File

@@ -18,7 +18,7 @@ from app.dao import (
services_dao,
notifications_dao
)
from app.models import NOTIFICATION_TYPE, SMS_TYPE
from app.models import SMS_TYPE
from app.notifications.process_client_response import (
validate_callback_data,
process_sms_client_response
@@ -26,7 +26,7 @@ from app.notifications.process_client_response import (
from app.schemas import (
email_notification_schema,
sms_template_notification_schema,
notification_with_template_schema,
notification_with_personalisation_schema,
notifications_filter_schema,
notifications_statistics_schema,
day_schema,
@@ -175,7 +175,7 @@ def get_notifications(notification_id):
notification = notifications_dao.get_notification(str(api_user.service_id),
notification_id,
key_type=api_user.key_type)
return jsonify(data={"notification": notification_with_template_schema.dump(notification).data}), 200
return jsonify(data={"notification": notification_with_personalisation_schema.dump(notification).data}), 200
@notifications.route('/notifications', methods=['GET'])
@@ -193,7 +193,7 @@ def get_all_notifications():
limit_days=limit_days,
key_type=api_user.key_type)
return jsonify(
notifications=notification_with_template_schema.dump(pagination.items, many=True).data,
notifications=notification_with_personalisation_schema.dump(pagination.items, many=True).data,
page_size=page_size,
total=pagination.total,
links=pagination_links(