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

fixed data migration tests w/ burnettk

This commit is contained in:
jasquat 2024-06-28 15:31:26 -04:00
parent d243c5b1ce
commit 6bf9ad20e8
No known key found for this signature in database
6 changed files with 52 additions and 1325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1308
spiffworkflow-backend/dict.json
View File

File diff suppressed because it is too large Load Diff

5
spiffworkflow-backend/src/spiffworkflow_backend/data_migrations/data_migration_base.py
View File

@ -3,6 +3,7 @@ from __future__ import annotations
import abc
from typing import Any
from flask import current_app
from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
@ -33,3 +34,7 @@ class DataMigrationBase(metaclass=abc.ABCMeta):
@abc.abstractmethod
def run(cls, process_instance: ProcessInstanceModel) -> None:
raise NotImplementedError("method must be implemented on subclass: run")
@classmethod
def should_raise_on_error(cls) -> bool:
return current_app.config.get("ENV_IDENTIFIER") in ["unit_testing", "local_development"]

4
spiffworkflow-backend/src/spiffworkflow_backend/data_migrations/version_4.py
View File

@ -13,7 +13,7 @@ class Version4(DataMigrationBase):
return "4"
@classmethod
def run(cls, process_instance: ProcessInstanceModel) -> None:
def run(cls, process_instance: ProcessInstanceModel, should_raise_on_error: bool = False) -> None:
try:
processor = ProcessInstanceProcessor(
process_instance, include_task_data_for_completed_tasks=True, include_completed_subprocesses=True
@ -28,6 +28,8 @@ class Version4(DataMigrationBase):
)
except Exception as ex:
if cls.should_raise_on_error():
raise ex
current_app.logger.warning(f"Failed to migrate process_instance '{process_instance.id}'. The error was {str(ex)}")
@classmethod

2
spiffworkflow-backend/src/spiffworkflow_backend/data_migrations/version_5.py
View File

@ -35,4 +35,6 @@ class Version5(DataMigrationBase):
task.properties_json = new_properties_json
db.session.add(task)
except Exception as ex:
if cls.should_raise_on_error():
raise ex
current_app.logger.warning(f"Failed to migrate process_instance '{process_instance.id}'. The error was {str(ex)}")

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

@ -64,7 +64,6 @@ from spiffworkflow_backend.data_stores.typeahead import TypeaheadDataStore
from spiffworkflow_backend.data_stores.typeahead import TypeaheadDataStoreConverter
from spiffworkflow_backend.exceptions.api_error import ApiError
from spiffworkflow_backend.exceptions.error import TaskMismatchError
from spiffworkflow_backend.models import process_instance
from spiffworkflow_backend.models.bpmn_process import BpmnProcessModel
from spiffworkflow_backend.models.bpmn_process_definition import BpmnProcessDefinitionModel
from spiffworkflow_backend.models.bpmn_process_definition_relationship import BpmnProcessDefinitionRelationshipModel
@ -532,16 +531,18 @@ class ProcessInstanceProcessor:
process_instance_model=process_instance_model,
force_update=True,
)
bpmn_process_instance = cls.initialize_bpmn_process_instance(bpmn_process_dict)
task_model_mapping, bpmn_subprocess_mapping = cls.get_db_mappings_from_bpmn_process_dict(bpmn_process_dict)
task_service = TaskService(
process_instance=process_instance_model,
serializer=cls._serializer,
bpmn_definition_to_task_definitions_mappings=bpmn_definition_to_task_definitions_mappings,
force_update_definitions=True,
task_model_mapping=task_model_mapping,
bpmn_subprocess_mapping=bpmn_subprocess_mapping,
)
process_copy = copy.deepcopy(bpmn_process_dict)
bpmn_process_instance = cls._serializer.from_dict(process_copy)
bpmn_process_instance.script_engine = cls._default_script_engine
for spiff_task in bpmn_process_instance.get_tasks():
start_and_end_times: StartAndEndTimes | None = None
if spiff_task.has_state(TaskState.COMPLETED | TaskState.ERROR):
@ -555,6 +556,29 @@ class ProcessInstanceProcessor:
task_service.save_objects_to_database()
db.session.commit()
@classmethod
def initialize_bpmn_process_instance(cls, bpmn_process_dict: dict) -> BpmnWorkflow:
process_copy = copy.deepcopy(bpmn_process_dict)
bpmn_process_instance = cls._serializer.from_dict(process_copy)
bpmn_process_instance.script_engine = cls._default_script_engine
return bpmn_process_instance
@classmethod
def get_db_mappings_from_bpmn_process_dict(
cls, bpmn_process_dict: dict
) -> tuple[dict[str, TaskModel], dict[str, BpmnProcessModel]]:
task_guids = set(bpmn_process_dict["tasks"].keys())
bpmn_process_guids = set()
for subproc_guid, subproc_dict in bpmn_process_dict["subprocesses"].items():
new_set = set(subproc_dict["tasks"].keys())
task_guids.union(new_set)
bpmn_process_guids.add(subproc_guid)
task_models = TaskModel.query.filter(TaskModel.guid.in_(task_guids)).all() # type: ignore
bpmn_process_models = BpmnProcessModel.query.filter(BpmnProcessModel.guid.in_(bpmn_process_guids)).all() # type: ignore
task_model_mapping = {t.guid: t for t in task_models}
bpmn_subprocess_mapping = {b.guid: b for b in bpmn_process_models}
return (task_model_mapping, bpmn_subprocess_mapping)
@classmethod
def get_process_model_and_subprocesses(
cls,
@ -599,14 +623,14 @@ class ProcessInstanceProcessor:
bpmn_definition_to_task_definitions_mappings[bpmn_process_definition_identifier] = {}
if task_definition is not None:
bpmn_definition_to_task_definitions_mappings[bpmn_process_definition_identifier][
task_definition.bpmn_identifier
] = task_definition
bpmn_definition_to_task_definitions_mappings[bpmn_process_definition_identifier][task_definition.bpmn_identifier] = (
task_definition
)
if bpmn_process_definition is not None:
bpmn_definition_to_task_definitions_mappings[bpmn_process_definition_identifier][
"bpmn_process_definition"
] = bpmn_process_definition
bpmn_definition_to_task_definitions_mappings[bpmn_process_definition_identifier]["bpmn_process_definition"] = (
bpmn_process_definition
)
@classmethod
def _get_definition_dict_for_bpmn_process_definition(
@ -658,9 +682,9 @@ class ProcessInstanceProcessor:
bpmn_process_definition_dict: dict = bpmn_subprocess_definition.properties_json
spiff_bpmn_process_dict["subprocess_specs"][bpmn_subprocess_definition.bpmn_identifier] = bpmn_process_definition_dict
spiff_bpmn_process_dict["subprocess_specs"][bpmn_subprocess_definition.bpmn_identifier]["task_specs"] = {}
bpmn_subprocess_definition_bpmn_identifiers[
bpmn_subprocess_definition.id
] = bpmn_subprocess_definition.bpmn_identifier
bpmn_subprocess_definition_bpmn_identifiers[bpmn_subprocess_definition.id] = (
bpmn_subprocess_definition.bpmn_identifier
)
task_definitions = TaskDefinitionModel.query.filter(
TaskDefinitionModel.bpmn_process_definition_id.in_(bpmn_subprocess_definition_bpmn_identifiers.keys()) # type: ignore
@ -1298,9 +1322,9 @@ class ProcessInstanceProcessor:
for dt in deleted_tasks:
if str(dt.id) in processor.task_model_mapping:
del(processor.task_model_mapping[str(dt.id)])
del processor.task_model_mapping[str(dt.id)]
if str(dt.id) in processor.bpmn_subprocess_mapping:
del(processor.bpmn_subprocess_mapping[str(dt.id)])
del processor.bpmn_subprocess_mapping[str(dt.id)]
task_service = TaskService(
process_instance=processor.process_instance_model,

4
spiffworkflow-backend/src/spiffworkflow_backend/services/task_service.py
View File

@ -211,7 +211,9 @@ class TaskService:
# we are not sure why task_model.bpmn_process can be None while task_model.bpmn_process_id actually has a valid value
# bpmn_process = (
# new_bpmn_process or task_model.bpmn_process or BpmnProcessModel.query.filter_by(id=task_model.bpmn_process_id).first()
# new_bpmn_process or task_model.bpmn_process or BpmnProcessModel.query.filter_by(
# id=task_model.bpmn_process_id
# ).first()
# )
bpmn_process = new_bpmn_process or task_model.bpmn_process or self.bpmn_subprocess_id_mapping[task_model.bpmn_process_id]