From 91ece7576db1dd68115984109751e8cd4d73ae99 Mon Sep 17 00:00:00 2001 From: stvnrlly Date: Fri, 17 Feb 2023 11:42:30 -0500 Subject: [PATCH] remove SEND_LETTERS --- app/commands.py | 4 ++-- app/dao/permissions_dao.py | 2 -- app/models.py | 2 -- tests/app/dao/test_permissions_dao.py | 5 ++--- tests/app/dao/test_services_dao.py | 12 ++++++------ tests/app/dao/test_users_dao.py | 4 ++-- tests/app/service/test_rest.py | 6 ++---- 7 files changed, 14 insertions(+), 21 deletions(-) diff --git a/app/commands.py b/app/commands.py index 1e22f098a..9cda66567 100644 --- a/app/commands.py +++ b/app/commands.py @@ -211,11 +211,11 @@ def rebuild_ft_billing_for_day(service_id, day): def bulk_invite_user_to_service(file_name, service_id, user_id, auth_type, permissions): # permissions # manage_users | manage_templates | manage_settings - # send messages ==> send_texts | send_emails | send_letters + # send messages ==> send_texts | send_emails # Access API keys manage_api_keys # platform_admin # view_activity - # "send_texts,send_emails,send_letters,view_activity" + # "send_texts,send_emails,view_activity" from app.service_invite.rest import create_invited_user file = open(file_name) for email_address in file: diff --git a/app/dao/permissions_dao.py b/app/dao/permissions_dao.py index 16daaa3c4..733358fd0 100644 --- a/app/dao/permissions_dao.py +++ b/app/dao/permissions_dao.py @@ -6,7 +6,6 @@ from app.models import ( MANAGE_TEMPLATES, MANAGE_USERS, SEND_EMAILS, - SEND_LETTERS, SEND_TEXTS, VIEW_ACTIVITY, Permission, @@ -19,7 +18,6 @@ default_service_permissions = [ MANAGE_SETTINGS, SEND_TEXTS, SEND_EMAILS, - SEND_LETTERS, MANAGE_API_KEYS, VIEW_ACTIVITY] diff --git a/app/models.py b/app/models.py index 724eb8cd1..a112e63b8 100644 --- a/app/models.py +++ b/app/models.py @@ -1785,7 +1785,6 @@ MANAGE_TEMPLATES = 'manage_templates' MANAGE_SETTINGS = 'manage_settings' SEND_TEXTS = 'send_texts' SEND_EMAILS = 'send_emails' -SEND_LETTERS = 'send_letters' MANAGE_API_KEYS = 'manage_api_keys' PLATFORM_ADMIN = 'platform_admin' VIEW_ACTIVITY = 'view_activity' @@ -1797,7 +1796,6 @@ PERMISSION_LIST = [ MANAGE_SETTINGS, SEND_TEXTS, SEND_EMAILS, - SEND_LETTERS, MANAGE_API_KEYS, PLATFORM_ADMIN, VIEW_ACTIVITY, diff --git a/tests/app/dao/test_permissions_dao.py b/tests/app/dao/test_permissions_dao.py index eec84c8ff..a799eb512 100644 --- a/tests/app/dao/test_permissions_dao.py +++ b/tests/app/dao/test_permissions_dao.py @@ -4,13 +4,12 @@ from tests.app.db import create_service def test_get_permissions_by_user_id_returns_all_permissions(sample_service): permissions = permission_dao.get_permissions_by_user_id(user_id=sample_service.users[0].id) - assert len(permissions) == 8 + assert len(permissions) == 7 assert sorted(["manage_users", "manage_templates", "manage_settings", "send_texts", "send_emails", - "send_letters", "manage_api_keys", "view_activity"]) == sorted([i.permission for i in permissions]) @@ -20,6 +19,6 @@ def test_get_permissions_by_user_id_returns_only_active_service(sample_user): inactive_service = create_service(user=sample_user, service_name="Inactive service", active=False) permissions = permission_dao.get_permissions_by_user_id(user_id=sample_user.id) - assert len(permissions) == 8 + assert len(permissions) == 7 assert active_service in [i.service for i in permissions] assert inactive_service not in [i.service for i in permissions] diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py index 87e11840a..7c4081840 100644 --- a/tests/app/dao/test_services_dao.py +++ b/tests/app/dao/test_services_dao.py @@ -284,7 +284,7 @@ def test_should_remove_user_from_service(notify_db_session): def test_removing_a_user_from_a_service_deletes_their_permissions(sample_user, sample_service): - assert len(Permission.query.all()) == 8 + assert len(Permission.query.all()) == 7 dao_remove_user_from_service(sample_service, sample_user) @@ -688,7 +688,7 @@ def test_add_existing_user_to_another_service_doesnot_change_old_permissions(not dao_create_service(service_one, user) assert user.id == service_one.users[0].id test_user_permissions = Permission.query.filter_by(service=service_one, user=user).all() - assert len(test_user_permissions) == 8 + assert len(test_user_permissions) == 7 other_user = User( name='Other Test User', @@ -706,23 +706,23 @@ def test_add_existing_user_to_another_service_doesnot_change_old_permissions(not assert other_user.id == service_two.users[0].id other_user_permissions = Permission.query.filter_by(service=service_two, user=other_user).all() - assert len(other_user_permissions) == 8 + assert len(other_user_permissions) == 7 other_user_service_one_permissions = Permission.query.filter_by(service=service_one, user=other_user).all() assert len(other_user_service_one_permissions) == 0 # adding the other_user to service_one should leave all other_user permissions on service_two intact permissions = [] - for p in ['send_emails', 'send_texts', 'send_letters']: + for p in ['send_emails', 'send_texts']: permissions.append(Permission(permission=p)) dao_add_user_to_service(service_one, other_user, permissions=permissions) other_user_service_one_permissions = Permission.query.filter_by(service=service_one, user=other_user).all() - assert len(other_user_service_one_permissions) == 3 + assert len(other_user_service_one_permissions) == 2 other_user_service_two_permissions = Permission.query.filter_by(service=service_two, user=other_user).all() - assert len(other_user_service_two_permissions) == 8 + assert len(other_user_service_two_permissions) == 7 def test_fetch_stats_filters_on_service(notify_db_session): diff --git a/tests/app/dao/test_users_dao.py b/tests/app/dao/test_users_dao.py index 2e953a4e7..4d5cc4081 100644 --- a/tests/app/dao/test_users_dao.py +++ b/tests/app/dao/test_users_dao.py @@ -261,7 +261,7 @@ def test_user_can_be_archived_if_the_other_service_members_have_the_manage_setti create_permissions(user_1, sample_service, 'manage_settings') create_permissions(user_2, sample_service, 'manage_settings', 'view_activity') - create_permissions(user_3, sample_service, 'manage_settings', 'send_emails', 'send_letters', 'send_texts') + create_permissions(user_3, sample_service, 'manage_settings', 'send_emails', 'send_texts') assert len(sample_service.users) == 3 assert user_can_be_archived(user_1) @@ -296,7 +296,7 @@ def test_user_cannot_be_archived_if_the_other_service_members_do_not_have_the_ma create_permissions(active_user, sample_service, 'manage_settings') create_permissions(pending_user, sample_service, 'view_activity') - create_permissions(inactive_user, sample_service, 'send_emails', 'send_letters', 'send_texts') + create_permissions(inactive_user, sample_service, 'send_emails', 'send_texts') assert len(sample_service.users) == 3 assert not user_can_be_archived(active_user) diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index 9277a9c04..222f5752e 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -1215,7 +1215,6 @@ def test_add_existing_user_to_another_service_with_all_permissions( data = { "permissions": [ {"permission": "send_emails"}, - {"permission": "send_letters"}, {"permission": "send_texts"}, {"permission": "manage_users"}, {"permission": "manage_settings"}, @@ -1254,7 +1253,7 @@ def test_add_existing_user_to_another_service_with_all_permissions( assert resp.status_code == 200 json_resp = resp.json permissions = json_resp['data']['permissions'][str(sample_service.id)] - expected_permissions = ['send_texts', 'send_emails', 'send_letters', 'manage_users', + expected_permissions = ['send_texts', 'send_emails', 'manage_users', 'manage_settings', 'manage_templates', 'manage_api_keys', 'view_activity'] assert sorted(expected_permissions) == sorted(permissions) @@ -1277,7 +1276,6 @@ def test_add_existing_user_to_another_service_with_send_permissions(notify_api, data = { "permissions": [ {"permission": "send_emails"}, - {"permission": "send_letters"}, {"permission": "send_texts"}, ], "folder_permissions": [] @@ -1302,7 +1300,7 @@ def test_add_existing_user_to_another_service_with_send_permissions(notify_api, json_resp = resp.json permissions = json_resp['data']['permissions'][str(sample_service.id)] - expected_permissions = ['send_texts', 'send_emails', 'send_letters'] + expected_permissions = ['send_texts', 'send_emails'] assert sorted(expected_permissions) == sorted(permissions)