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

As per review commemnts:

Browse Source 
- Add the assert to a test - oops.
- Fix typo in error message.
This commit is contained in:
Rebecca Law
2017-10-19 13:51:33 +01:00
parent 709e24e267
commit cee916c68a
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dao/service_sms_sender_dao.py
View File

@@ -108,4 +108,4 @@ def _reset_old_default_to_false(old_default):
def _raise_when_no_default(old_default): def _raise_when_no_default(old_default):
# check that the update is not updating the only default to false # check that the update is not updating the only default to false
if not old_default: if not old_default:
raise Exception("You must have at least one letter contact as the default.", 400) raise Exception("You must have at least one SMS sender as the default.", 400)

15
app/service/rest.py
View File

@@ -23,8 +23,13 @@ from app.dao.service_inbound_api_dao import (
reset_service_inbound_api, reset_service_inbound_api,
get_service_inbound_api get_service_inbound_api
) )
from app.dao.service_sms_sender_dao import insert_or_update_service_sms_sender, dao_add_sms_sender_for_service, \ from app.dao.service_sms_sender_dao import (
dao_update_service_sms_sender, dao_get_service_sms_senders_by_id, dao_get_sms_senders_by_service_id insert_or_update_service_sms_sender,
dao_add_sms_sender_for_service,
dao_update_service_sms_sender,
dao_get_service_sms_senders_by_id,
dao_get_sms_senders_by_service_id
)
from app.dao.services_dao import ( from app.dao.services_dao import (
dao_fetch_service_by_id, dao_fetch_service_by_id,
dao_fetch_all_services, dao_fetch_all_services,
@@ -71,7 +76,10 @@ from app.errors import (
from app.models import Service, ServiceInboundApi from app.models import Service, ServiceInboundApi
from app.schema_validation import validate from app.schema_validation import validate
from app.service import statistics from app.service import statistics
from app.service.service_inbound_api_schema import service_inbound_api, update_service_inbound_api_schema from app.service.service_inbound_api_schema import (
service_inbound_api,
update_service_inbound_api_schema
)
from app.service.service_senders_schema import ( from app.service.service_senders_schema import (
add_service_email_reply_to_request, add_service_email_reply_to_request,
add_service_letter_contact_block_request, add_service_letter_contact_block_request,
@@ -638,7 +646,6 @@ def add_service_sms_sender(service_id):
@service_blueprint.route('/<uuid:service_id>/sms-sender/<uuid:sms_sender_id>', methods=['POST']) @service_blueprint.route('/<uuid:service_id>/sms-sender/<uuid:sms_sender_id>', methods=['POST'])
def update_service_sms_sender(service_id, sms_sender_id): def update_service_sms_sender(service_id, sms_sender_id):
dao_fetch_service_by_id(service_id)
form = validate(request.get_json(), add_service_sms_sender_request) form = validate(request.get_json(), add_service_sms_sender_request)
sms_sender_to_update = dao_get_service_sms_senders_by_id(service_id=service_id, sms_sender_to_update = dao_get_service_sms_senders_by_id(service_id=service_id,

4
tests/app/dao/test_service_sms_sender_dao.py
View File

@@ -66,9 +66,9 @@ def test_dao_get_sms_senders_by_service_id(notify_db_session):
assert len(results) == 2 assert len(results) == 2
for x in results: for x in results:
if x.is_default: if x.is_default:
x.sms_sender = 'first_sms' assert x.sms_sender == 'first_sms'
else: else:
x == second_sender assert x == second_sender
def test_dao_add_sms_sender_for_service(notify_db_session): def test_dao_add_sms_sender_for_service(notify_db_session):