Merge pull request #434 from sartography/get-emerson-working

hack to get messages working
sartography · Feb 25, 2025 · fb484fc · fb484fc
2 parents 15f4eec + e380fe7
commit fb484fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/SpiffWorkflow/bpmn/specs/event_definitions/message.py b/SpiffWorkflow/bpmn/specs/event_definitions/message.py
@@ -28,7 +28,7 @@ def catches(self, my_task, event):
             correlated = True
         else:
             # Otherwise we have to check to make sure any existing keys match
-            correlated = all([event.correlations.get(key) == correlations.get(key) for key in event.correlations ])
+            correlated = any([event.correlations.get(key) == correlations.get(key) for key in event.correlations ])
         return self == event.event_definition and correlated
 
     def catch(self, my_task, event=None):

diff --git a/tests/SpiffWorkflow/bpmn/CollaborationTest.py b/tests/SpiffWorkflow/bpmn/CollaborationTest.py
@@ -60,9 +60,11 @@ def testBpmnMessage(self):
         self.assertEqual('from_name', events[0].value[0].retrieval_expression)
         self.assertEqual('lover_name', events[0].value[0].name)
 
+        payload = {'from_name': 'Peggy', 'other_nonsense': 1001}
         message = BpmnEvent(
             receive.task_spec.event_definition,
-            {'from_name': 'Peggy', 'other_nonsense': 1001}
+            payload,
+            receive.task_spec.event_definition.get_correlations(receive, payload),
         )
         self.workflow.send_event(message)
         self.workflow.do_engine_steps()