This commit is contained in:
Kenneth Kehl
2023-08-29 14:54:30 -07:00
parent 19dcd7a48b
commit 1ecb747c6d
588 changed files with 34100 additions and 23589 deletions

View File

@@ -42,21 +42,30 @@ def mocker_get_rate(
return Decimal(0)
@freeze_time('2019-08-01T05:30')
@pytest.mark.parametrize('day_start, expected_kwargs', [
(None, [f'2019-07-{31-i}' for i in range(10)]),
('2019-07-21', [f'2019-07-{21-i}' for i in range(10)]),
])
def test_create_nightly_billing_triggers_tasks_for_days(notify_api, mocker, day_start, expected_kwargs):
mock_celery = mocker.patch('app.celery.reporting_tasks.create_nightly_billing_for_day')
@freeze_time("2019-08-01T05:30")
@pytest.mark.parametrize(
"day_start, expected_kwargs",
[
(None, [f"2019-07-{31-i}" for i in range(10)]),
("2019-07-21", [f"2019-07-{21-i}" for i in range(10)]),
],
)
def test_create_nightly_billing_triggers_tasks_for_days(
notify_api, mocker, day_start, expected_kwargs
):
mock_celery = mocker.patch(
"app.celery.reporting_tasks.create_nightly_billing_for_day"
)
create_nightly_billing(day_start)
assert mock_celery.apply_async.call_count == 10
for i in range(10):
assert mock_celery.apply_async.call_args_list[i][1]['kwargs'] == {'process_day': expected_kwargs[i]}
assert mock_celery.apply_async.call_args_list[i][1]["kwargs"] == {
"process_day": expected_kwargs[i]
}
@freeze_time('2019-08-01T00:30')
@freeze_time("2019-08-01T00:30")
def test_create_nightly_notification_status_triggers_tasks(
notify_api,
sample_service,
@@ -64,29 +73,32 @@ def test_create_nightly_notification_status_triggers_tasks(
mocker,
):
mock_celery = mocker.patch(
'app.celery.reporting_tasks.create_nightly_notification_status_for_service_and_day'
"app.celery.reporting_tasks.create_nightly_notification_status_for_service_and_day"
).apply_async
create_notification(template=sample_template, created_at='2019-07-31')
create_notification(template=sample_template, created_at="2019-07-31")
create_nightly_notification_status()
mock_celery.assert_called_with(
kwargs={
'service_id': sample_service.id,
'process_day': '2019-07-31',
'notification_type': SMS_TYPE
"service_id": sample_service.id,
"process_day": "2019-07-31",
"notification_type": SMS_TYPE,
},
queue=QueueNames.REPORTING
queue=QueueNames.REPORTING,
)
@freeze_time('2019-08-01T00:30')
@pytest.mark.parametrize('notification_date, expected_types_aggregated', [
('2019-08-01', set()),
('2019-07-31', {EMAIL_TYPE, SMS_TYPE}),
('2019-07-28', {EMAIL_TYPE, SMS_TYPE}),
('2019-07-21', set()),
])
@freeze_time("2019-08-01T00:30")
@pytest.mark.parametrize(
"notification_date, expected_types_aggregated",
[
("2019-08-01", set()),
("2019-07-31", {EMAIL_TYPE, SMS_TYPE}),
("2019-07-28", {EMAIL_TYPE, SMS_TYPE}),
("2019-07-21", set()),
],
)
def test_create_nightly_notification_status_triggers_relevant_tasks(
notify_api,
sample_service,
@@ -95,7 +107,7 @@ def test_create_nightly_notification_status_triggers_relevant_tasks(
expected_types_aggregated,
):
mock_celery = mocker.patch(
'app.celery.reporting_tasks.create_nightly_notification_status_for_service_and_day'
"app.celery.reporting_tasks.create_nightly_notification_status_for_service_and_day"
).apply_async
for notification_type in NOTIFICATION_TYPES:
@@ -104,28 +116,28 @@ def test_create_nightly_notification_status_triggers_relevant_tasks(
create_nightly_notification_status()
types = {call.kwargs['kwargs']['notification_type'] for call in mock_celery.mock_calls}
types = {
call.kwargs["kwargs"]["notification_type"] for call in mock_celery.mock_calls
}
assert types == expected_types_aggregated
def test_create_nightly_billing_for_day_checks_history(
sample_service,
sample_template,
mocker
sample_service, sample_template, mocker
):
yesterday = datetime.now() - timedelta(days=1)
mocker.patch('app.dao.fact_billing_dao.get_rate', side_effect=mocker_get_rate)
mocker.patch("app.dao.fact_billing_dao.get_rate", side_effect=mocker_get_rate)
create_notification(
created_at=yesterday,
template=sample_template,
status='sending',
status="sending",
)
create_notification_history(
created_at=yesterday,
template=sample_template,
status='delivered',
status="delivered",
)
records = FactBilling.query.all()
@@ -140,9 +152,10 @@ def test_create_nightly_billing_for_day_checks_history(
assert record.notifications_sent == 2
@pytest.mark.parametrize('second_rate, records_num, billable_units, multiplier',
[(1.0, 1, 2, [1]),
(2.0, 2, 1, [1, 2])])
@pytest.mark.parametrize(
"second_rate, records_num, billable_units, multiplier",
[(1.0, 1, 2, [1]), (2.0, 2, 1, [1, 2])],
)
def test_create_nightly_billing_for_day_sms_rate_multiplier(
sample_service,
sample_template,
@@ -150,19 +163,18 @@ def test_create_nightly_billing_for_day_sms_rate_multiplier(
second_rate,
records_num,
billable_units,
multiplier
multiplier,
):
yesterday = datetime.now() - timedelta(days=1)
mocker.patch('app.dao.fact_billing_dao.get_rate', side_effect=mocker_get_rate)
mocker.patch("app.dao.fact_billing_dao.get_rate", side_effect=mocker_get_rate)
# These are sms notifications
create_notification(
created_at=yesterday,
template=sample_template,
status='delivered',
sent_by='sns',
status="delivered",
sent_by="sns",
international=False,
rate_multiplier=1.0,
billable_units=1,
@@ -170,8 +182,8 @@ def test_create_nightly_billing_for_day_sms_rate_multiplier(
create_notification(
created_at=yesterday,
template=sample_template,
status='delivered',
sent_by='sns',
status="delivered",
sent_by="sns",
international=False,
rate_multiplier=second_rate,
billable_units=1,
@@ -181,7 +193,7 @@ def test_create_nightly_billing_for_day_sms_rate_multiplier(
assert len(records) == 0
create_nightly_billing_for_day(str(yesterday.date()))
records = FactBilling.query.order_by('rate_multiplier').all()
records = FactBilling.query.order_by("rate_multiplier").all()
assert len(records) == records_num
for i, record in enumerate(records):
@@ -192,20 +204,17 @@ def test_create_nightly_billing_for_day_sms_rate_multiplier(
def test_create_nightly_billing_for_day_different_templates(
sample_service,
sample_template,
sample_email_template,
mocker
sample_service, sample_template, sample_email_template, mocker
):
yesterday = datetime.now() - timedelta(days=1)
mocker.patch('app.dao.fact_billing_dao.get_rate', side_effect=mocker_get_rate)
mocker.patch("app.dao.fact_billing_dao.get_rate", side_effect=mocker_get_rate)
create_notification(
created_at=yesterday,
template=sample_template,
status='delivered',
sent_by='sns',
status="delivered",
sent_by="sns",
international=False,
rate_multiplier=1.0,
billable_units=1,
@@ -213,8 +222,8 @@ def test_create_nightly_billing_for_day_different_templates(
create_notification(
created_at=yesterday,
template=sample_email_template,
status='delivered',
sent_by='sns',
status="delivered",
sent_by="sns",
international=False,
rate_multiplier=0,
billable_units=0,
@@ -224,7 +233,7 @@ def test_create_nightly_billing_for_day_different_templates(
assert len(records) == 0
create_nightly_billing_for_day(str(yesterday.date()))
records = FactBilling.query.order_by('rate_multiplier').all()
records = FactBilling.query.order_by("rate_multiplier").all()
assert len(records) == 2
multiplier = [0, 1]
billable_units = [0, 1]
@@ -238,21 +247,18 @@ def test_create_nightly_billing_for_day_different_templates(
def test_create_nightly_billing_for_day_same_sent_by(
sample_service,
sample_template,
sample_email_template,
mocker
sample_service, sample_template, sample_email_template, mocker
):
yesterday = datetime.now() - timedelta(days=1)
mocker.patch('app.dao.fact_billing_dao.get_rate', side_effect=mocker_get_rate)
mocker.patch("app.dao.fact_billing_dao.get_rate", side_effect=mocker_get_rate)
# These are sms notifications
create_notification(
created_at=yesterday,
template=sample_template,
status='delivered',
sent_by='sns',
status="delivered",
sent_by="sns",
international=False,
rate_multiplier=1.0,
billable_units=1,
@@ -260,8 +266,8 @@ def test_create_nightly_billing_for_day_same_sent_by(
create_notification(
created_at=yesterday,
template=sample_template,
status='delivered',
sent_by='sns',
status="delivered",
sent_by="sns",
international=False,
rate_multiplier=1.0,
billable_units=1,
@@ -271,7 +277,7 @@ def test_create_nightly_billing_for_day_same_sent_by(
assert len(records) == 0
create_nightly_billing_for_day(str(yesterday.date()))
records = FactBilling.query.order_by('rate_multiplier').all()
records = FactBilling.query.order_by("rate_multiplier").all()
assert len(records) == 1
for _, record in enumerate(records):
@@ -282,18 +288,16 @@ def test_create_nightly_billing_for_day_same_sent_by(
def test_create_nightly_billing_for_day_null_sent_by_sms(
sample_service,
sample_template,
mocker
sample_service, sample_template, mocker
):
yesterday = datetime.now() - timedelta(days=1)
mocker.patch('app.dao.fact_billing_dao.get_rate', side_effect=mocker_get_rate)
mocker.patch("app.dao.fact_billing_dao.get_rate", side_effect=mocker_get_rate)
create_notification(
created_at=yesterday,
template=sample_template,
status='delivered',
status="delivered",
sent_by=None,
international=False,
rate_multiplier=1.0,
@@ -312,13 +316,13 @@ def test_create_nightly_billing_for_day_null_sent_by_sms(
assert record.rate == Decimal(1.33)
assert record.billable_units == 1
assert record.rate_multiplier == 1
assert record.provider == 'unknown'
assert record.provider == "unknown"
def test_get_rate_for_sms_and_email(notify_db_session):
non_letter_rates = [
create_rate(datetime(2017, 12, 1), 0.15, SMS_TYPE),
create_rate(datetime(2017, 12, 1), 0, EMAIL_TYPE)
create_rate(datetime(2017, 12, 1), 0, EMAIL_TYPE),
]
rate = get_rate(non_letter_rates, SMS_TYPE, date(2018, 1, 1))
@@ -328,20 +332,18 @@ def test_get_rate_for_sms_and_email(notify_db_session):
assert rate == Decimal(0)
@freeze_time('2018-03-26T04:30:00')
@freeze_time("2018-03-26T04:30:00")
# summer time starts on 2018-03-25
def test_create_nightly_billing_for_day_use_BST(
sample_service,
sample_template,
mocker):
mocker.patch('app.dao.fact_billing_dao.get_rate', side_effect=mocker_get_rate)
sample_service, sample_template, mocker
):
mocker.patch("app.dao.fact_billing_dao.get_rate", side_effect=mocker_get_rate)
# too late
create_notification(
created_at=datetime(2018, 3, 26, 4, 1),
template=sample_template,
status='delivered',
status="delivered",
rate_multiplier=1.0,
billable_units=1,
)
@@ -349,7 +351,7 @@ def test_create_nightly_billing_for_day_use_BST(
create_notification(
created_at=datetime(2018, 3, 25, 23, 59),
template=sample_template,
status='delivered',
status="delivered",
rate_multiplier=1.0,
billable_units=2,
)
@@ -358,7 +360,7 @@ def test_create_nightly_billing_for_day_use_BST(
create_notification(
created_at=datetime(2018, 3, 24, 23, 59),
template=sample_template,
status='delivered',
status="delivered",
rate_multiplier=1.0,
billable_units=4,
)
@@ -366,7 +368,7 @@ def test_create_nightly_billing_for_day_use_BST(
assert Notification.query.count() == 3
assert FactBilling.query.count() == 0
create_nightly_billing_for_day('2018-03-25')
create_nightly_billing_for_day("2018-03-25")
records = FactBilling.query.order_by(FactBilling.local_date).all()
assert len(records) == 1
@@ -374,18 +376,16 @@ def test_create_nightly_billing_for_day_use_BST(
assert records[0].billable_units == 2
@freeze_time('2018-01-15T08:30:00')
@freeze_time("2018-01-15T08:30:00")
def test_create_nightly_billing_for_day_update_when_record_exists(
sample_service,
sample_template,
mocker):
mocker.patch('app.dao.fact_billing_dao.get_rate', side_effect=mocker_get_rate)
sample_service, sample_template, mocker
):
mocker.patch("app.dao.fact_billing_dao.get_rate", side_effect=mocker_get_rate)
create_notification(
created_at=datetime.now() - timedelta(days=1),
template=sample_template,
status='delivered',
status="delivered",
sent_by=None,
international=False,
rate_multiplier=1.0,
@@ -395,7 +395,7 @@ def test_create_nightly_billing_for_day_update_when_record_exists(
records = FactBilling.query.all()
assert len(records) == 0
create_nightly_billing_for_day('2018-01-14')
create_nightly_billing_for_day("2018-01-14")
records = FactBilling.query.order_by(FactBilling.local_date).all()
assert len(records) == 1
@@ -406,7 +406,7 @@ def test_create_nightly_billing_for_day_update_when_record_exists(
create_notification(
created_at=datetime.now() - timedelta(days=1),
template=sample_template,
status='delivered',
status="delivered",
sent_by=None,
international=False,
rate_multiplier=1.0,
@@ -414,41 +414,51 @@ def test_create_nightly_billing_for_day_update_when_record_exists(
)
# run again, make sure create_nightly_billing() updates with no error
create_nightly_billing_for_day('2018-01-14')
create_nightly_billing_for_day("2018-01-14")
assert len(records) == 1
assert records[0].billable_units == 2
assert records[0].updated_at
def test_create_nightly_notification_status_for_service_and_day(notify_db_session):
first_service = create_service(service_name='First Service')
first_service = create_service(service_name="First Service")
first_template = create_template(service=first_service)
second_service = create_service(service_name='second Service')
second_template = create_template(service=second_service, template_type='email')
second_service = create_service(service_name="second Service")
second_template = create_template(service=second_service, template_type="email")
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='failed')
create_notification(template=first_template, status="delivered")
create_notification(template=second_template, status="failed")
# team API key notifications are included
create_notification(template=second_template, status='sending', key_type=KEY_TYPE_TEAM)
create_notification(
template=second_template, status="sending", 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="sending", key_type=KEY_TYPE_TEST
)
# historical notifications are included
create_notification_history(template=second_template, status='delivered')
create_notification_history(template=second_template, status="delivered")
# these created notifications from a different day get ignored
with freeze_time(datetime.combine(datetime.utcnow().date() - timedelta(days=4), time.max)):
with freeze_time(
datetime.combine(datetime.utcnow().date() - timedelta(days=4), time.max)
):
create_notification(template=first_template)
create_notification_history(template=second_template)
assert len(FactNotificationStatus.query.all()) == 0
create_nightly_notification_status_for_service_and_day(str(process_day), first_service.id, 'sms')
create_nightly_notification_status_for_service_and_day(str(process_day), second_service.id, 'email')
create_nightly_notification_status_for_service_and_day(
str(process_day), first_service.id, "sms"
)
create_nightly_notification_status_for_service_and_day(
str(process_day), second_service.id, "email"
)
new_fact_data = FactNotificationStatus.query.order_by(
FactNotificationStatus.notification_type,
@@ -460,16 +470,16 @@ def test_create_nightly_notification_status_for_service_and_day(notify_db_sessio
email_delivered_row = new_fact_data[0]
assert email_delivered_row.template_id == second_template.id
assert email_delivered_row.service_id == second_service.id
assert email_delivered_row.notification_type == 'email'
assert email_delivered_row.notification_status == 'delivered'
assert email_delivered_row.notification_type == "email"
assert email_delivered_row.notification_status == "delivered"
assert email_delivered_row.notification_count == 1
assert email_delivered_row.key_type == KEY_TYPE_NORMAL
email_sending_row = new_fact_data[1]
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 == 'failed'
assert email_sending_row.notification_type == "email"
assert email_sending_row.notification_status == "failed"
assert email_sending_row.notification_count == 1
assert email_sending_row.key_type == KEY_TYPE_NORMAL
@@ -477,40 +487,46 @@ def test_create_nightly_notification_status_for_service_and_day(notify_db_sessio
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 == 'sending'
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 == "sending"
assert email_failure_row.notification_count == 1
assert email_failure_row.key_type == KEY_TYPE_TEAM
sms_delivered_row = new_fact_data[3]
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'
assert sms_delivered_row.notification_status == 'delivered'
assert sms_delivered_row.notification_type == "sms"
assert sms_delivered_row.notification_status == "delivered"
assert sms_delivered_row.notification_count == 1
assert sms_delivered_row.key_type == KEY_TYPE_NORMAL
def test_create_nightly_notification_status_for_service_and_day_overwrites_old_data(notify_db_session):
first_service = create_service(service_name='First Service')
def test_create_nightly_notification_status_for_service_and_day_overwrites_old_data(
notify_db_session,
):
first_service = create_service(service_name="First Service")
first_template = create_template(service=first_service)
process_day = datetime.utcnow().date()
# first run: one notification, expect one row (just one status)
notification = create_notification(template=first_template, status='sending')
create_nightly_notification_status_for_service_and_day(str(process_day), first_service.id, 'sms')
notification = create_notification(template=first_template, status="sending")
create_nightly_notification_status_for_service_and_day(
str(process_day), first_service.id, "sms"
)
new_fact_data = FactNotificationStatus.query.all()
assert len(new_fact_data) == 1
assert new_fact_data[0].notification_count == 1
assert new_fact_data[0].notification_status == 'sending'
assert new_fact_data[0].notification_status == "sending"
# second run: status changed, still expect one row (one status)
notification.status = 'delivered'
create_notification(template=first_template, status='created')
create_nightly_notification_status_for_service_and_day(str(process_day), first_service.id, 'sms')
notification.status = "delivered"
create_notification(template=first_template, status="created")
create_nightly_notification_status_for_service_and_day(
str(process_day), first_service.id, "sms"
)
updated_fact_data = FactNotificationStatus.query.order_by(
FactNotificationStatus.notification_status
@@ -518,25 +534,39 @@ def test_create_nightly_notification_status_for_service_and_day_overwrites_old_d
assert len(updated_fact_data) == 2
assert updated_fact_data[0].notification_count == 1
assert updated_fact_data[0].notification_status == 'created'
assert updated_fact_data[0].notification_status == "created"
assert updated_fact_data[1].notification_count == 1
assert updated_fact_data[1].notification_status == 'delivered'
assert updated_fact_data[1].notification_status == "delivered"
# the job runs at 04:30am EST time.
@freeze_time('2019-04-02T04:30')
def test_create_nightly_notification_status_for_service_and_day_respects_bst(sample_template):
create_notification(sample_template, status='delivered', created_at=datetime(2019, 4, 2, 5, 0)) # too new
@freeze_time("2019-04-02T04:30")
def test_create_nightly_notification_status_for_service_and_day_respects_bst(
sample_template,
):
create_notification(
sample_template, status="delivered", created_at=datetime(2019, 4, 2, 5, 0)
) # too new
create_notification(sample_template, status='created', created_at=datetime(2019, 4, 2, 5, 59))
create_notification(sample_template, status='created', created_at=datetime(2019, 4, 1, 4, 0))
create_notification(
sample_template, status="created", created_at=datetime(2019, 4, 2, 5, 59)
)
create_notification(
sample_template, status="created", created_at=datetime(2019, 4, 1, 4, 0)
)
create_notification(sample_template, status='delivered', created_at=datetime(2019, 3, 21, 17, 59)) # too old
create_notification(
sample_template, status="delivered", created_at=datetime(2019, 3, 21, 17, 59)
) # too old
create_nightly_notification_status_for_service_and_day('2019-04-01', sample_template.service_id, 'sms')
create_nightly_notification_status_for_service_and_day(
"2019-04-01", sample_template.service_id, "sms"
)
noti_status = FactNotificationStatus.query.order_by(FactNotificationStatus.local_date).all()
noti_status = FactNotificationStatus.query.order_by(
FactNotificationStatus.local_date
).all()
assert len(noti_status) == 1
assert noti_status[0].local_date == date(2019, 4, 1)
assert noti_status[0].notification_status == 'created'
assert noti_status[0].notification_status == "created"