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

General refactor

Browse Source
This commit is contained in:
Imdad Ahad
2017-05-22 10:12:18 +01:00
parent 0e0c18583f
commit 02db3be37c
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/celery/tasks.py
View File

@@ -1,5 +1,3 @@
import random
from datetime import (datetime) from datetime import (datetime)
from collections import namedtuple from collections import namedtuple
@@ -361,21 +359,20 @@ def get_template_class(template_type):
@statsd(namespace="tasks") @statsd(namespace="tasks")
def update_letter_notifications_statuses(self, filename): def update_letter_notifications_statuses(self, filename):
bucket_location = '{}-ftp'.format(current_app.config['NOTIFY_EMAIL_DOMAIN']) bucket_location = '{}-ftp'.format(current_app.config['NOTIFY_EMAIL_DOMAIN'])
response_file = s3.get_s3_file(bucket_location, filename) response_file_content = s3.get_s3_file(bucket_location, filename)
try: try:
NotificationUpdate = namedtuple('NotificationUpdate', ['reference', 'status', 'page_count', 'cost_threshold']) notification_updates = process_updates_from_file(response_file_content)
notification_updates = [NotificationUpdate(*line.split('|')) for line in response_file.splitlines()]
except TypeError: except TypeError:
current_app.logger.exception('DVLA response file: {} has an invalid format'.format(filename)) current_app.logger.exception('DVLA response file: {} has an invalid format'.format(filename))
raise raise
else: else:
if notification_updates: for update in notification_updates:
for update in notification_updates: current_app.logger.info('DVLA update: {}'.format(str(update)))
current_app.logger.info('DVLA update: {}'.format(str(update))) # TODO: Update notifications with desired status
# TODO: Update notifications with desired status
return notification_updates
else: def process_updates_from_file(response_file):
current_app.logger.exception('DVLA response file contained no updates') NotificationUpdate = namedtuple('NotificationUpdate', ['reference', 'status', 'page_count', 'cost_threshold'])
notification_updates = [NotificationUpdate(*line.split('|')) for line in response_file.splitlines()]
return notification_updates

16
tests/app/celery/test_tasks.py
View File

@@ -24,7 +24,8 @@ from app.celery.tasks import (
persist_letter, persist_letter,
get_template_class, get_template_class,
update_job_to_sent_to_dvla, update_job_to_sent_to_dvla,
update_letter_notifications_statuses update_letter_notifications_statuses,
process_updates_from_file
) )
from app.dao import jobs_dao, services_dao from app.dao import jobs_dao, services_dao
from app.models import ( from app.models import (
@@ -1094,10 +1095,19 @@ def test_update_letter_notifications_statuses_calls_with_correct_bucket_location
s3_mock.assert_called_with('{}-ftp'.format(current_app.config['NOTIFY_EMAIL_DOMAIN']), 'foo.txt') s3_mock.assert_called_with('{}-ftp'.format(current_app.config['NOTIFY_EMAIL_DOMAIN']), 'foo.txt')
def test_update_letter_notifications_statuses_builds_updates_list(notify_api, mocker): def test_update_letter_notifications_statuses_builds_updates_from_content(notify_api, mocker):
valid_file = 'ref-foo|Sent|1|Unsorted\nref-bar|Sent|2|Sorted' valid_file = 'ref-foo|Sent|1|Unsorted\nref-bar|Sent|2|Sorted'
mocker.patch('app.celery.tasks.s3.get_s3_file', return_value=valid_file) mocker.patch('app.celery.tasks.s3.get_s3_file', return_value=valid_file)
updates = update_letter_notifications_statuses(filename='foo.txt') update_mock = mocker.patch('app.celery.tasks.process_updates_from_file')
update_letter_notifications_statuses(filename='foo.txt')
update_mock.assert_called_with('ref-foo|Sent|1|Unsorted\nref-bar|Sent|2|Sorted')
def test_update_letter_notifications_statuses_builds_updates_list(notify_api, mocker):
valid_file = 'ref-foo|Sent|1|Unsorted\nref-bar|Sent|2|Sorted'
updates = process_updates_from_file(valid_file)
assert len(updates) == 2 assert len(updates) == 2