This commit is contained in:
Kenneth Kehl
2023-06-15 09:22:44 -07:00
parent 8db16f9410
commit 95a2db6991
3 changed files with 63 additions and 75 deletions

View File

@@ -1,6 +1,5 @@
from datetime import date, datetime, time, timedelta
from decimal import Decimal
from uuid import UUID
import pytest
from freezegun import freeze_time
@@ -429,13 +428,13 @@ def test_create_nightly_notification_status_for_service_and_day(notify_db_sessio
process_day = datetime.utcnow().date() - timedelta(days=5)
with freeze_time(datetime.combine(process_day, time.max)):
create_notification(template=first_template, status='delivered')
create_notification(template=second_template, status='temporary-failure')
create_notification(template=second_template, status='delivered')
# team API key notifications are included
create_notification(template=second_template, status='sending', key_type=KEY_TYPE_TEAM)
create_notification(template=second_template, status='pending', key_type=KEY_TYPE_TEAM)
# test notifications are ignored
create_notification(template=second_template, status='sending', key_type=KEY_TYPE_TEST)
create_notification(template=second_template, status='pending', key_type=KEY_TYPE_TEST)
# historical notifications are included
create_notification_history(template=second_template, status='delivered')
@@ -455,7 +454,7 @@ def test_create_nightly_notification_status_for_service_and_day(notify_db_sessio
FactNotificationStatus.notification_status,
).all()
assert len(new_fact_data) == 4
assert len(new_fact_data) == 3
email_delivered_row = new_fact_data[0]
assert email_delivered_row.template_id == second_template.id
@@ -469,21 +468,11 @@ def test_create_nightly_notification_status_for_service_and_day(notify_db_sessio
assert email_sending_row.template_id == second_template.id
assert email_sending_row.service_id == second_service.id
assert email_sending_row.notification_type == 'email'
assert email_sending_row.notification_status == 'sending'
assert email_sending_row.notification_status == 'pending'
assert email_sending_row.notification_count == 1
assert email_sending_row.key_type == KEY_TYPE_TEAM
email_failure_row = new_fact_data[2]
assert email_failure_row.local_date == process_day
assert email_failure_row.template_id == second_template.id
assert email_failure_row.service_id == second_service.id
assert email_failure_row.job_id == UUID('00000000-0000-0000-0000-000000000000')
assert email_failure_row.notification_type == 'email'
assert email_failure_row.notification_status == 'temporary-failure'
assert email_failure_row.notification_count == 1
assert email_failure_row.key_type == KEY_TYPE_NORMAL
sms_delivered_row = new_fact_data[3]
sms_delivered_row = new_fact_data[2]
assert sms_delivered_row.template_id == first_template.id
assert sms_delivered_row.service_id == first_service.id
assert sms_delivered_row.notification_type == 'sms'

View File

@@ -321,7 +321,6 @@ def test_fetch_notification_statuses_for_job(sample_template):
@freeze_time('2018-10-31 14:00')
def test_fetch_stats_for_all_services_by_date_range(notify_db_session):
# TODO WHY CHANGE THE NUMBERS
service_1, service_2 = set_up_data()
results = fetch_stats_for_all_services_by_date_range(start_date=date(2018, 10, 29),
end_date=date(2018, 10, 31))
@@ -330,17 +329,17 @@ def test_fetch_stats_for_all_services_by_date_range(notify_db_session):
assert results[0].service_id == service_1.id
assert results[0].notification_type == 'email'
assert results[0].status == 'delivered'
assert results[0].count == 7 # 4
assert results[0].count == 4
assert results[1].service_id == service_1.id
assert results[1].notification_type == 'sms'
assert results[1].status == 'created'
assert results[1].count == 5 # 2
assert results[1].count == 2
assert results[2].service_id == service_1.id
assert results[2].notification_type == 'sms'
assert results[2].status == 'delivered'
assert results[2].count == 14 # 11
assert results[2].count == 11
assert results[3].service_id == service_2.id
assert not results[3].notification_type