mirror of
https://github.com/sartography/spiffworkflow-backend.git
synced 2025-02-24 13:28:31 +00:00
most lints and checks are passing and cleaned up some debug code
This commit is contained in:
parent
cbab371fd3
commit
4cc2601210
@ -84,7 +84,7 @@ def create_app() -> flask.app.Flask:
|
|||||||
|
|
||||||
app.json_encoder = MyJSONEncoder
|
app.json_encoder = MyJSONEncoder
|
||||||
|
|
||||||
# if app.config["PROCESS_WAITING_MESSAGES"]:
|
if app.config["PROCESS_WAITING_MESSAGES"]:
|
||||||
# start_scheduler(app)
|
start_scheduler(app)
|
||||||
|
|
||||||
return app # type: ignore
|
return app # type: ignore
|
||||||
|
@ -37,7 +37,6 @@ from spiffworkflow_backend.models.process_instance_report import (
|
|||||||
from spiffworkflow_backend.models.process_model import ProcessModelInfo
|
from spiffworkflow_backend.models.process_model import ProcessModelInfo
|
||||||
from spiffworkflow_backend.models.process_model import ProcessModelInfoSchema
|
from spiffworkflow_backend.models.process_model import ProcessModelInfoSchema
|
||||||
from spiffworkflow_backend.services.error_handling_service import ErrorHandlingService
|
from spiffworkflow_backend.services.error_handling_service import ErrorHandlingService
|
||||||
from spiffworkflow_backend.services.message_service import MessageService
|
|
||||||
from spiffworkflow_backend.services.process_instance_processor import (
|
from spiffworkflow_backend.services.process_instance_processor import (
|
||||||
ProcessInstanceProcessor,
|
ProcessInstanceProcessor,
|
||||||
)
|
)
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
"""Message_service."""
|
"""Message_service."""
|
||||||
|
from typing import Any
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
import flask
|
import flask
|
||||||
from flask_bpmn.models.db import db
|
from flask_bpmn.models.db import db
|
||||||
from SpiffWorkflow.bpmn.specs.events.event_definitions import MessageEventDefinition # type: ignore
|
|
||||||
from sqlalchemy import and_
|
from sqlalchemy import and_
|
||||||
from sqlalchemy import or_
|
from sqlalchemy import or_
|
||||||
from sqlalchemy import select
|
from sqlalchemy import select
|
||||||
@ -194,7 +194,7 @@ class MessageService:
|
|||||||
or_(*message_correlation_filter),
|
or_(*message_correlation_filter),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.join(MessageCorrelationMessageInstanceModel)
|
.join(MessageCorrelationMessageInstanceModel) # type: ignore
|
||||||
.filter_by(
|
.filter_by(
|
||||||
message_instance_id=message_instance_receive.id,
|
message_instance_id=message_instance_receive.id,
|
||||||
)
|
)
|
||||||
@ -216,7 +216,7 @@ class MessageService:
|
|||||||
|
|
||||||
def get_process_instance_for_message_instance(
|
def get_process_instance_for_message_instance(
|
||||||
self, message_instance: MessageInstanceModel
|
self, message_instance: MessageInstanceModel
|
||||||
) -> ProcessInstanceModel:
|
) -> Any:
|
||||||
"""Get_process_instance_for_message_instance."""
|
"""Get_process_instance_for_message_instance."""
|
||||||
process_instance = ProcessInstanceModel.query.filter_by(
|
process_instance = ProcessInstanceModel.query.filter_by(
|
||||||
id=message_instance.process_instance_id
|
id=message_instance.process_instance_id
|
||||||
|
@ -4,6 +4,7 @@ import time
|
|||||||
from typing import Any
|
from typing import Any
|
||||||
from typing import Dict
|
from typing import Dict
|
||||||
from typing import List
|
from typing import List
|
||||||
|
from typing import Optional
|
||||||
from typing import Union
|
from typing import Union
|
||||||
|
|
||||||
from flask import current_app
|
from flask import current_app
|
||||||
@ -28,7 +29,7 @@ from SpiffWorkflow.dmn.serializer import BusinessRuleTaskConverter # type: igno
|
|||||||
from SpiffWorkflow.serializer.exceptions import MissingSpecError # type: ignore
|
from SpiffWorkflow.serializer.exceptions import MissingSpecError # type: ignore
|
||||||
from SpiffWorkflow.specs import WorkflowSpec # type: ignore
|
from SpiffWorkflow.specs import WorkflowSpec # type: ignore
|
||||||
from SpiffWorkflow.spiff.parser.process import SpiffBpmnParser # type: ignore
|
from SpiffWorkflow.spiff.parser.process import SpiffBpmnParser # type: ignore
|
||||||
from SpiffWorkflow.spiff.serializer import BoundaryEventConverter
|
from SpiffWorkflow.spiff.serializer import BoundaryEventConverter # type: ignore
|
||||||
from SpiffWorkflow.spiff.serializer import CallActivityTaskConverter
|
from SpiffWorkflow.spiff.serializer import CallActivityTaskConverter
|
||||||
from SpiffWorkflow.spiff.serializer import EndEventConverter
|
from SpiffWorkflow.spiff.serializer import EndEventConverter
|
||||||
from SpiffWorkflow.spiff.serializer import IntermediateCatchEventConverter
|
from SpiffWorkflow.spiff.serializer import IntermediateCatchEventConverter
|
||||||
@ -80,22 +81,22 @@ class CustomBpmnScriptEngine(PythonScriptEngine): # type: ignore
|
|||||||
"""Evaluate."""
|
"""Evaluate."""
|
||||||
return self._evaluate(expression, task.data, task)
|
return self._evaluate(expression, task.data, task)
|
||||||
|
|
||||||
# def _evaluate(
|
def _evaluate(
|
||||||
# self,
|
self,
|
||||||
# expression: str,
|
expression: str,
|
||||||
# context: Dict[str, Union[Box, str]],
|
context: Dict[str, Union[Box, str]],
|
||||||
# task: Optional[SpiffTask] = None,
|
task: Optional[SpiffTask] = None,
|
||||||
# _external_methods: None = None,
|
_external_methods: None = None,
|
||||||
# ) -> Any:
|
) -> Any:
|
||||||
# """Evaluate the given expression, within the context of the given task and return the result."""
|
"""Evaluate the given expression, within the context of the given task and return the result."""
|
||||||
# try:
|
try:
|
||||||
# return super()._evaluate(expression, context, task, {})
|
return super()._evaluate(expression, context, task, {})
|
||||||
# except Exception as exception:
|
except Exception as exception:
|
||||||
# raise WorkflowTaskExecException(
|
raise WorkflowTaskExecException(
|
||||||
# task,
|
task,
|
||||||
# "Error evaluating expression "
|
"Error evaluating expression "
|
||||||
# "'%s', %s" % (expression, str(exception)),
|
"'%s', %s" % (expression, str(exception)),
|
||||||
# ) from exception
|
) from exception
|
||||||
|
|
||||||
def execute(
|
def execute(
|
||||||
self, task: SpiffTask, script: str, data: Dict[str, Dict[str, str]]
|
self, task: SpiffTask, script: str, data: Dict[str, Dict[str, str]]
|
||||||
@ -527,7 +528,8 @@ class ProcessInstanceProcessor:
|
|||||||
if message_correlation_property is None:
|
if message_correlation_property is None:
|
||||||
raise ApiError(
|
raise ApiError(
|
||||||
"message_correlations_missing_from_process",
|
"message_correlations_missing_from_process",
|
||||||
f"Could not find a known message correlation with identifier: {message_correlation_property_identifier}",
|
"Could not find a known message correlation with identifier:"
|
||||||
|
f"{message_correlation_property_identifier}",
|
||||||
)
|
)
|
||||||
message_correlations.append(
|
message_correlations.append(
|
||||||
{
|
{
|
||||||
|
@ -297,7 +297,8 @@ class SpecFileService(FileSystemService):
|
|||||||
!= process_model_info.process_group_id
|
!= process_model_info.process_group_id
|
||||||
):
|
):
|
||||||
raise ValidationException(
|
raise ValidationException(
|
||||||
f"Message model is already used to start process model '{process_model_info.process_group_id}/{process_model_info.id}'"
|
"Message model is already used to start process model"
|
||||||
|
f"'{process_model_info.process_group_id}/{process_model_info.id}'"
|
||||||
)
|
)
|
||||||
|
|
||||||
for child in et_root:
|
for child in et_root:
|
||||||
@ -328,7 +329,7 @@ class SpecFileService(FileSystemService):
|
|||||||
if message_model is None:
|
if message_model is None:
|
||||||
raise ValidationException(
|
raise ValidationException(
|
||||||
f"Could not find message model with identifier '{message_model_identifier}'"
|
f"Could not find message model with identifier '{message_model_identifier}'"
|
||||||
f"specified by message event definition: {message_event_definition}"
|
f"specified by correlation property: {cpre}"
|
||||||
)
|
)
|
||||||
|
|
||||||
message_correlation_property = (
|
message_correlation_property = (
|
||||||
|
@ -1,12 +1,6 @@
|
|||||||
"""Test_message_service."""
|
"""Test_message_service."""
|
||||||
from flask import Flask
|
from flask import Flask
|
||||||
from flask_bpmn.models.db import db
|
|
||||||
from tests.spiffworkflow_backend.helpers.base_test import BaseTest
|
from tests.spiffworkflow_backend.helpers.base_test import BaseTest
|
||||||
from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
|
|
||||||
|
|
||||||
from spiffworkflow_backend.models.message_correlation import MessageCorrelationModel
|
|
||||||
from spiffworkflow_backend.models.message_instance import MessageInstanceModel
|
|
||||||
from spiffworkflow_backend.models.message_model import MessageModel
|
|
||||||
|
|
||||||
|
|
||||||
class TestSpecFileService(BaseTest):
|
class TestSpecFileService(BaseTest):
|
||||||
@ -15,4 +9,5 @@ class TestSpecFileService(BaseTest):
|
|||||||
def test_can_check_for_messages_in_bpmn_xml(
|
def test_can_check_for_messages_in_bpmn_xml(
|
||||||
self, app: Flask, with_db_and_bpmn_file_cleanup: None
|
self, app: Flask, with_db_and_bpmn_file_cleanup: None
|
||||||
) -> None:
|
) -> None:
|
||||||
|
"""Test_can_check_for_messages_in_bpmn_xml."""
|
||||||
assert True
|
assert True
|
||||||
|
Loading…
x
Reference in New Issue
Block a user