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

Because research mode and test keys do not create notification history, a try except block has been added.

Browse Source
This commit is contained in:
Rebecca Law
2018-03-01 16:38:42 +00:00
parent c474b2312b
commit 8aea452df9
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/celery/tasks.py
View File

@@ -19,6 +19,7 @@ from requests import (
RequestException RequestException
) )
from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.exc import SQLAlchemyError
from sqlalchemy.orm.exc import NoResultFound
from app import ( from app import (
create_uuid, create_uuid,
@@ -42,6 +43,7 @@ from app.dao.notifications_dao import (
dao_get_last_notification_added_for_job_id, dao_get_last_notification_added_for_job_id,
update_notification_status_by_reference, update_notification_status_by_reference,
dao_get_notification_history_by_reference, dao_get_notification_history_by_reference,
dao_get_notification_by_reference,
) )
from app.dao.provider_details_dao import get_current_provider from app.dao.provider_details_dao import get_current_provider
from app.dao.service_inbound_api_dao import get_service_inbound_api_for_service from app.dao.service_inbound_api_dao import get_service_inbound_api_for_service
@@ -449,7 +451,12 @@ def update_letter_notification(filename, temporary_failures, update):
def check_billable_units(notification_update): def check_billable_units(notification_update):
notification = dao_get_notification_history_by_reference(notification_update.reference) try:
# This try except is necessary because in test keys and research mode does not create notification history.
# Otherwise we could just search for the NotificationHistory object
notification = dao_get_notification_by_reference(notification_update.reference)
except NoResultFound:
notification = dao_get_notification_history_by_reference(notification_update.reference)
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(