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

Remove the delivery receipt callback for letters

Browse Source 
This has been removed because the services only see one status.

Pivotal story: https://www.pivotaltracker.com/story/show/153674962
This commit is contained in:
Katie Smith
2017-12-18 17:00:45 +00:00
parent 5301a7198d
commit 83711a9a0d
2 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/celery/tasks.py
View File

@@ -31,7 +31,6 @@ from app import (
from app.aws import s3 from app.aws import s3
from app.celery import provider_tasks from app.celery import provider_tasks
from app.celery import letters_pdf_tasks from app.celery import letters_pdf_tasks
from app.celery.service_callback_tasks import send_delivery_status_to_service
from app.config import QueueNames from app.config import QueueNames
from app.dao.inbound_sms_dao import dao_get_inbound_sms_by_id from app.dao.inbound_sms_dao import dao_get_inbound_sms_by_id
from app.dao.jobs_dao import ( from app.dao.jobs_dao import (
@@ -46,13 +45,11 @@ from app.dao.notifications_dao import (
dao_update_notifications_for_job_to_sent_to_dvla, dao_update_notifications_for_job_to_sent_to_dvla,
dao_update_notifications_by_reference, dao_update_notifications_by_reference,
dao_get_last_notification_added_for_job_id, dao_get_last_notification_added_for_job_id,
dao_get_notifications_by_references,
) )
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
from app.dao.services_dao import dao_fetch_service_by_id, fetch_todays_total_message_count from app.dao.services_dao import dao_fetch_service_by_id, fetch_todays_total_message_count
from app.dao.templates_dao import dao_get_template_by_id from app.dao.templates_dao import dao_get_template_by_id
from app.dao.service_callback_api_dao import get_service_callback_api_for_service
from app.models import ( from app.models import (
DVLA_RESPONSE_STATUS_SENT, DVLA_RESPONSE_STATUS_SENT,
EMAIL_TYPE, EMAIL_TYPE,
@@ -416,12 +413,6 @@ def update_letter_notifications_to_error(self, notification_references):
) )
current_app.logger.info("Updated {} letter notifications to technical-failure".format(updated_count)) current_app.logger.info("Updated {} letter notifications to technical-failure".format(updated_count))
notifications = dao_get_notifications_by_references(references=notification_references)
# queue callback task only if the service_callback_api exists
service_callback_api = get_service_callback_api_for_service(service_id=notifications[0].service_id)
if service_callback_api:
for notification in notifications:
send_delivery_status_to_service.apply_async([str(notification.id)], queue=QueueNames.CALLBACKS)
def create_dvla_file_contents_for_job(job_id): def create_dvla_file_contents_for_job(job_id):
@@ -503,12 +494,6 @@ def update_letter_notifications_statuses(self, filename):
current_app.logger.info( current_app.logger.info(
'DVLA file: {filename}, notification updated to {status}: {reference}'.format( 'DVLA file: {filename}, notification updated to {status}: {reference}'.format(
filename=filename, status=status, reference=str(update.reference))) filename=filename, status=status, reference=str(update.reference)))
notifications = dao_get_notifications_by_references(references=[update.reference])
# queue callback task only if the service_callback_api exists
service_callback_api = get_service_callback_api_for_service(service_id=notifications[0].service_id)
if service_callback_api:
for notification in notifications:
send_delivery_status_to_service.apply_async([str(notification.id)], queue=QueueNames.CALLBACKS)
def process_updates_from_file(response_file): def process_updates_from_file(response_file):

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

@@ -23,7 +23,6 @@ from app.celery.tasks import (
from tests.app.db import create_notification, create_service_callback_api from tests.app.db import create_notification, create_service_callback_api
from tests.conftest import set_config from tests.conftest import set_config
from unittest.mock import call
def test_update_job_to_sent_to_dvla(sample_letter_template, sample_letter_job): def test_update_job_to_sent_to_dvla(sample_letter_template, sample_letter_job):
@@ -103,10 +102,6 @@ def test_update_letter_notifications_statuses_persisted(notify_api, mocker, samp
sent_letter.reference, failed_letter.reference) sent_letter.reference, failed_letter.reference)
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)
send_mock = mocker.patch(
'app.celery.service_callback_tasks.send_delivery_status_to_service.apply_async'
)
update_letter_notifications_statuses(filename='foo.txt') update_letter_notifications_statuses(filename='foo.txt')
assert sent_letter.status == NOTIFICATION_DELIVERED assert sent_letter.status == NOTIFICATION_DELIVERED
@@ -116,10 +111,6 @@ def test_update_letter_notifications_statuses_persisted(notify_api, mocker, samp
assert failed_letter.billable_units == 2 assert failed_letter.billable_units == 2
assert failed_letter.updated_at assert failed_letter.updated_at
calls = [call([str(failed_letter.id)], queue="service-callbacks"),
call([str(sent_letter.id)], queue="service-callbacks")]
send_mock.assert_has_calls(calls, any_order=True)
def test_update_letter_notifications_does_not_call_send_callback_if_no_db_entry(notify_api, mocker, def test_update_letter_notifications_does_not_call_send_callback_if_no_db_entry(notify_api, mocker,
sample_letter_template): sample_letter_template):
@@ -159,9 +150,6 @@ def test_update_letter_notifications_to_error_updates_based_on_notification_refe
sample_letter_template, sample_letter_template,
mocker mocker
): ):
send_mock = mocker.patch(
'app.celery.service_callback_tasks.send_delivery_status_to_service.apply_async'
)
first = create_notification(sample_letter_template, reference='first ref') first = create_notification(sample_letter_template, reference='first ref')
second = create_notification(sample_letter_template, reference='second ref') second = create_notification(sample_letter_template, reference='second ref')
create_service_callback_api(service=sample_letter_template.service, url="https://original_url.com") create_service_callback_api(service=sample_letter_template.service, url="https://original_url.com")
@@ -174,4 +162,3 @@ def test_update_letter_notifications_to_error_updates_based_on_notification_refe
assert first.sent_at is None assert first.sent_at is None
assert first.updated_at == dt assert first.updated_at == dt
assert second.status == NOTIFICATION_CREATED assert second.status == NOTIFICATION_CREATED
assert send_mock.called