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

remove reset tasks from human task table

This commit is contained in:
Elizabeth Esswein 2022-12-30 15:17:35 -05:00
parent 99f980df5e
commit 56bc262fa9
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -732,7 +732,6 @@ class ProcessInstanceProcessor:
def add_step(self, step: Union[dict, None] = None) -> None: def add_step(self, step: Union[dict, None] = None) -> None:
"""Add a spiff step.""" """Add a spiff step."""
self.increment_spiff_step()
if step is None: if step is None:
step = self.spiff_step_details_mapping() step = self.spiff_step_details_mapping()
db.session.add(SpiffStepDetailsModel(**step)) db.session.add(SpiffStepDetailsModel(**step))
@ -748,11 +747,12 @@ class ProcessInstanceProcessor:
spiff_task.complete() spiff_task.complete()
else: else:
spiff_logger = logging.getLogger("spiff") spiff_logger = logging.getLogger("spiff")
spiff_logger.info(f"Skipped task", extra=spiff_task.log_info()) spiff_logger.info(f"Skipped task {spiff_task.task_spec.name}", extra=spiff_task.log_info())
spiff_task._set_state(TaskState.COMPLETED) spiff_task._set_state(TaskState.COMPLETED)
for child in spiff_task.children: for child in spiff_task.children:
child.task_spec._update(child) child.task_spec._update(child)
self.bpmn_process_instance.last_task = spiff_task self.bpmn_process_instance.last_task = spiff_task
self.increment_spiff_step()
self.add_step() self.add_step()
self.save() self.save()
# Saving the workflow seems to reset the status # Saving the workflow seems to reset the status
@ -760,7 +760,6 @@ class ProcessInstanceProcessor:
def reset_process(self, spiff_step: int) -> None: def reset_process(self, spiff_step: int) -> None:
"""Reset a process to an earlier state.""" """Reset a process to an earlier state."""
spiff_logger = logging.getLogger("spiff") spiff_logger = logging.getLogger("spiff")
spiff_logger.info( spiff_logger.info(
f"Process reset from step {spiff_step}", f"Process reset from step {spiff_step}",
@ -777,6 +776,7 @@ class ProcessInstanceProcessor:
.first() .first()
) )
if step_detail is not None: if step_detail is not None:
self.increment_spiff_step()
self.add_step( self.add_step(
{ {
"process_instance_id": self.process_instance_model.id, "process_instance_id": self.process_instance_model.id,
@ -790,6 +790,15 @@ class ProcessInstanceProcessor:
dct["tasks"] = step_detail.task_json["tasks"] dct["tasks"] = step_detail.task_json["tasks"]
dct["subprocesses"] = step_detail.task_json["subprocesses"] dct["subprocesses"] = step_detail.task_json["subprocesses"]
self.bpmn_process_instance = self._serializer.workflow_from_dict(dct) self.bpmn_process_instance = self._serializer.workflow_from_dict(dct)
# Cascade does not seems to work on filters, only directly through the session
tasks = self.bpmn_process_instance.get_tasks(TaskState.NOT_FINISHED_MASK)
rows = HumanTaskModel.query.filter(
HumanTaskModel.task_id.in_(str(t.id) for t in tasks) # type: ignore
).all()
for row in rows:
db.session.delete(row)
self.save() self.save()
self.suspend() self.suspend()