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

Remove flags process in service_dao.create_service

Browse Source
This commit is contained in:
Ken Tsang
2017-05-26 12:04:16 +01:00
parent 1375bbe400
commit 7aca3d8f43
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/dao/services_dao.py
View File

@@ -148,17 +148,6 @@ def dao_create_service(service, user, service_id=None, service_permissions=[SMS_
if permission == LETTER_TYPE: if permission == LETTER_TYPE:
service.can_send_letters = True service.can_send_letters = True
def convert_flags(flag, notify_type):
if flag and notify_type not in service_permissions:
service_permission = ServicePermission(service_id=service.id, permission=notify_type)
service.permissions.append(service_permission)
elif flag is False and notify_type in service_permissions:
service_permission = ServicePermission(service_id=service.id, permission=notify_type)
service.permissions.remove(service_permission)
convert_flags(service.can_send_international_sms, INTERNATIONAL_SMS_TYPE)
convert_flags(service.can_send_letters, LETTER_TYPE)
deprecate_process_service_permissions() deprecate_process_service_permissions()
db.session.add(service) db.session.add(service)

4
tests/app/service/test_rest.py
View File

@@ -501,10 +501,10 @@ def test_update_service_flags_with_service_without_default_service_permissions(c
def test_update_service_flags_will_remove_service_permissions(client, notify_db, notify_db_session): def test_update_service_flags_will_remove_service_permissions(client, notify_db, notify_db_session):
auth_header = create_authorization_header() auth_header = create_authorization_header()
service = create_service(notify_db, notify_db_session, can_send_international_sms=True) service = create_service(
notify_db, notify_db_session, permissions=[SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE])
assert service.can_send_international_sms is True assert service.can_send_international_sms is True
assert set([p.permission for p in service.permissions]) == set([SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE])
data = { data = {
'can_send_international_sms': False 'can_send_international_sms': False