some updates to comments w/ burnettk
This commit is contained in:
parent
285767bf5a
commit
80b9d4190a
|
@ -1891,7 +1891,7 @@ class ProcessInstanceProcessor:
|
||||||
db.session.add(details_model)
|
db.session.add(details_model)
|
||||||
# #######
|
# #######
|
||||||
|
|
||||||
json_data = TaskService.update_task_model_and_add_to_db_session(
|
json_data = TaskService.update_task_model(
|
||||||
task_model, spiff_task, self._serializer
|
task_model, spiff_task, self._serializer
|
||||||
)
|
)
|
||||||
if json_data is not None:
|
if json_data is not None:
|
||||||
|
|
|
@ -36,7 +36,7 @@ class TaskService:
|
||||||
return json_data_to_return
|
return json_data_to_return
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def update_task_model_and_add_to_db_session(
|
def update_task_model(
|
||||||
cls,
|
cls,
|
||||||
task_model: TaskModel,
|
task_model: TaskModel,
|
||||||
spiff_task: SpiffTask,
|
spiff_task: SpiffTask,
|
||||||
|
@ -45,6 +45,7 @@ class TaskService:
|
||||||
"""Updates properties_json and data on given task_model.
|
"""Updates properties_json and data on given task_model.
|
||||||
|
|
||||||
This will NOT update start_in_seconds or end_in_seconds.
|
This will NOT update start_in_seconds or end_in_seconds.
|
||||||
|
It also returns the relating json_data object so they can be imported later.
|
||||||
"""
|
"""
|
||||||
new_properties_json = serializer.task_to_dict(spiff_task)
|
new_properties_json = serializer.task_to_dict(spiff_task)
|
||||||
spiff_task_data = new_properties_json.pop("data")
|
spiff_task_data = new_properties_json.pop("data")
|
||||||
|
@ -147,6 +148,11 @@ class TaskService:
|
||||||
bpmn_process_parent: Optional[BpmnProcessModel] = None,
|
bpmn_process_parent: Optional[BpmnProcessModel] = None,
|
||||||
bpmn_process_guid: Optional[str] = None,
|
bpmn_process_guid: Optional[str] = None,
|
||||||
) -> Tuple[BpmnProcessModel, dict[str, TaskModel], dict[str, JsonDataModel]]:
|
) -> Tuple[BpmnProcessModel, dict[str, TaskModel], dict[str, JsonDataModel]]:
|
||||||
|
"""This creates and adds a bpmn_process to the Db session.
|
||||||
|
|
||||||
|
It will also add tasks and relating json_data entries if the bpmn_process is new.
|
||||||
|
It returns tasks and json data records in dictionaries to be added to the session later.
|
||||||
|
"""
|
||||||
tasks = bpmn_process_dict.pop("tasks")
|
tasks = bpmn_process_dict.pop("tasks")
|
||||||
bpmn_process_data_dict = bpmn_process_dict.pop("data")
|
bpmn_process_data_dict = bpmn_process_dict.pop("data")
|
||||||
|
|
||||||
|
@ -189,6 +195,9 @@ class TaskService:
|
||||||
process_instance.bpmn_process = bpmn_process
|
process_instance.bpmn_process = bpmn_process
|
||||||
elif bpmn_process.parent_process_id is None:
|
elif bpmn_process.parent_process_id is None:
|
||||||
bpmn_process.parent_process_id = bpmn_process_parent.id
|
bpmn_process.parent_process_id = bpmn_process_parent.id
|
||||||
|
|
||||||
|
# Since we bulk insert tasks later we need to add the bpmn_process to the session
|
||||||
|
# to ensure we have an id.
|
||||||
db.session.add(bpmn_process)
|
db.session.add(bpmn_process)
|
||||||
|
|
||||||
if bpmn_process_is_new:
|
if bpmn_process_is_new:
|
||||||
|
|
|
@ -87,7 +87,7 @@ class TaskModelSavingDelegate(EngineStepDelegate):
|
||||||
def did_complete_task(self, spiff_task: SpiffTask) -> None:
|
def did_complete_task(self, spiff_task: SpiffTask) -> None:
|
||||||
if self.current_task_model and self.should_update_task_model():
|
if self.current_task_model and self.should_update_task_model():
|
||||||
self.current_task_model.end_in_seconds = time.time()
|
self.current_task_model.end_in_seconds = time.time()
|
||||||
json_data = TaskService.update_task_model_and_add_to_db_session(
|
json_data = TaskService.update_task_model(
|
||||||
self.current_task_model, spiff_task, self.serializer
|
self.current_task_model, spiff_task, self.serializer
|
||||||
)
|
)
|
||||||
if json_data is not None:
|
if json_data is not None:
|
||||||
|
@ -120,7 +120,7 @@ class TaskModelSavingDelegate(EngineStepDelegate):
|
||||||
)
|
)
|
||||||
self.task_models.update(new_task_models)
|
self.task_models.update(new_task_models)
|
||||||
self.json_data_models.update(new_json_data_models)
|
self.json_data_models.update(new_json_data_models)
|
||||||
json_data = TaskService.update_task_model_and_add_to_db_session(
|
json_data = TaskService.update_task_model(
|
||||||
task_model, waiting_spiff_task, self.serializer
|
task_model, waiting_spiff_task, self.serializer
|
||||||
)
|
)
|
||||||
self.task_models[task_model.guid] = task_model
|
self.task_models[task_model.guid] = task_model
|
||||||
|
|
Loading…
Reference in New Issue