mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-03 01:41:05 -05:00
Usage DAO can now return rates and billable amount, alongside units.
This commit is contained in:
Martyn Inglis
@@ -4,11 +4,19 @@ from datetime import datetime, timedelta
|
||||
import pytest
|
||||
|
||||
from app.dao.date_util import get_financial_year
|
||||
from app.dao.notification_usage_dao import (get_rates_for_year, get_yearly_billing_data,
|
||||
get_monthly_billing_data,
|
||||
get_total_billable_units_for_sent_sms_notifications_in_date_range)
|
||||
from app.models import Rate, NOTIFICATION_STATUS_SUCCESS, NOTIFICATION_DELIVERED, NOTIFICATION_STATUS_TYPES_BILLABLE, \
|
||||
NOTIFICATION_CREATED, NOTIFICATION_STATUS_TYPES_NON_BILLABLE
|
||||
from app.dao.notification_usage_dao import (
|
||||
get_rates_for_year,
|
||||
get_yearly_billing_data,
|
||||
get_monthly_billing_data,
|
||||
get_total_billable_units_for_sent_sms_notifications_in_date_range,
|
||||
discover_rate_bounds_for_billing_query
|
||||
)
|
||||
from app.models import (
|
||||
Rate,
|
||||
NOTIFICATION_DELIVERED,
|
||||
NOTIFICATION_STATUS_TYPES_BILLABLE,
|
||||
NOTIFICATION_STATUS_TYPES_NON_BILLABLE,
|
||||
Notification)
|
||||
from tests.app.conftest import sample_notification, sample_email_template, sample_letter_template, sample_service
|
||||
from tests.app.db import create_notification
|
||||
from freezegun import freeze_time
|
||||
@@ -258,6 +266,8 @@ def set_up_rate(notify_db, start_date, value):
|
||||
|
||||
@freeze_time("2016-01-10 12:00:00.000000")
|
||||
def test_returns_total_billable_units_for_sms_notifications(notify_db, notify_db_session, sample_service):
|
||||
set_up_rate(notify_db, datetime(2016, 1, 1), 0.016)
|
||||
|
||||
sample_notification(
|
||||
notify_db, notify_db_session, service=sample_service, billable_units=1, status=NOTIFICATION_DELIVERED)
|
||||
sample_notification(
|
||||
@@ -270,13 +280,16 @@ def test_returns_total_billable_units_for_sms_notifications(notify_db, notify_db
|
||||
start = datetime.utcnow() - timedelta(minutes=10)
|
||||
end = datetime.utcnow() + timedelta(minutes=10)
|
||||
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id) == 10
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[0] == 10
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[1] == 0.16
|
||||
|
||||
|
||||
@freeze_time("2016-01-10 12:00:00.000000")
|
||||
def test_returns_total_billable_units_multiplied_by_multipler_for_sms_notifications(
|
||||
notify_db, notify_db_session, sample_service
|
||||
):
|
||||
set_up_rate(notify_db, datetime(2016, 1, 1), 2.5)
|
||||
|
||||
sample_notification(
|
||||
notify_db, notify_db_session, service=sample_service, rate_multiplier=1.0, status=NOTIFICATION_DELIVERED)
|
||||
sample_notification(
|
||||
@@ -289,13 +302,94 @@ def test_returns_total_billable_units_multiplied_by_multipler_for_sms_notificati
|
||||
start = datetime.utcnow() - timedelta(minutes=10)
|
||||
end = datetime.utcnow() + timedelta(minutes=10)
|
||||
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id) == 18
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[0] == 18
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[1] == 45
|
||||
|
||||
|
||||
def test_returns_total_billable_units_multiplied_by_multipler_for_sms_notifications_for_several_rates(
|
||||
notify_db, notify_db_session, sample_service
|
||||
):
|
||||
set_up_rate(notify_db, datetime(2016, 1, 1), 2)
|
||||
set_up_rate(notify_db, datetime(2016, 10, 1), 4)
|
||||
set_up_rate(notify_db, datetime(2017, 1, 1), 6)
|
||||
|
||||
eligble_rate_1 = datetime(2016, 2, 1)
|
||||
eligble_rate_2 = datetime(2016, 11, 1)
|
||||
eligble_rate_3 = datetime(2017, 2, 1)
|
||||
|
||||
sample_notification(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
service=sample_service,
|
||||
rate_multiplier=1.0,
|
||||
status=NOTIFICATION_DELIVERED,
|
||||
created_at=eligble_rate_1)
|
||||
|
||||
sample_notification(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
service=sample_service,
|
||||
rate_multiplier=2.0,
|
||||
status=NOTIFICATION_DELIVERED,
|
||||
created_at=eligble_rate_2)
|
||||
|
||||
sample_notification(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
service=sample_service,
|
||||
rate_multiplier=5.0,
|
||||
status=NOTIFICATION_DELIVERED,
|
||||
created_at=eligble_rate_3)
|
||||
|
||||
start = datetime(2016, 1, 1)
|
||||
end = datetime(2018, 1, 1)
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[0] == 8
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[1] == 40
|
||||
|
||||
|
||||
def test_returns_total_billable_units_for_sms_notifications_for_several_rates_where_dates_match_rate_boundary(
|
||||
notify_db, notify_db_session, sample_service
|
||||
):
|
||||
set_up_rate(notify_db, datetime(2016, 1, 1), 2)
|
||||
set_up_rate(notify_db, datetime(2016, 10, 1), 4)
|
||||
set_up_rate(notify_db, datetime(2017, 1, 1), 6)
|
||||
|
||||
eligble_rate_1_start = datetime(2016, 1, 1, 0, 0, 0, 0)
|
||||
eligble_rate_1_end = datetime(2016, 9, 30, 23, 59, 59, 999)
|
||||
eligble_rate_2_start = datetime(2016, 10, 1, 0, 0, 0, 0)
|
||||
eligble_rate_2_end = datetime(2016, 12, 31, 23, 59, 59, 999)
|
||||
eligble_rate_3_start = datetime(2017, 1, 1, 0, 0, 0, 0)
|
||||
eligble_rate_3_whenever = datetime(2017, 12, 12, 0, 0, 0, 0)
|
||||
|
||||
def make_notification(created_at):
|
||||
sample_notification(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
service=sample_service,
|
||||
rate_multiplier=1.0,
|
||||
status=NOTIFICATION_DELIVERED,
|
||||
created_at=created_at)
|
||||
|
||||
make_notification(eligble_rate_1_start)
|
||||
make_notification(eligble_rate_1_end)
|
||||
make_notification(eligble_rate_2_start)
|
||||
make_notification(eligble_rate_2_end)
|
||||
make_notification(eligble_rate_3_start)
|
||||
make_notification(eligble_rate_3_whenever)
|
||||
|
||||
start = datetime(2016, 1, 1)
|
||||
end = datetime(2018, 1, 1)
|
||||
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[0] == 6
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[1] == 24.0
|
||||
|
||||
|
||||
@freeze_time("2016-01-10 12:00:00.000000")
|
||||
def test_returns_total_billable_units_for_sms_notifications_ignoring_letters_and_emails(
|
||||
notify_db, notify_db_session, sample_service
|
||||
):
|
||||
set_up_rate(notify_db, datetime(2016, 1, 1), 2.5)
|
||||
|
||||
email_template = sample_email_template(notify_db, notify_db_session, service=sample_service)
|
||||
letter_template = sample_letter_template(sample_service)
|
||||
|
||||
@@ -324,13 +418,16 @@ def test_returns_total_billable_units_for_sms_notifications_ignoring_letters_and
|
||||
start = datetime.utcnow() - timedelta(minutes=10)
|
||||
end = datetime.utcnow() + timedelta(minutes=10)
|
||||
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id) == 2
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[0] == 2
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[1] == 5
|
||||
|
||||
|
||||
@freeze_time("2016-01-10 12:00:00.000000")
|
||||
def test_returns_total_billable_units_for_sms_notifications_for_only_requested_service(
|
||||
notify_db, notify_db_session
|
||||
):
|
||||
set_up_rate(notify_db, datetime(2016, 1, 1), 2.5)
|
||||
|
||||
service_1 = sample_service(notify_db, notify_db_session, service_name=str(uuid.uuid4()))
|
||||
service_2 = sample_service(notify_db, notify_db_session, service_name=str(uuid.uuid4()))
|
||||
service_3 = sample_service(notify_db, notify_db_session, service_name=str(uuid.uuid4()))
|
||||
@@ -358,13 +455,16 @@ def test_returns_total_billable_units_for_sms_notifications_for_only_requested_s
|
||||
start = datetime.utcnow() - timedelta(minutes=10)
|
||||
end = datetime.utcnow() + timedelta(minutes=10)
|
||||
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, service_1.id) == 2
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, service_1.id)[0] == 2
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, service_1.id)[1] == 5
|
||||
|
||||
|
||||
@freeze_time("2016-01-10 12:00:00.000000")
|
||||
def test_returns_total_billable_units_for_sms_notifications_handling_null_values(
|
||||
notify_db, notify_db_session, sample_service
|
||||
):
|
||||
set_up_rate(notify_db, datetime(2016, 1, 1), 2.5)
|
||||
|
||||
sample_notification(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
@@ -376,7 +476,8 @@ def test_returns_total_billable_units_for_sms_notifications_handling_null_values
|
||||
start = datetime.utcnow() - timedelta(minutes=10)
|
||||
end = datetime.utcnow() + timedelta(minutes=10)
|
||||
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id) == 2
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[0] == 2
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[1] == 5
|
||||
|
||||
|
||||
@pytest.mark.parametrize('billable_units, states', ([
|
||||
@@ -387,6 +488,8 @@ def test_returns_total_billable_units_for_sms_notifications_handling_null_values
|
||||
def test_ignores_non_billable_states_when_returning_billable_units_for_sms_notifications(
|
||||
notify_db, notify_db_session, sample_service, billable_units, states
|
||||
):
|
||||
set_up_rate(notify_db, datetime(2016, 1, 1), 2.5)
|
||||
|
||||
for state in states:
|
||||
sample_notification(
|
||||
notify_db,
|
||||
@@ -401,13 +504,18 @@ def test_ignores_non_billable_states_when_returning_billable_units_for_sms_notif
|
||||
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(
|
||||
start, end, sample_service.id
|
||||
) == billable_units
|
||||
)[0] == billable_units
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(
|
||||
start, end, sample_service.id
|
||||
)[1] == billable_units * 2.5
|
||||
|
||||
|
||||
@freeze_time("2016-01-10 12:00:00.000000")
|
||||
def test_restricts_to_time_period_when_returning_billable_units_for_sms_notifications(
|
||||
notify_db, notify_db_session, sample_service
|
||||
):
|
||||
set_up_rate(notify_db, datetime(2016, 1, 1), 2.5)
|
||||
|
||||
sample_notification(
|
||||
notify_db,
|
||||
notify_db_session,
|
||||
@@ -429,12 +537,71 @@ def test_restricts_to_time_period_when_returning_billable_units_for_sms_notifica
|
||||
start = datetime.utcnow() - timedelta(minutes=10)
|
||||
end = datetime.utcnow() + timedelta(minutes=10)
|
||||
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id) == 1
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[0] == 1
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[1] == 2.5
|
||||
|
||||
|
||||
def test_returns_zero_if_no_matching_rows_when_returning_billable_units_for_sms_notifications(
|
||||
notify_db, notify_db_session, sample_service
|
||||
):
|
||||
set_up_rate(notify_db, datetime(2016, 1, 1), 2.5)
|
||||
|
||||
start = datetime.utcnow() - timedelta(minutes=10)
|
||||
end = datetime.utcnow() + timedelta(minutes=10)
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id) == 0
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[0] == 0
|
||||
assert get_total_billable_units_for_sent_sms_notifications_in_date_range(start, end, sample_service.id)[1] == 0.0
|
||||
|
||||
|
||||
def test_should_calculate_rate_boundaries_for_billing_query_for_single_relevant_rate(notify_db, notify_db_session):
|
||||
start_date, end_date = get_financial_year(2016)
|
||||
set_up_rate(notify_db, datetime(2016, 1, 1), 0.016)
|
||||
rate_boundaries = discover_rate_bounds_for_billing_query(start_date, end_date)
|
||||
print(rate_boundaries)
|
||||
assert len(rate_boundaries) == 1
|
||||
assert rate_boundaries[0]['start_date'] == start_date
|
||||
assert rate_boundaries[0]['end_date'] == end_date
|
||||
assert rate_boundaries[0]['rate'] == 0.016
|
||||
|
||||
|
||||
def test_should_calculate_rate_boundaries_for_billing_query_for_two_relevant_rates(notify_db, notify_db_session):
|
||||
start_date, end_date = get_financial_year(2016)
|
||||
|
||||
rate_1_valid_from = datetime(2016, 1, 1)
|
||||
rate_2_valid_from = datetime(2017, 1, 1)
|
||||
|
||||
set_up_rate(notify_db, rate_1_valid_from, 0.02)
|
||||
set_up_rate(notify_db, rate_2_valid_from, 0.04)
|
||||
rate_boundaries = discover_rate_bounds_for_billing_query(start_date, end_date)
|
||||
assert len(rate_boundaries) == 2
|
||||
assert rate_boundaries[0]['start_date'] == start_date
|
||||
assert rate_boundaries[0]['end_date'] == rate_2_valid_from
|
||||
assert rate_boundaries[0]['rate'] == 0.02
|
||||
|
||||
assert rate_boundaries[1]['start_date'] == rate_2_valid_from
|
||||
assert rate_boundaries[1]['end_date'] == end_date
|
||||
assert rate_boundaries[1]['rate'] == 0.04
|
||||
|
||||
|
||||
def test_should_calculate_rate_boundaries_for_billing_query_for_three_relevant_rates(notify_db, notify_db_session):
|
||||
start_date, end_date = get_financial_year(2016)
|
||||
rate_1_valid_from = datetime(2016, 1, 1)
|
||||
rate_2_valid_from = datetime(2017, 1, 1)
|
||||
rate_3_valid_from = datetime(2017, 2, 1)
|
||||
|
||||
set_up_rate(notify_db, rate_1_valid_from, 0.02)
|
||||
set_up_rate(notify_db, rate_2_valid_from, 0.04)
|
||||
set_up_rate(notify_db, rate_3_valid_from, 0.06)
|
||||
rate_boundaries = discover_rate_bounds_for_billing_query(start_date, end_date)
|
||||
assert len(rate_boundaries) == 3
|
||||
|
||||
assert rate_boundaries[0]['start_date'] == start_date
|
||||
assert rate_boundaries[0]['end_date'] == rate_2_valid_from
|
||||
assert rate_boundaries[0]['rate'] == 0.02
|
||||
|
||||
assert rate_boundaries[1]['start_date'] == rate_2_valid_from
|
||||
assert rate_boundaries[1]['end_date'] == rate_3_valid_from
|
||||
assert rate_boundaries[1]['rate'] == 0.04
|
||||
|
||||
assert rate_boundaries[2]['start_date'] == rate_3_valid_from
|
||||
assert rate_boundaries[2]['end_date'] == end_date
|
||||
assert rate_boundaries[2]['rate'] == 0.06
|
||||
|
||||
Reference in New Issue
Block a user