Move split_user_and_role_names to authz

src/layman/authz/__init__.py

@@ -149,3 +149,9 @@ def complete_access_rights(access_rights_to_complete, full_access_rights):
         if right_type not in access_rights_to_complete:
             access_rights_to_complete[right_type] = full_access_rights[right_type]
     return access_rights_to_complete
+
+
+def split_user_and_role_names(user_and_role_names):
+    user_names = [name for name in user_and_role_names if any(letter.islower() for letter in name)]
+    role_names = [name for name in user_and_role_names if name not in user_names]
+    return user_names, role_names

src/layman/authz/authz_test.py

@@ -5,7 +5,7 @@
 from layman import app, settings, LaymanError
 from test_tools import process_client
 from test_tools.util import url_for
-from . import authorize_workspace_publications_decorator
+from . import authorize_workspace_publications_decorator, split_user_and_role_names
 
 
 @authorize_workspace_publications_decorator
@@ -165,3 +165,16 @@ def test_authorize_publications_decorator_on_rest_api(
         self.assert_response(response, authz_status_code, authz_response)
         response = requests.get(rest_url, timeout=settings.DEFAULT_CONNECTION_TIMEOUT)
         self.assert_response(response, authz_status_code, authz_response)
+
+
+@pytest.mark.parametrize('roles_and_users, exp_users, exp_roles', [
+    pytest.param([], [], [], id='no-names'),
+    pytest.param(['user1', 'user2'], ['user1', 'user2'], [], id='only-users'),
+    pytest.param(['ROLE1', 'EVERYONE'], [], ['ROLE1', 'EVERYONE'], id='only-roles'),
+    pytest.param(['ROLE2', 'user1', 'EVERYONE', 'user2'], ['user1', 'user2'], ['ROLE2', 'EVERYONE'],
+                 id='more-users-and-roles'),
+])
+def test_split_user_and_role_names(roles_and_users, exp_users, exp_roles):
+    user_names, role_names = split_user_and_role_names(roles_and_users)
+    assert user_names == exp_users
+    assert role_names == exp_roles

src/layman/common/prime_db_schema/publications.py

@@ -6,6 +6,7 @@
 from db import util as db_util, TableUri
 from layman import settings, LaymanError
 from layman.authn import is_user_with_name
+from layman.authz import split_user_and_role_names
 from layman.common import get_publications_consts as consts, bbox as bbox_util
 from . import workspaces, users, rights
 
@@ -374,12 +375,6 @@ def owner_can_still_write(owner,
         raise LaymanError(43, f'Owner of the personal workspace have to keep write right.')
 
 
-def split_user_and_role_names(user_and_role_names):
-    user_names = [name for name in user_and_role_names if any(letter.islower() for letter in name)]
-    role_names = [name for name in user_and_role_names if name not in user_names]
-    return user_names, role_names
-
-
 def check_rights_axioms(can_read,
                         can_write,
                         actor_name,

src/layman/common/prime_db_schema/publications_test.py

@@ -501,16 +501,3 @@ def test_validation(self, username, pre_publication_update_info, publication_upd
                                             publication_update_info,
                                             )
         assert exc_info.value.code == 43
-
-
-@pytest.mark.parametrize('roles_and_users, exp_users, exp_roles', [
-    pytest.param([], [], [], id='no-names'),
-    pytest.param(['user1', 'user2'], ['user1', 'user2'], [], id='only-users'),
-    pytest.param(['ROLE1', 'EVERYONE'], [], ['ROLE1', 'EVERYONE'], id='only-roles'),
-    pytest.param(['ROLE2', 'user1', 'EVERYONE', 'user2'], ['user1', 'user2'], ['ROLE2', 'EVERYONE'],
-                 id='more-users-and-roles'),
-])
-def test_split_user_and_role_names(roles_and_users, exp_users, exp_roles):
-    user_names, role_names = publications.split_user_and_role_names(roles_and_users)
-    assert user_names == exp_users
-    assert role_names == exp_roles