darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-20 14:29:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removed update reference from updating the provider stats

Browse Source 
- single focus method
- allows not to pollute DAO with research mode
This commit is contained in:
Martyn Inglis
2016-06-02 09:52:47 +01:00
parent 099c17192d
commit 754ccbe9af
5 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/app/dao/test_notification_dao.py
View File

@@ -25,7 +25,7 @@ from app.dao.notifications_dao import (
delete_notifications_created_more_than_a_week_ago,
dao_get_notification_statistics_for_service_and_day,
update_notification_status_by_id,
update_notification_after_sent_to_provider,
update_provider_stats,
update_notification_status_by_reference,
dao_get_template_statistics_for_service,
get_notifications_for_service
@@ -38,7 +38,7 @@ from tests.app.conftest import (sample_notification)
def test_should_by_able_to_update_reference_by_notification_id(sample_notification, mmg_provider):
assert not Notification.query.get(sample_notification.id).reference
update_notification_after_sent_to_provider(
update_provider_stats(
sample_notification.id,
'sms',
mmg_provider.identifier,
@@ -56,7 +56,7 @@ def test_should_by_able_to_update_status_by_reference(sample_email_template, ses
ses_provider.identifier)
assert Notification.query.get(notification.id).status == "sending"
update_notification_after_sent_to_provider(
update_provider_stats(
notification.id,
'email',
ses_provider.identifier,
@@ -147,7 +147,7 @@ def test_should_not_update_status_one_notification_status_is_delivered(sample_em
ses_provider.identifier)
assert Notification.query.get(notification.id).status == "sending"
update_notification_after_sent_to_provider(
update_provider_stats(
notification.id,
'email',
ses_provider.identifier,
@@ -174,7 +174,7 @@ def test_should_be_able_to_record_statistics_failure_for_email(sample_email_temp
notification = Notification(**data)
dao_create_notification(notification, sample_email_template.template_type, ses_provider.identifier)
update_notification_after_sent_to_provider(
update_provider_stats(
notification.id,
'email',
ses_provider.identifier,

18
tests/app/dao/test_notifications_dao_provider_statistics.py
View File

@@ -1,6 +1,6 @@
from datetime import (date, timedelta)
from app.models import ProviderStatistics
from app.dao.notifications_dao import update_notification_after_sent_to_provider
from app.dao.notifications_dao import update_provider_stats
from app.dao.provider_statistics_dao import (
get_provider_statistics, get_fragment_count)
from tests.app.conftest import sample_notification as create_sample_notification
@@ -14,7 +14,7 @@ def test_should_update_provider_statistics_sms(notify_db,
notify_db,
notify_db_session,
template=sample_template)
update_notification_after_sent_to_provider(n1.id, 'sms', mmg_provider.identifier)
update_provider_stats(n1.id, 'sms', mmg_provider.identifier)
provider_stats = get_provider_statistics(
sample_template.service,
providers=[mmg_provider.identifier]).one()
@@ -29,7 +29,7 @@ def test_should_update_provider_statistics_email(notify_db,
notify_db,
notify_db_session,
template=sample_email_template)
update_notification_after_sent_to_provider(n1.id, 'email', ses_provider.identifier, reference="reference")
update_provider_stats(n1.id, 'email', ses_provider.identifier, reference="reference")
provider_stats = get_provider_statistics(
sample_email_template.service,
providers=[ses_provider.identifier]).one()
@@ -46,21 +46,21 @@ def test_should_update_provider_statistics_sms_multi(notify_db,
template=sample_template,
provider_name=mmg_provider.identifier,
content_char_count=160)
update_notification_after_sent_to_provider(n1.id, 'sms', mmg_provider.identifier)
update_provider_stats(n1.id, 'sms', mmg_provider.identifier)
n2 = create_sample_notification(
notify_db,
notify_db_session,
template=sample_template,
provider_name=mmg_provider.identifier,
content_char_count=161)
update_notification_after_sent_to_provider(n2.id, 'sms', mmg_provider.identifier)
update_provider_stats(n2.id, 'sms', mmg_provider.identifier)
n3 = create_sample_notification(
notify_db,
notify_db_session,
template=sample_template,
provider_name=mmg_provider.identifier,
content_char_count=307)
update_notification_after_sent_to_provider(n3.id, 'sms', mmg_provider.identifier)
update_provider_stats(n3.id, 'sms', mmg_provider.identifier)
provider_stats = get_provider_statistics(
sample_template.service,
providers=[mmg_provider.identifier]).one()
@@ -76,19 +76,19 @@ def test_should_update_provider_statistics_email_multi(notify_db,
notify_db_session,
template=sample_email_template,
provider_name=ses_provider.identifier)
update_notification_after_sent_to_provider(n1.id, 'email', ses_provider.identifier, reference="reference")
update_provider_stats(n1.id, 'email', ses_provider.identifier, reference="reference")
n2 = create_sample_notification(
notify_db,
notify_db_session,
template=sample_email_template,
provider_name=ses_provider.identifier)
update_notification_after_sent_to_provider(n2.id, 'email', ses_provider.identifier, reference="reference")
update_provider_stats(n2.id, 'email', ses_provider.identifier, reference="reference")
n3 = create_sample_notification(
notify_db,
notify_db_session,
template=sample_email_template,
provider_name=ses_provider.identifier)
update_notification_after_sent_to_provider(n3.id, 'email', ses_provider.identifier, reference="reference")
update_provider_stats(n3.id, 'email', ses_provider.identifier, reference="reference")
provider_stats = get_provider_statistics(
sample_email_template.service,
providers=[ses_provider.identifier]).one()