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

Merge branch 'master' of https://github.com/alphagov/notifications-api into vb-free-sms-limit-history

Browse Source
This commit is contained in:
venusbb
2017-11-02 12:38:52 +00:00
parent 6f7793d761 91e4861e2d
commit 6875ab150a
36 changed files with 599 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/app/db.py
View File

@@ -30,7 +30,11 @@ from app.models import (
AnnualBilling,
)
from app.dao.users_dao import save_model_user
from app.dao.notifications_dao import dao_create_notification, dao_created_scheduled_notification
from app.dao.notifications_dao import (
dao_create_notification,
dao_created_scheduled_notification,
dao_create_notification_sms_sender_mapping
)
from app.dao.templates_dao import dao_create_template
from app.dao.services_dao import dao_create_service
from app.dao.service_permissions_dao import dao_add_service_permission
@@ -129,6 +133,7 @@ def create_notification(
scheduled_for=None,
normalised_to=None,
one_off=False,
sms_sender_id=None
):
if created_at is None:
created_at = datetime.utcnow()
@@ -185,6 +190,9 @@ def create_notification(
if status != 'created':
scheduled_notification.pending = False
dao_created_scheduled_notification(scheduled_notification)
if sms_sender_id:
dao_create_notification_sms_sender_mapping(notification_id=notification.id,
sms_sender_id=sms_sender_id)
return notification