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

If the service is inactive at the time of sending the notification to the provider, the notification is marked as technical-failure.

Browse Source 
Removed the /service/<id>/deactivate endpoint, now using /service/<id>/archive
This commit is contained in:
Rebecca Law
2017-01-31 14:28:25 +00:00
parent fde3216f9e
commit dab89969cc
4 changed files with 11 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/delivery/send_to_providers.py
View File

@@ -15,12 +15,14 @@ from app.dao.provider_details_dao import (
)
from app.celery.research_mode_tasks import send_sms_response, send_email_response
from app.dao.templates_dao import dao_get_template_by_id
from app.models import SMS_TYPE, KEY_TYPE_TEST, BRANDING_ORG, EMAIL_TYPE
from app.models import SMS_TYPE, KEY_TYPE_TEST, BRANDING_ORG, EMAIL_TYPE, NOTIFICATION_TECHNICAL_FAILURE
def send_sms_to_provider(notification):
service = notification.service
if not notification.service.active:
if not service.active:
notification.status = NOTIFICATION_TECHNICAL_FAILURE
dao_update_notification(notification)
current_app.logger.warn(
"Send sms for notification id {} to provider is not allowed: service {} is inactive".format(notification.id,
service.id))
@@ -67,7 +69,9 @@ def send_sms_to_provider(notification):
def send_email_to_provider(notification):
service = notification.service
if not notification.service.active:
if not service.active:
notification.status = NOTIFICATION_TECHNICAL_FAILURE
dao_update_notification(notification)
current_app.logger.warn(
"Send email for notification id {} to provider is not allowed: service {} is inactive".format(
notification.id,

14
app/service/rest.py
View File

@@ -336,20 +336,6 @@ def update_whitelist(service_id):
return '', 204
# Renaming this endpoint to archive
@service_blueprint.route('/<uuid:service_id>/deactivate', methods=['POST'])
def deactivate_service(service_id):
service = dao_fetch_service_by_id(service_id)
if not service.active:
# assume already inactive, don't change service name
return '', 204
dao_archive_service(service.id)
return '', 204
@service_blueprint.route('/<uuid:service_id>/archive', methods=['POST'])
def archive_service(service_id):
"""