sartography
/
spiff-arena
mirror of https://github.com/sartography/spiff-arena.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

save task data to spiff step details when copmleting a user task as well w/ burnettk jbirddog

This commit is contained in:
jasquat 2023-02-15 15:34:51 -05:00
parent 5a2e810fd6
commit 09f3921236
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py
View File

@ -694,10 +694,6 @@ class ProcessInstanceProcessor:
end_in_seconds: Optional[float] = None, end_in_seconds: Optional[float] = None,
) -> dict: ) -> dict:
"""SaveSpiffStepDetails.""" """SaveSpiffStepDetails."""
# bpmn_json = self.serialize()
# wf_json = json.loads(bpmn_json)
default_registry = DefaultRegistry()
if spiff_task is None: if spiff_task is None:
# TODO: safer to pass in task vs use last task? # TODO: safer to pass in task vs use last task?
spiff_task = self.bpmn_process_instance.last_task spiff_task = self.bpmn_process_instance.last_task
@ -709,17 +705,8 @@ class ProcessInstanceProcessor:
if start_in_seconds is None: if start_in_seconds is None:
start_in_seconds = time.time() start_in_seconds = time.time()
task_data = default_registry.convert(spiff_task.data) task_json = self.get_task_json_from_spiff_task(spiff_task)
python_env = default_registry.convert(
self._script_engine.environment.last_result()
)
task_json: Dict[str, Any] = {
# "tasks": wf_json["tasks"],
# "subprocesses": wf_json["subprocesses"],
"task_data": task_data,
"python_env": python_env,
}
return { return {
"process_instance_id": self.process_instance_model.id, "process_instance_id": self.process_instance_model.id,
"spiff_step": self.process_instance_model.spiff_step or 1, "spiff_step": self.process_instance_model.spiff_step or 1,
@ -1730,6 +1717,18 @@ class ProcessInstanceProcessor:
) )
return user_tasks # type: ignore return user_tasks # type: ignore
def get_task_json_from_spiff_task(self, spiff_task: SpiffTask) -> dict[str, Any]:
default_registry = DefaultRegistry()
task_data = default_registry.convert(spiff_task.data)
python_env = default_registry.convert(
self._script_engine.environment.last_result()
)
task_json: Dict[str, Any] = {
"task_data": task_data,
"python_env": python_env,
}
return task_json
def complete_task( def complete_task(
self, task: SpiffTask, human_task: HumanTaskModel, user: UserModel self, task: SpiffTask, human_task: HumanTaskModel, user: UserModel
) -> None: ) -> None:
@ -1755,6 +1754,7 @@ class ProcessInstanceProcessor:
details_model.task_state = task.get_state_name() details_model.task_state = task.get_state_name()
details_model.end_in_seconds = time.time() details_model.end_in_seconds = time.time()
details_model.task_json = self.get_task_json_from_spiff_task(task)
db.session.add(details_model) db.session.add(details_model)
# this is the thing that actually commits the db transaction (on behalf of the other updates above as well) # this is the thing that actually commits the db transaction (on behalf of the other updates above as well)