Move and rename roles_and_permissions.py

This file does not represent a model, but rather a set of utilities
that are specific to user permissions (vs. service permissions).

app/main/forms.py

@@ -56,13 +56,9 @@ from app.main.validators import (
 )
 from app.models.feedback import PROBLEM_TICKET_TYPE, QUESTION_TICKET_TYPE
 from app.models.organisation import Organisation
-from app.models.roles_and_permissions import (
-    broadcast_permissions,
-    permissions,
-    roles,
-)
 from app.utils import merge_jsonlike
 from app.utils.user import distinct_email_addresses
+from app.utils.user_permissions import broadcast_permissions, permissions, roles
 
 
 def get_time_value_and_label(future_time):

app/main/views/manage_users.py

@@ -28,9 +28,9 @@ from app.main.forms import (
     PermissionsForm,
     SearchUsersForm,
 )
-from app.models.roles_and_permissions import broadcast_permissions, permissions
 from app.models.user import InvitedUser, User
 from app.utils.user import is_gov_user, user_has_permissions
+from app.utils.user_permissions import broadcast_permissions, permissions
 
 
 @main.route("/services/<uuid:service_id>/users")

app/models/user.py

@@ -10,16 +10,16 @@ from app.event_handlers import (
 )
 from app.models import JSONModel, ModelList
 from app.models.organisation import Organisation
-from app.models.roles_and_permissions import (
-    all_permissions,
-    translate_permissions_from_db_to_admin_roles,
-)
 from app.models.webauthn_credential import WebAuthnCredentials
 from app.notify_client import InviteTokenError
 from app.notify_client.invite_api_client import invite_api_client
 from app.notify_client.org_invite_api_client import org_invite_api_client
 from app.notify_client.user_api_client import user_api_client
 from app.utils.user import is_gov_user
+from app.utils.user_permissions import (
+    all_permissions,
+    translate_permissions_from_db_to_admin_roles,
+)
 
 
 def _get_service_id_from_view_args():

app/notify_client/invite_api_client.py

@@ -1,8 +1,8 @@
-from app.models.roles_and_permissions import (
+from app.notify_client import NotifyAdminAPIClient, _attach_current_user, cache
+from app.utils.user_permissions import (
     roles,
     translate_permissions_from_admin_roles_to_db,
 )
-from app.notify_client import NotifyAdminAPIClient, _attach_current_user, cache
 
 
 class InviteApiClient(NotifyAdminAPIClient):

app/notify_client/user_api_client.py

@@ -1,9 +1,9 @@
 from notifications_python_client.errors import HTTPError
 
-from app.models.roles_and_permissions import (
+from app.notify_client import NotifyAdminAPIClient, cache
+from app.utils.user_permissions import (
     translate_permissions_from_admin_roles_to_db,
 )
-from app.notify_client import NotifyAdminAPIClient, cache
 
 ALLOWED_ATTRIBUTES = {
     'name',

tests/app/main/test_permissions.py

@@ -5,7 +5,7 @@ import re
 import pytest
 from flask import current_app
 
-from app.models.roles_and_permissions import (
+from app.utils.user_permissions import (
     translate_permissions_from_admin_roles_to_db,
     translate_permissions_from_db_to_admin_roles,
 )