diff --git a/app/dao/services_dao.py b/app/dao/services_dao.py index 412723830..572e36e63 100644 --- a/app/dao/services_dao.py +++ b/app/dao/services_dao.py @@ -148,17 +148,6 @@ def dao_create_service(service, user, service_id=None, service_permissions=[SMS_ if permission == LETTER_TYPE: 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() db.session.add(service) diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index 11d50f899..aaacb4ed9 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -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): 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 set([p.permission for p in service.permissions]) == set([SMS_TYPE, EMAIL_TYPE, INTERNATIONAL_SMS_TYPE]) data = { 'can_send_international_sms': False