diff --git a/app/celery/tasks.py b/app/celery/tasks.py index 1948c0964..2928a29f3 100644 --- a/app/celery/tasks.py +++ b/app/celery/tasks.py @@ -421,12 +421,11 @@ def update_letter_notifications_statuses(self, filename): for update in notification_updates: check_billable_units(update) update_letter_notification(filename, temporary_failures, update) - sorted_letter_counts[update.cost_threshold] += 1 + sorted_letter_counts[update.cost_threshold.lower()] += 1 try: - if sorted_letter_counts.keys() - {'Unsorted', 'Sorted'}: - unknown_status = sorted_letter_counts.keys() - {'Unsorted', 'Sorted'} - + unknown_status = sorted_letter_counts.keys() - {'unsorted', 'sorted'} + if unknown_status: message = 'DVLA response file: {} contains unknown Sorted status {}'.format( filename, unknown_status ) @@ -455,8 +454,8 @@ def persist_daily_sorted_letter_counts(day, file_name, sorted_letter_counts): daily_letter_count = DailySortedLetter( billing_day=day, file_name=file_name, - unsorted_count=sorted_letter_counts['Unsorted'], - sorted_count=sorted_letter_counts['Sorted'] + unsorted_count=sorted_letter_counts['unsorted'], + sorted_count=sorted_letter_counts['sorted'] ) dao_create_or_update_daily_sorted_letter(daily_letter_count) @@ -485,7 +484,7 @@ def update_letter_notification(filename, temporary_failures, update): msg = "Update letter notification file {filename} failed: notification either not found " \ "or already updated from delivered. Status {status} for notification reference {reference}".format( filename=filename, status=status, reference=update.reference) - current_app.logger.error(msg) + current_app.logger.info(msg) def check_billable_units(notification_update): diff --git a/tests/app/celery/test_ftp_update_tasks.py b/tests/app/celery/test_ftp_update_tasks.py index 436846827..70e1479b7 100644 --- a/tests/app/celery/test_ftp_update_tasks.py +++ b/tests/app/celery/test_ftp_update_tasks.py @@ -94,7 +94,7 @@ def test_update_letter_notifications_statuses_raises_error_for_unknown_sorted_st update_letter_notifications_statuses(filename='NOTIFY-20170823160812-RSP.TXT') assert "DVLA response file: {filename} contains unknown Sorted status {unknown_status}".format( - filename="NOTIFY-20170823160812-RSP.TXT", unknown_status="{'Error'}" + filename="NOTIFY-20170823160812-RSP.TXT", unknown_status="{'error'}" ) in str(e) @@ -185,7 +185,7 @@ def test_update_letter_notifications_statuses_persists_daily_sorted_letter_count ): sent_letter_1 = create_notification(sample_letter_template, reference='ref-foo', status=NOTIFICATION_SENDING) sent_letter_2 = create_notification(sample_letter_template, reference='ref-bar', status=NOTIFICATION_SENDING) - valid_file = '{}|Sent|1|Unsorted\n{}|Sent|2|Sorted'.format( + valid_file = '{}|Sent|1|uNsOrTeD\n{}|Sent|2|SORTED'.format( sent_letter_1.reference, sent_letter_2.reference) mocker.patch('app.celery.tasks.s3.get_s3_file', return_value=valid_file) @@ -195,7 +195,7 @@ def test_update_letter_notifications_statuses_persists_daily_sorted_letter_count persist_letter_count_mock.assert_called_once_with(day=date(2017, 8, 23), file_name='NOTIFY-20170823160812-RSP.TXT', - sorted_letter_counts={'Unsorted': 1, 'Sorted': 1}) + sorted_letter_counts={'unsorted': 1, 'sorted': 1}) def test_update_letter_notifications_statuses_persists_daily_sorted_letter_count_with_no_sorted_values( @@ -317,7 +317,7 @@ def test_get_billing_date_in_bst_from_filename(filename_date, billing_date): @freeze_time("2018-01-11 09:00:00") def test_persist_daily_sorted_letter_counts_saves_sorted_and_unsorted_values(client, notify_db_session): - letter_counts = defaultdict(int, **{'Unsorted': 5, 'Sorted': 1}) + letter_counts = defaultdict(int, **{'unsorted': 5, 'sorted': 1}) persist_daily_sorted_letter_counts(date.today(), "test.txt", letter_counts) day = dao_get_daily_sorted_letter_by_billing_day(date.today())