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

Update ft_billing DAO functions to use postage

Browse Source 
* Updated the 'fetch_billing_data_for_day' DAO function to take postage into
account
* Updated the 'update_fact_billing' DAO function to insert postage for
new rows. When updating rows which are identical apart from the postage, the
original row will be kept. (This behaviour will change once postage is
added to the primary key - at this point, upserting will add a new row.)
* Also changed some fixtures / test set up functions to take postage
into account
This commit is contained in:
Katie Smith
2018-09-26 11:28:59 +01:00
parent 0b5da2b8ad
commit 6727f0e0f5
6 changed files with 95 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/app/billing/test_billing.py
View File

@@ -200,7 +200,8 @@ def test_get_yearly_usage_by_monthly_from_ft_billing(client, notify_db_session):
template=letter_template,
notification_type='letter',
billable_unit=1,
rate=0.33)
rate=0.33,
postage='second')
response = client.get('service/{}/billing/ft-monthly-usage?year=2016'.format(service.id),
headers=[('Content-Type', 'application/json'), create_authorization_header()])
@@ -257,7 +258,8 @@ def set_up_yearly_data():
service=service,
template=letter_template,
notification_type='letter',
rate=0.33)
rate=0.33,
postage='second')
start_date, end_date = get_month_start_and_end_date_in_utc(datetime(2016, int(mon), 1))
return service
@@ -429,7 +431,8 @@ def set_up_data_for_all_cases():
international=False,
rate=0.33,
billable_unit=1,
notifications_sent=1)
notifications_sent=1,
postage='second')
create_ft_billing(bst_date='2018-05-17',
notification_type='letter',
template=letter_template,
@@ -438,7 +441,8 @@ def set_up_data_for_all_cases():
international=False,
rate=0.36,
billable_unit=2,
notifications_sent=1)
notifications_sent=1,
postage='second')
create_ft_billing(bst_date='2018-05-18',
notification_type='letter',
template=letter_template,
@@ -447,5 +451,6 @@ def set_up_data_for_all_cases():
international=False,
rate=0.39,
billable_unit=3,
notifications_sent=1)
notifications_sent=1,
postage='second')
return service

38
tests/app/celery/test_reporting_tasks.py
View File

@@ -210,6 +210,44 @@ def test_create_nightly_billing_letter(
assert record.rate_multiplier == 2.0
def test_create_nightly_billing_different_letter_postage(
notify_db_session,
sample_letter_template,
mocker):
yesterday = datetime.now() - timedelta(days=1)
mocker.patch('app.dao.fact_billing_dao.get_rate', side_effect=mocker_get_rate)
create_notification(
created_at=yesterday,
template=sample_letter_template,
status='delivered',
sent_by='dvla',
billable_units=2,
postage='first'
)
create_notification(
created_at=yesterday,
template=sample_letter_template,
status='delivered',
sent_by='dvla',
billable_units=2,
postage='second'
)
records = FactBilling.query.all()
assert len(records) == 0
# Celery expects the arguments to be a string or primitive type.
yesterday_str = datetime.strftime(yesterday, "%Y-%m-%d")
create_nightly_billing(yesterday_str)
# ft_billing rows will not get upserted since postage is not part of the primary key
record = FactBilling.query.one()
assert record.notification_type == LETTER_TYPE
assert record.bst_date == datetime.date(yesterday)
assert record.postage == 'first'
def test_create_nightly_billing_null_sent_by_sms(
sample_service,
sample_template,

6
tests/app/conftest.py
View File

@@ -535,7 +535,8 @@ def sample_notification(
client_reference=None,
rate_multiplier=1.0,
scheduled_for=None,
normalised_to=None
normalised_to=None,
postage=None,
):
if created_at is None:
created_at = datetime.utcnow()
@@ -580,7 +581,8 @@ def sample_notification(
'updated_at': created_at if status in NOTIFICATION_STATUS_TYPES_COMPLETED else None,
'client_reference': client_reference,
'rate_multiplier': rate_multiplier,
'normalised_to': normalised_to
'normalised_to': normalised_to,
'postage': postage,
}
if job_row_number is not None:
data['job_row_number'] = job_row_number

34
tests/app/dao/test_ft_billing_dao.py
View File

@@ -50,12 +50,14 @@ def set_up_yearly_data():
service=service,
template=letter_template,
notification_type='letter',
rate=0.33)
rate=0.33,
postage='second')
create_ft_billing(bst_date='{}-{}-{}'.format(year, mon, d),
service=service,
template=letter_template,
notification_type='letter',
rate=0.30)
rate=0.30,
postage='second')
return service
@@ -190,6 +192,34 @@ def test_fetch_billing_data_for_day_is_grouped_by_notification_type(notify_db_se
assert len(notification_types) == 3
def test_fetch_billing_data_for_day_groups_by_postage(notify_db_session):
service = create_service()
letter_template = create_template(service=service, template_type='letter')
email_template = create_template(service=service, template_type='email')
create_notification(template=letter_template, status='delivered', postage='first')
create_notification(template=letter_template, status='delivered', postage='first')
create_notification(template=letter_template, status='delivered', postage='second')
create_notification(template=email_template, status='delivered')
today = convert_utc_to_bst(datetime.utcnow())
results = fetch_billing_data_for_day(today)
assert len(results) == 3
def test_fetch_billing_data_for_day_sets_postage_for_emails_and_sms_to_none(notify_db_session):
service = create_service()
sms_template = create_template(service=service, template_type='sms')
email_template = create_template(service=service, template_type='email')
create_notification(template=sms_template, status='delivered')
create_notification(template=email_template, status='delivered')
today = convert_utc_to_bst(datetime.utcnow())
results = fetch_billing_data_for_day(today)
assert len(results) == 2
assert results[0].postage == 'none'
assert results[1].postage == 'none'
def test_fetch_billing_data_for_day_returns_empty_list(notify_db_session):
today = convert_utc_to_bst(datetime.utcnow())
results = fetch_billing_data_for_day(today)

6
tests/app/db.py
View File

@@ -512,7 +512,8 @@ def create_ft_billing(bst_date,
international=False,
rate=0,
billable_unit=1,
notifications_sent=1
notifications_sent=1,
postage='none',
):
if not service:
service = create_service()
@@ -528,7 +529,8 @@ def create_ft_billing(bst_date,
international=international,
rate=rate,
billable_units=billable_unit,
notifications_sent=notifications_sent)
notifications_sent=notifications_sent,
postage=postage)
db.session.add(data)
db.session.commit()
return data