Added lint-imports rule not to import API layer from the business layer

Author: c8y3

pyproject.toml

@@ -35,3 +35,10 @@ source_modules = "app.business"
 forbidden_modules = "sqlalchemy"
 allow_indirect_imports = true
 
+[[tool.importlinter.contracts]]
+name = "Do not import API layer from the persistence layer"
+type = "forbidden"
+source_modules = "app.datamgmt.dashboard"
+forbidden_modules = "app.blueprints.iris_user"
+allow_indirect_imports = true
+

source/app/blueprints/rest/dashboard_routes.py

@@ -33,7 +33,9 @@
 
 from app.blueprints.rest.endpoints import endpoint_deprecated
 from app.blueprints.iris_user import iris_current_user
-from app.datamgmt.dashboard.dashboard_db import get_global_task, list_user_cases, list_user_reviews
+from app.datamgmt.dashboard.dashboard_db import get_global_task
+from app.datamgmt.dashboard.dashboard_db import list_user_cases
+from app.datamgmt.dashboard.dashboard_db import list_user_reviews
 from app.datamgmt.dashboard.dashboard_db import get_tasks_status
 from app.datamgmt.dashboard.dashboard_db import list_global_tasks
 from app.datamgmt.dashboard.dashboard_db import list_user_tasks
@@ -299,6 +301,7 @@ def gtask_delete(cur_id, caseid):
 @ac_api_requires()
 def list_own_cases():
     cases = list_user_cases(
+        iris_current_user.id,
         request.args.get('show_closed', 'false', type=str).lower() == 'true'
     )
 
@@ -308,7 +311,7 @@ def list_own_cases():
 @dashboard_rest_blueprint.route('/user/tasks/list', methods=['GET'])
 @ac_api_requires()
 def get_utasks():
-    ct = list_user_tasks()
+    ct = list_user_tasks(iris_current_user.id)
 
     if ct:
         output = [c._asdict() for c in ct]
@@ -326,7 +329,7 @@ def get_utasks():
 @dashboard_rest_blueprint.route('/user/reviews/list', methods=['GET'])
 @ac_api_requires()
 def get_reviews():
-    ct = list_user_reviews()
+    ct = list_user_reviews(iris_current_user.id)
 
     if ct:
         output = [c._asdict() for c in ct]

source/app/business/cases.py

@@ -80,11 +80,11 @@ def cases_filter(current_user, pagination_parameters, name, case_identifiers, cu
 
 
 def cases_filter_by_user(show_all: bool):
-    return list_user_cases(show_all)
+    return list_user_cases(iris_current_user.id, show_all)
 
 
 def cases_filter_by_reviewer():
-    return list_user_reviews()
+    return list_user_reviews(iris_current_user.id)
 
 
 def cases_get_by_identifier(case_identifier) -> Cases:

source/app/business/tasks.py

@@ -74,7 +74,7 @@ def tasks_filter(case_identifier, pagination_parameters: PaginationParameters) -
 
 
 def tasks_filter_by_user():
-    return list_user_tasks()
+    return list_user_tasks(iris_current_user.id)
 
 
 def tasks_update(task: CaseTasks, task_assignee_list):

source/app/datamgmt/dashboard/dashboard_db.py

@@ -19,7 +19,6 @@
 from sqlalchemy import desc
 
 from app import db
-from app.blueprints.iris_user import iris_current_user
 from app.models.models import CaseTasks
 from app.models.models import TaskAssignee
 from app.models.models import ReviewStatus
@@ -83,7 +82,7 @@ def get_tasks_status():
     return TaskStatus.query.all()
 
 
-def list_user_reviews():
+def list_user_reviews(user_identifier):
     ct = Cases.query.with_entities(
         Cases.case_id,
         Cases.name,
@@ -92,15 +91,15 @@ def list_user_reviews():
     ).join(
         Cases.review_status
     ).filter(
-        Cases.reviewer_id == iris_current_user.id,
+        Cases.reviewer_id == user_identifier,
         ReviewStatus.status_name != 'Reviewed',
         ReviewStatus.status_name != 'Not reviewed'
     ).all()
 
     return ct
 
 
-def list_user_tasks():
+def list_user_tasks(user_identifier):
     ct = CaseTasks.query.with_entities(
         CaseTasks.id.label("task_id"),
         CaseTasks.task_title,
@@ -123,7 +122,7 @@ def list_user_tasks():
         CaseTasks.status,
     ).filter(and_(
         TaskAssignee.task_id == CaseTasks.id,
-        TaskAssignee.user_id == iris_current_user.id
+        TaskAssignee.user_id == user_identifier
     )).all()
 
     return ct
@@ -172,14 +171,14 @@ def get_task_status(task_status_id):
     return ret
 
 
-def list_user_cases(show_all=False):
+def list_user_cases(user_identifier, show_all=False):
     if show_all:
         return Cases.query.filter(
-            Cases.owner_id == iris_current_user.id
+            Cases.owner_id == user_identifier
         ).all()
 
     return Cases.query.filter(
-        Cases.owner_id == iris_current_user.id,
+        Cases.owner_id == user_identifier,
         Cases.close_date == None
     ).all()