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

Filter 'get_service_callback_api_for_service' to only get status updates

Browse Source 
Also rename it to 'get_service_delivery_status_callback_api_for_service'
This commit is contained in:
Pea Tyczynska
2018-07-18 10:14:32 +01:00
parent e81c395ab1
commit 86978c225a
7 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/notifications/notifications_ses_callback.py
View File

@@ -12,7 +12,7 @@ from app.dao import (
)
from app.dao.complaint_dao import save_complaint
from app.dao.notifications_dao import dao_get_notification_history_by_reference
from app.dao.service_callback_api_dao import get_service_callback_api_for_service
from app.dao.service_callback_api_dao import get_service_delivery_status_callback_api_for_service
from app.models import Complaint
from app.notifications.process_client_response import validate_callback_data
from app.celery.service_callback_tasks import (
@@ -146,7 +146,7 @@ def remove_emails_from_complaint(complaint_dict):
def _check_and_queue_callback_task(notification):
# queue callback task only if the service_callback_api exists
service_callback_api = get_service_callback_api_for_service(service_id=notification.service_id)
service_callback_api = get_service_delivery_status_callback_api_for_service(service_id=notification.service_id)
if service_callback_api:
encrypted_notification = create_encrypted_callback_data(notification, service_callback_api)
send_delivery_status_to_service.apply_async([str(notification.id), encrypted_notification],

4
app/notifications/process_client_response.py
View File

@@ -14,7 +14,7 @@ from app.celery.service_callback_tasks import (
)
from app.config import QueueNames
from app.dao.notifications_dao import dao_update_notification
from app.dao.service_callback_api_dao import get_service_callback_api_for_service
from app.dao.service_callback_api_dao import get_service_delivery_status_callback_api_for_service
sms_response_mapper = {
'MMG': get_mmg_responses,
@@ -95,7 +95,7 @@ def _process_for_status(notification_status, client_name, provider_reference):
)
# queue callback task only if the service_callback_api exists
service_callback_api = get_service_callback_api_for_service(service_id=notification.service_id)
service_callback_api = get_service_delivery_status_callback_api_for_service(service_id=notification.service_id)
if service_callback_api:
encrypted_notification = create_encrypted_callback_data(notification, service_callback_api)