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

Increase the number of days we calculate billing from 3 to 10 days.

Browse Source 
Log exception if the billing counts for letters are different in the dvla response file than what we collected.
This commit is contained in:
Rebecca Law
2018-07-24 16:28:30 +01:00
parent 1b21a12b83
commit 4fc004b00a
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/celery/reporting_tasks.py
View File

@@ -21,7 +21,7 @@ def create_nightly_billing(day_start=None):
else: else:
# When calling the task its a string in the format of "YYYY-MM-DD" # When calling the task its a string in the format of "YYYY-MM-DD"
day_start = datetime.strptime(day_start, "%Y-%m-%d") day_start = datetime.strptime(day_start, "%Y-%m-%d")
for i in range(0, 3): for i in range(0, 10):
process_day = day_start - timedelta(days=i) process_day = day_start - timedelta(days=i)
transit_data = fetch_billing_data_for_day(process_day=process_day) transit_data = fetch_billing_data_for_day(process_day=process_day)

6
app/celery/tasks.py
View File

@@ -491,8 +491,10 @@ def check_billable_units(notification_update):
if int(notification_update.page_count) != notification.billable_units: if int(notification_update.page_count) != notification.billable_units:
msg = 'Notification with id {} had {} billable_units but a page count of {}'.format( msg = 'Notification with id {} had {} billable_units but a page count of {}'.format(
notification.id, notification.billable_units, notification_update.page_count) notification.id, notification.billable_units, notification_update.page_count)
try:
current_app.logger.error(msg) raise DVLAException(msg)
except DVLAException:
current_app.logger.exception(msg)
@notify_celery.task(bind=True, name="send-inbound-sms", max_retries=5, default_retry_delay=300) @notify_celery.task(bind=True, name="send-inbound-sms", max_retries=5, default_retry_delay=300)

2
tests/app/celery/test_ftp_update_tasks.py
View File

@@ -308,7 +308,7 @@ def test_check_billable_units_when_billable_units_does_not_match_page_count(
mocker, mocker,
notification_update notification_update
): ):
mock_logger = mocker.patch('app.celery.tasks.current_app.logger.error') mock_logger = mocker.patch('app.celery.tasks.current_app.logger.exception')
notification = create_notification(sample_letter_template, reference='REFERENCE_ABC', billable_units=3) notification = create_notification(sample_letter_template, reference='REFERENCE_ABC', billable_units=3)

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

@@ -287,7 +287,7 @@ def test_create_nightly_billing_consolidate_from_3_days_delta(
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 records from 11th to 15th # create records from 11th to 15th
for i in range(0, 5): for i in range(0, 11):
sample_notification( sample_notification(
notify_db, notify_db,
notify_db_session, notify_db_session,
@@ -302,7 +302,7 @@ def test_create_nightly_billing_consolidate_from_3_days_delta(
) )
notification = Notification.query.order_by(Notification.created_at).all() notification = Notification.query.order_by(Notification.created_at).all()
assert datetime.date(notification[0].created_at) == date(2018, 1, 11) assert datetime.date(notification[0].created_at) == date(2018, 1, 5)
records = FactBilling.query.all() records = FactBilling.query.all()
assert len(records) == 0 assert len(records) == 0
@@ -310,8 +310,8 @@ def test_create_nightly_billing_consolidate_from_3_days_delta(
create_nightly_billing() create_nightly_billing()
records = FactBilling.query.order_by(FactBilling.bst_date).all() records = FactBilling.query.order_by(FactBilling.bst_date).all()
assert len(records) == 3 assert len(records) == 10
assert records[0].bst_date == date(2018, 1, 12) assert records[0].bst_date == date(2018, 1, 5)
assert records[-1].bst_date == date(2018, 1, 14) assert records[-1].bst_date == date(2018, 1, 14)