This commit is contained in:
burnettk 2023-03-28 08:04:42 -04:00
parent e6cb06c4a3
commit 21a97fb4cf
2 changed files with 7 additions and 5 deletions

View File

@ -1,7 +1,5 @@
"""Process_instance_processor.""" """Process_instance_processor."""
import _strptime # type: ignore import _strptime # type: ignore
from sqlalchemy import or_
from sqlalchemy import and_
import decimal import decimal
import json import json
import logging import logging
@ -53,6 +51,8 @@ from SpiffWorkflow.spiff.serializer.config import SPIFF_SPEC_CONFIG # type: ign
from SpiffWorkflow.task import Task as SpiffTask # type: ignore from SpiffWorkflow.task import Task as SpiffTask # type: ignore
from SpiffWorkflow.task import TaskState from SpiffWorkflow.task import TaskState
from SpiffWorkflow.util.deep_merge import DeepMerge # type: ignore from SpiffWorkflow.util.deep_merge import DeepMerge # type: ignore
from sqlalchemy import and_
from sqlalchemy import or_
from spiffworkflow_backend.exceptions.api_error import ApiError from spiffworkflow_backend.exceptions.api_error import ApiError
from spiffworkflow_backend.models.bpmn_process import BpmnProcessModel from spiffworkflow_backend.models.bpmn_process import BpmnProcessModel

View File

@ -1,8 +1,8 @@
import logging import logging
import time import time
from uuid import UUID
from typing import Callable from typing import Callable
from typing import Optional from typing import Optional
from uuid import UUID
from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer # type: ignore from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer # type: ignore
from SpiffWorkflow.bpmn.workflow import BpmnWorkflow # type: ignore from SpiffWorkflow.bpmn.workflow import BpmnWorkflow # type: ignore
@ -83,7 +83,7 @@ class TaskModelSavingDelegate(EngineStepDelegate):
raise Exception("Could not find cached current_task_start_in_seconds. This should never have happend") raise Exception("Could not find cached current_task_start_in_seconds. This should never have happend")
task_model.start_in_seconds = self.current_task_start_in_seconds task_model.start_in_seconds = self.current_task_start_in_seconds
task_model.end_in_seconds = time.time() task_model.end_in_seconds = time.time()
self.last_completed_spiff_task= spiff_task self.last_completed_spiff_task = spiff_task
if self.secondary_engine_step_delegate: if self.secondary_engine_step_delegate:
self.secondary_engine_step_delegate.did_complete_task(spiff_task) self.secondary_engine_step_delegate.did_complete_task(spiff_task)
@ -123,7 +123,9 @@ class TaskModelSavingDelegate(EngineStepDelegate):
def _process_spiff_task_parents(self, spiff_task: SpiffTask) -> None: def _process_spiff_task_parents(self, spiff_task: SpiffTask) -> None:
(parent_subprocess_guid, _parent_subprocess) = TaskService.task_subprocess(spiff_task) (parent_subprocess_guid, _parent_subprocess) = TaskService.task_subprocess(spiff_task)
if parent_subprocess_guid is not None: if parent_subprocess_guid is not None:
spiff_task_of_parent_subprocess = spiff_task.workflow._get_outermost_workflow().get_task(UUID(parent_subprocess_guid)) spiff_task_of_parent_subprocess = spiff_task.workflow._get_outermost_workflow().get_task(
UUID(parent_subprocess_guid)
)
if spiff_task_of_parent_subprocess is not None: if spiff_task_of_parent_subprocess is not None:
self._update_task_model_with_spiff_task(spiff_task_of_parent_subprocess) self._update_task_model_with_spiff_task(spiff_task_of_parent_subprocess)