Moved usage of marshmallow in business layer of task update up into the API

Author: c8y3

source/app/blueprints/rest/case/case_tasks_routes.py

@@ -150,18 +150,29 @@ def deprecated_case_task_view(cur_id: int, caseid: int):
 @ac_requires_case_identifier(CaseAccessLevel.full_access)
 @ac_api_requires()
 def deprecated_case_edit_task(cur_id: int, caseid: int):
+    task_schema = CaseTaskSchema()
     try:
         task = get_task(task_id=cur_id)
         if not task:
             return response_error(msg='Invalid task ID for this case')
 
-        task = tasks_update(task, request.get_json())
-        task_schema = CaseTaskSchema()
+        case_identifier = task.task_case_id
+        request_data = call_deprecated_on_preload_modules_hook('task_update', request.get_json(), case_identifier)
 
-        return response_success(msg='Task updated', data=task_schema.dump(task))
+        if 'task_assignee_id' in request_data or 'task_assignees_id' not in request_data:
+            return response_error('task_assignee_id is not valid anymore since v1.5.0')
+
+        task_assignee_list = request_data['task_assignees_id']
+        del request_data['task_assignees_id']
+
+        request_data['id'] = task.id
+        task = task_schema.load(request_data, instance=task)
+
+        task = tasks_update(task, task_assignee_list)
 
+        return response_success(msg='Task updated', data=task_schema.dump(task))
     except ValidationError as e:
-        return response_error(msg='Data error', data=e.messages)
+        return response_error('Data error', data=e.messages)
 
 
 @case_tasks_rest_blueprint.route('/case/tasks/delete/<int:cur_id>', methods=['POST'])
@@ -174,7 +185,7 @@ def deprecated_case_delete_task(cur_id: int, caseid: int):
         tasks_delete(task)
         return response_success('Task deleted')
     except BusinessProcessingError as e:
-        return response_error(msg=e.get_message(), data=e.get_data())
+        return response_error(e.get_message(), data=e.get_data())
 
 
 @case_tasks_rest_blueprint.route('/case/tasks/<int:cur_id>/comments/list', methods=['GET'])

source/app/blueprints/rest/v2/case_routes/tasks.py

@@ -108,10 +108,25 @@ def update(self, case_identifier, identifier):
                                                               [CaseAccessLevel.read_only, CaseAccessLevel.full_access]):
                 return ac_api_return_access_denied(caseid=task.task_case_id)
 
-            task = tasks_update(task, request.get_json())
+            case_identifier = task.task_case_id
+            request_data = call_deprecated_on_preload_modules_hook('task_update', request.get_json(), case_identifier)
+
+            if 'task_assignee_id' in request_data or 'task_assignees_id' not in request_data:
+                return response_api_error('task_assignee_id is not valid anymore since v1.5.0')
+
+            task_assignee_list = request_data['task_assignees_id']
+            del request_data['task_assignees_id']
+
+            request_data['id'] = task.id
+            task = self._schema.load(request_data, instance=task)
+
+            task = tasks_update(task, task_assignee_list)
 
             result = self._schema.dump(task)
             return response_api_success(result)
+
+        except ValidationError as e:
+            return response_api_error('Data error', data=e.messages)
         except ObjectNotFoundError:
             return response_api_not_found()
         except BusinessProcessingError as e:

source/app/business/tasks.py

@@ -32,19 +32,8 @@
 from app.iris_engine.utils.tracker import track_activity
 from app.models.models import CaseTasks
 from app.models.pagination_parameters import PaginationParameters
-from app.schema.marshables import CaseTaskSchema
 from app.business.errors import BusinessProcessingError
 from app.business.errors import ObjectNotFoundError
-from marshmallow.exceptions import ValidationError
-from app.iris_engine.module_handler.module_handler import call_deprecated_on_preload_modules_hook
-
-
-def _load(request_data, **kwargs):
-    try:
-        add_task_schema = CaseTaskSchema()
-        return add_task_schema.load(request_data, **kwargs)
-    except ValidationError as e:
-        raise BusinessProcessingError('Data error', e.messages)
 
 
 def tasks_delete(task: CaseTasks):
@@ -83,32 +72,18 @@ def tasks_filter(case_identifier, pagination_parameters: PaginationParameters) -
     return get_filtered_tasks(case_identifier, pagination_parameters)
 
 
-def tasks_update(task: CaseTasks, request_json):
-    case_identifier = task.task_case_id
-    request_data = call_deprecated_on_preload_modules_hook('task_update', request_json, case_identifier)
-
-    if 'task_assignee_id' in request_data or 'task_assignees_id' not in request_data:
-        raise BusinessProcessingError('task_assignee_id is not valid anymore since v1.5.0')
-
-    task_assignee_list = request_data['task_assignees_id']
-    del request_data['task_assignees_id']
-
-    request_data['id'] = task.id
-    task = _load(request_data, instance=task)
-
+def tasks_update(task: CaseTasks, task_assignee_list):
     task.task_userid_update = iris_current_user.id
     task.task_last_update = datetime.utcnow()
 
-    update_task_assignees(task.id, task_assignee_list, case_identifier)
-
-    update_tasks_state(caseid=case_identifier)
+    update_task_assignees(task.id, task_assignee_list, task.task_case_id)
+    update_tasks_state(task.task_case_id)
 
     db.session.commit()
 
-    task = call_modules_hook('on_postload_task_update', data=task, caseid=case_identifier)
-
+    task = call_modules_hook('on_postload_task_update', data=task, caseid=task.task_case_id)
     if not task:
         raise BusinessProcessingError('Unable to update task for internal reasons')
 
-    track_activity(f'updated task "{task.task_title}" (status {task.status.status_name})', caseid=case_identifier)
+    track_activity(f'updated task "{task.task_title}" (status {task.status.status_name})', caseid=task.task_case_id)
     return task