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

Merge pull request #1759 from alphagov/fix-bug-timeout-notifications

Browse Source 
Fix the bug in timeout notifications.
This commit is contained in:
Rebecca Law
2018-03-13 09:34:33 +00:00
committed by GitHub
parent 32185fa587 144356f096
commit 68d658086b
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/celery/scheduled_tasks.py
View File

@@ -198,16 +198,15 @@ def delete_invitations():
def timeout_notifications():
notifications = dao_timeout_notifications(current_app.config.get('SENDING_NOTIFICATIONS_TIMEOUT_PERIOD'))
if notifications:
for notification in notifications:
# queue callback task only if the service_callback_api exists
service_callback_api = get_service_callback_api_for_service(service_id=notification.service_id)
for notification in notifications:
# queue callback task only if the service_callback_api exists
service_callback_api = get_service_callback_api_for_service(service_id=notification.service_id)
if service_callback_api:
send_delivery_status_to_service.apply_async([str(id)], queue=QueueNames.CALLBACKS)
if service_callback_api:
send_delivery_status_to_service.apply_async([str(notification.id)], queue=QueueNames.CALLBACKS)
current_app.logger.info(
"Timeout period reached for {} notifications, status has been updated.".format(len(notifications)))
current_app.logger.info(
"Timeout period reached for {} notifications, status has been updated.".format(len(notifications)))
@notify_celery.task(name='send-daily-performance-platform-stats')

17
tests/app/celery/test_scheduled_tasks.py
View File

@@ -58,7 +58,10 @@ from app.models import (
)
from app.utils import get_london_midnight_in_utc
from app.v2.errors import JobIncompleteError
from tests.app.db import create_notification, create_service, create_template, create_job, create_rate
from tests.app.db import (
create_notification, create_service, create_template, create_job, create_rate,
create_service_callback_api
)
from tests.app.conftest import (
sample_job as create_sample_job,
@@ -206,6 +209,18 @@ def test_should_not_update_status_of_letter_notifications(client, sample_letter_
assert not2.status == 'created'
def test_timeout_notifications_sends_status_update_to_service(client, sample_template, mocker):
create_service_callback_api(service=sample_template.service)
mocked = mocker.patch('app.celery.service_callback_tasks.send_delivery_status_to_service.apply_async')
notification = create_notification(
template=sample_template,
status='sending',
created_at=datetime.utcnow() - timedelta(
seconds=current_app.config.get('SENDING_NOTIFICATIONS_TIMEOUT_PERIOD') + 10))
timeout_notifications()
mocked.assert_called_once_with([str(notification.id)], queue=QueueNames.CALLBACKS)
def test_should_update_scheduled_jobs_and_put_on_queue(notify_db, notify_db_session, mocker):
mocked = mocker.patch('app.celery.tasks.process_job.apply_async')