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

Removed the need for 2 return statements.

Browse Source 
Update tests to fix copy/paste errors, use freezetime to ensure there is never a random failing test.
This commit is contained in:
Rebecca Law
2017-01-31 11:33:36 +00:00
parent 87556687ab
commit 907a1e91ac
3 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/service/rest.py
View File

@@ -205,7 +205,7 @@ def get_service_provider_aggregate_statistics(service_id):
# tables. This is so product owner can pass stories as done
@service_blueprint.route('/<uuid:service_id>/history', methods=['GET'])
def get_service_history(service_id):
from app.models import (Service, ApiKey, Template, TemplateHistory, Event)
from app.models import (Service, ApiKey, TemplateHistory, Event)
from app.schemas import (
service_history_schema,
api_key_history_schema,
@@ -330,7 +330,7 @@ def update_whitelist(service_id):
current_app.logger.exception(e)
dao_rollback()
msg = '{} is not a valid email address or phone number'.format(str(e))
return jsonify(result='error', message=msg), 400
raise InvalidRequest(msg, 400)
else:
dao_add_and_commit_whitelisted_contacts(whitelist_objs)
return '', 204
@@ -360,11 +360,8 @@ def archive_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)
if service.active:
dao_archive_service(service.id)
return '', 204
@@ -378,11 +375,8 @@ def suspend_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_suspend_service(service.id)
if service.active:
dao_suspend_service(service.id)
return '', 204
@@ -397,11 +391,8 @@ def resume_service(service_id):
"""
service = dao_fetch_service_by_id(service_id)
if service.active:
# assume already inactive, don't change service name
return '', 204
dao_resume_service(service.id)
if not service.active:
dao_resume_service(service.id)
return '', 204