Removed an marshable import from the persistence layer

Author: c8y3

pyproject.toml

@@ -49,21 +49,21 @@ allow_indirect_imports = true
 [[tool.importlinter.contracts]]
 name = "Do not import marshables from the persistence layer"
 type = "forbidden"
-source_modules = "app.datamgmt.manage.manage_case_state_db"
+source_modules = ["app.datamgmt.manage.manage_case_state_db", "app.datamgmt.manage.manage_groups_db"]
 forbidden_modules = "app.schema.marshables"
 allow_indirect_imports = true
 
 [[tool.importlinter.contracts]]
-name = "Do not import the engine from the persistence layer"
+name = "Do not import marshmallow from the persistence layer"
 type = "forbidden"
-source_modules = "app.datamgmt.case"
-forbidden_modules = "app.iris_engine"
+source_modules = "app.datamgmt.client"
+forbidden_modules = "marshmallow"
 allow_indirect_imports = true
 
 [[tool.importlinter.contracts]]
-name = "Do not import marshmallow from the persistence layer"
+name = "Do not import the engine from the persistence layer"
 type = "forbidden"
-source_modules = "app.datamgmt.client"
-forbidden_modules = "marshmallow"
+source_modules = "app.datamgmt.case"
+forbidden_modules = "app.iris_engine"
 allow_indirect_imports = true
 

source/app/blueprints/rest/manage/manage_groups.py

@@ -26,17 +26,18 @@
 from app import app
 from app.blueprints.iris_user import iris_current_user
 from app.datamgmt.manage.manage_groups_db import add_all_cases_access_to_group
+from app.datamgmt.manage.manage_groups_db import get_groups_list
+from app.datamgmt.manage.manage_groups_db import get_users_by_group_identifiers
 from app.datamgmt.manage.manage_groups_db import add_case_access_to_group
 from app.datamgmt.manage.manage_groups_db import delete_group
 from app.datamgmt.manage.manage_groups_db import get_group
 from app.datamgmt.manage.manage_groups_db import get_group_details
 from app.datamgmt.manage.manage_groups_db import get_group_with_members
-from app.datamgmt.manage.manage_groups_db import get_groups_list_hr_perms
 from app.datamgmt.manage.manage_groups_db import remove_cases_access_from_group
 from app.datamgmt.manage.manage_groups_db import remove_user_from_group
 from app.datamgmt.manage.manage_groups_db import update_group_members
 from app.datamgmt.manage.manage_users_db import get_user
-from app.iris_engine.access_control.utils import ac_ldp_group_removal
+from app.iris_engine.access_control.utils import ac_ldp_group_removal, ac_permission_to_list
 from app.iris_engine.access_control.utils import ac_ldp_group_update
 from app.iris_engine.access_control.utils import ac_recompute_effective_ac_from_users_list
 from app.models.authorization import Permissions, ac_flag_match_mask
@@ -59,7 +60,12 @@
 @manage_groups_rest_blueprint.route('/manage/groups/list', methods=['GET'])
 @ac_api_requires(Permissions.server_administrator)
 def manage_groups_index():
-    groups = get_groups_list_hr_perms()
+    groups = get_groups_list()
+    groups = AuthorizationGroupSchema().dump(groups, many=True)
+    group_to_users = get_users_by_group_identifiers()
+    for group in groups:
+        group['group_permissions_list'] = ac_permission_to_list(group['group_permissions'])
+        group['group_members'] = group_to_users.get(group['group_id'], [])
 
     return response_success('', data=groups)
 

source/app/datamgmt/manage/manage_groups_db.py

@@ -25,11 +25,11 @@
 from app.iris_engine.access_control.utils import ac_auto_update_user_effective_access
 from app.iris_engine.access_control.utils import ac_permission_to_list
 from app.models.cases import Cases
-from app.models.authorization import Group, ac_access_level_mask_from_val_list
+from app.models.authorization import Group
+from app.models.authorization import ac_access_level_mask_from_val_list
 from app.models.authorization import GroupCaseAccess
 from app.models.authorization import User
 from app.models.authorization import UserGroup
-from app.schema.marshables import AuthorizationGroupSchema
 
 
 def create_group(group: Group):
@@ -47,38 +47,29 @@ def update_group():
     db.session.commit()
 
 
-def get_groups_list_hr_perms():
-    groups = get_groups_list()
-
+def get_users_by_group_identifiers():
     get_membership_list = UserGroup.query.with_entities(
         UserGroup.group_id,
         User.user,
         User.id,
         User.name
     ).join(UserGroup.user).all()
 
-    membership_list = {}
+    result = {}
     for member in get_membership_list:
-        if member.group_id not in membership_list:
-            membership_list[member.group_id] = [{
+        if member.group_id not in result:
+            result[member.group_id] = [{
                 'user': member.user,
                 'name': member.name,
                 'id': member.id
             }]
         else:
-            membership_list[member.group_id].append({
+            result[member.group_id].append({
                 'user': member.user,
                 'name': member.name,
                 'id': member.id
             })
-
-    groups = AuthorizationGroupSchema().dump(groups, many=True)
-    for group in groups:
-        perms = ac_permission_to_list(group['group_permissions'])
-        group['group_permissions_list'] = perms
-        group['group_members'] = membership_list.get(group['group_id'], [])
-
-    return groups
+    return result
 
 
 def get_group(group_id):