Merge pull request #303 from sartography/bugfix/execute-tasks-on-ready

Bugfix/execute tasks on ready

SpiffWorkflow/bpmn/serializer/process_spec.py

@@ -1,5 +1,4 @@
 from ..specs.BpmnProcessSpec import BpmnProcessSpec
-from ..specs.MultiInstanceTask import MultiInstanceTask
 from ..specs.events.IntermediateEvent import _BoundaryEventParent
 
 from .helpers.spec import WorkflowSpecConverter

SpiffWorkflow/bpmn/specs/ScriptTask.py

@@ -29,10 +29,10 @@ def _execute(self, task):
         """Please override for specific Implementations, see ScriptTask below for an example"""
         pass
 
-    def _on_complete_hook(self, task):
+    def _on_ready_hook(self, task):
         try:
             self._execute(task)
-            super(ScriptEngineTask, self)._on_complete_hook(task)
+            super(ScriptEngineTask, self)._on_ready_hook(task)
         except Exception as exc:
             task._set_state(TaskState.WAITING)
             raise exc

SpiffWorkflow/dmn/serializer/task_spec.py

@@ -5,10 +5,7 @@
 from ..specs.model import Input, InputEntry, Output, OutputEntry
 from ..engine.DMNEngine import DMNEngine
 
-class BusinessRuleTaskConverter(TaskSpecConverter):
-
-    def __init__(self, registry):
-        super().__init__(BusinessRuleTask, registry)
+class BaseBusinessRuleTaskConverter(TaskSpecConverter):
 
     def to_dict(self, spec):
         dct = self.get_default_attributes(spec)
@@ -98,3 +95,8 @@ def rule_from_dict(self, dct, inputs, outputs):
         rule.outputEntries = [self.output_entry_from_dict(entry, outputs)
                               for entry in dct['output_entries']]
         return rule
+
+
+class BusinessRuleTaskConverter(BaseBusinessRuleTaskConverter):
+    def __init__(self, registry):
+        super().__init__(BusinessRuleTask, registry)

SpiffWorkflow/dmn/specs/BusinessRuleTask.py

@@ -1,5 +1,4 @@
-from SpiffWorkflow.exceptions import WorkflowTaskException, WorkflowException, \
-    SpiffWorkflowException
+from SpiffWorkflow.exceptions import WorkflowTaskException, SpiffWorkflowException
 
 from ...specs.Simple import Simple
 
@@ -17,19 +16,17 @@ def _on_trigger(self, my_task):
 
     def __init__(self, wf_spec, name, dmnEngine, **kwargs):
         super().__init__(wf_spec, name, **kwargs)
-
         self.dmnEngine = dmnEngine
         self.resDict = None
 
     @property
     def spec_class(self):
         return 'Business Rule Task'
 
-    def _on_complete_hook(self, my_task):
+    def _on_ready_hook(self, my_task):
         try:
-            my_task.data = DeepMerge.merge(my_task.data,
-                                           self.dmnEngine.result(my_task))
-            super(BusinessRuleTask, self)._on_complete_hook(my_task)
+            my_task.data = DeepMerge.merge(my_task.data, self.dmnEngine.result(my_task))
+            super(BusinessRuleTask, self)._on_ready_hook(my_task)
         except SpiffWorkflowException as we:
             we.add_note(f"Business Rule Task '{my_task.task_spec.description}'.")
             raise we

SpiffWorkflow/spiff/parser/process.py

@@ -6,17 +6,26 @@
 from SpiffWorkflow.bpmn.specs.events.EndEvent import EndEvent
 from SpiffWorkflow.bpmn.specs.events.StartEvent import StartEvent
 from SpiffWorkflow.bpmn.specs.events.IntermediateEvent import IntermediateThrowEvent, BoundaryEvent, IntermediateCatchEvent
+
 from SpiffWorkflow.spiff.specs.none_task import NoneTask
 from SpiffWorkflow.spiff.specs.manual_task import ManualTask
 from SpiffWorkflow.spiff.specs.user_task import UserTask
 from SpiffWorkflow.spiff.specs.script_task import ScriptTask
 from SpiffWorkflow.spiff.specs.subworkflow_task import SubWorkflowTask, TransactionSubprocess, CallActivity
 from SpiffWorkflow.spiff.specs.service_task import ServiceTask
 from SpiffWorkflow.spiff.specs.events.event_types import SendTask, ReceiveTask
-from SpiffWorkflow.spiff.parser.task_spec import SpiffTaskParser, SubWorkflowParser, CallActivityParser, ServiceTaskParser, ScriptTaskParser
+from SpiffWorkflow.spiff.specs.business_rule_task import BusinessRuleTask
+from SpiffWorkflow.spiff.parser.task_spec import (
+    SpiffTaskParser,
+    SubWorkflowParser,
+    CallActivityParser,
+    ServiceTaskParser,
+    ScriptTaskParser,
+    BusinessRuleTaskParser
+)
 from SpiffWorkflow.spiff.parser.event_parsers import (SpiffStartEventParser, SpiffEndEventParser, SpiffBoundaryEventParser,
     SpiffIntermediateCatchEventParser, SpiffIntermediateThrowEventParser, SpiffSendTaskParser, SpiffReceiveTaskParser)
-from SpiffWorkflow.dmn.specs import BusinessRuleTask
+
 
 from SpiffWorkflow.spiff.parser.task_spec import BusinessRuleTaskParser
 
@@ -44,4 +53,3 @@ class SpiffBpmnParser(BpmnDmnParser):
         full_tag('receiveTask'): (SpiffReceiveTaskParser, ReceiveTask),
         full_tag('businessRuleTask'): (BusinessRuleTaskParser, BusinessRuleTask)
     }
-

SpiffWorkflow/spiff/parser/task_spec.py

@@ -1,11 +1,11 @@
 from lxml import etree
 
-from SpiffWorkflow.dmn.specs.BusinessRuleTask import BusinessRuleTask
 from SpiffWorkflow.bpmn.parser.TaskParser import TaskParser
 from SpiffWorkflow.bpmn.parser.task_parsers import SubprocessParser
 from SpiffWorkflow.bpmn.parser.util import xpath_eval
 
 from SpiffWorkflow.spiff.specs.multiinstance_task import StandardLoopTask, ParallelMultiInstanceTask, SequentialMultiInstanceTask
+from SpiffWorkflow.spiff.specs.business_rule_task import BusinessRuleTask
 
 SPIFFWORKFLOW_MODEL_NS = 'http://spiffworkflow.org/bpmn/schema/1.0/core'
 SPIFFWORKFLOW_MODEL_PREFIX = 'spiffworkflow'
@@ -169,13 +169,19 @@ class BusinessRuleTaskParser(SpiffTaskParser):
 
     def create_task(self):
         decision_ref = self.get_decision_ref(self.node)
-        return BusinessRuleTask(self.spec,
-                                self.get_task_spec_name(),
-                                dmnEngine=self.process_parser.parser.get_engine(decision_ref, self.node),
-                                lane=self.lane,
-                                position=self.position,
-                                description=self.node.get('name', None)
-                                )
+        extensions = self.parse_extensions()
+        prescript = extensions.get('preScript')
+        postscript = extensions.get('postScript')
+        return BusinessRuleTask(
+            self.spec,
+            self.get_task_spec_name(),
+            dmnEngine=self.process_parser.parser.get_engine(decision_ref, self.node),
+            lane=self.lane,
+            position=self.position,
+            description=self.node.get('name', None),
+            prescript=prescript,
+            postscript=postscript,
+        )
 
     @staticmethod
     def get_decision_ref(node):

SpiffWorkflow/spiff/serializer/config.py

@@ -32,6 +32,7 @@
     CallActivityTaskConverter,
     ParallelMultiInstanceTaskConverter,
     SequentialMultiInstanceTaskConverter,
+    BusinessRuleTaskConverter,
 )
 
 from SpiffWorkflow.bpmn.serializer.event_definition import MessageEventDefinitionConverter as DefaultMessageEventDefinitionConverter
@@ -66,6 +67,7 @@
     StandardLoopTaskConverter,
     ParallelMultiInstanceTaskConverter,
     SequentialMultiInstanceTaskConverter,
+    BusinessRuleTaskConverter
 ]
 SPIFF_SPEC_CONFIG['event_definitions'].remove(DefaultMessageEventDefinitionConverter)
 SPIFF_SPEC_CONFIG['event_definitions'].append(MessageEventDefinitionConverter)

SpiffWorkflow/spiff/serializer/task_spec.py

@@ -1,5 +1,6 @@
 from SpiffWorkflow.bpmn.serializer.helpers.spec import TaskSpecConverter
 from SpiffWorkflow.bpmn.serializer.task_spec import MultiInstanceTaskConverter
+from SpiffWorkflow.dmn.serializer.task_spec import BaseBusinessRuleTaskConverter
 
 from SpiffWorkflow.spiff.specs.none_task import NoneTask
 from SpiffWorkflow.spiff.specs.manual_task import ManualTask
@@ -9,6 +10,7 @@
 from SpiffWorkflow.spiff.specs.subworkflow_task import SubWorkflowTask, TransactionSubprocess, CallActivity
 from SpiffWorkflow.spiff.specs.events.event_types import SendTask, ReceiveTask
 from SpiffWorkflow.spiff.specs.multiinstance_task import StandardLoopTask, ParallelMultiInstanceTask, SequentialMultiInstanceTask
+from SpiffWorkflow.spiff.specs.business_rule_task import BusinessRuleTask
 
 
 class SpiffBpmnTaskConverter(TaskSpecConverter):
@@ -39,6 +41,16 @@ def __init__(self, registry):
         super().__init__(UserTask, registry)
 
 
+class BusinessRuleTaskConverter(BaseBusinessRuleTaskConverter, SpiffBpmnTaskConverter):
+    def __init__(self, registry):
+        super().__init__(BusinessRuleTask, registry)
+
+    def to_dict(self, spec):
+        dct = BaseBusinessRuleTaskConverter.to_dict(self, spec)
+        dct.update(SpiffBpmnTaskConverter.to_dict(self, spec))
+        return dct
+
+
 class SendTaskConverter(SpiffBpmnTaskConverter):
 
     def __init__(self, registry, typename=None):

SpiffWorkflow/spiff/specs/business_rule_task.py

@@ -0,0 +1,5 @@
+from SpiffWorkflow.spiff.specs.spiff_task import SpiffBpmnTask
+from SpiffWorkflow.dmn.specs.BusinessRuleTask import BusinessRuleTask as DefaultBusinessRuleTask
+
+class BusinessRuleTask(DefaultBusinessRuleTask, SpiffBpmnTask):
+    pass

tests/SpiffWorkflow/spiff/BaseTestCase.py

@@ -3,13 +3,10 @@
 
 from SpiffWorkflow.spiff.parser.process import SpiffBpmnParser, VALIDATOR
 from SpiffWorkflow.spiff.serializer.config import SPIFF_SPEC_CONFIG
-from SpiffWorkflow.dmn.serializer.task_spec import BusinessRuleTaskConverter
 from SpiffWorkflow.bpmn.serializer.workflow import BpmnWorkflowSerializer
 
 from tests.SpiffWorkflow.bpmn.BpmnWorkflowTestCase import BpmnWorkflowTestCase
 
-SPIFF_SPEC_CONFIG['task_specs'].append(BusinessRuleTaskConverter)
-
 wf_spec_converter = BpmnWorkflowSerializer.configure_workflow_spec_converter(SPIFF_SPEC_CONFIG)
 
 class BaseTestCase(BpmnWorkflowTestCase):

tests/SpiffWorkflow/spiff/BusinessRuleTaskTest.py

@@ -9,4 +9,4 @@ def testBusinessRule(self):
         self.workflow = BpmnWorkflow(spec, subprocesses)
         self.save_restore()
         self.workflow.do_engine_steps()
-        self.assertTrue(self.workflow.is_completed())
+        self.assertTrue(self.workflow.is_completed())