add correlation keys to process variable correlations

Author: essweine

SpiffWorkflow/bpmn/specs/event_definitions/message.py

@@ -71,10 +71,6 @@ def calculate_correlations(self, script_engine, cp, ctx):
                 except WorkflowException:
                     # Just ignore missing keys.  The dictionaries have to match exactly
                     pass
-            if len(prop.correlation_keys) == 0:
-                if self.name not in correlations:
-                    correlations[self.name] = {}
-                correlations[self.name][prop.name] = value
         return correlations
 
     def details(self, my_task):

SpiffWorkflow/spiff/parser/event_parsers.py

@@ -55,7 +55,10 @@ def parse_process_correlations(self, node):
         for prop in node.xpath('.//spiffworkflow:processVariableCorrelation', namespaces=SPIFFWORKFLOW_NSMAP):
             key = one(prop.xpath('./spiffworkflow:propertyId', namespaces=SPIFFWORKFLOW_NSMAP))
             expression = one(prop.xpath('./spiffworkflow:expression', namespaces=SPIFFWORKFLOW_NSMAP))
-            correlations.append(CorrelationProperty(key.text, expression.text, []))
+            used_by = []
+            for ck in self.xpath(f"//bpmn:collaboration//bpmn:correlationPropertyRef[text()='{key.text}']"):
+                used_by.append(ck.getparent().attrib['name'])
+            correlations.append(CorrelationProperty(key.text, expression.text, used_by))
         return correlations
 
     def parse_message_event(self, message_event):

tests/SpiffWorkflow/spiff/CorrelationTest.py

@@ -74,7 +74,7 @@ def actual_test(self, save_restore=False):
         task.data.update(value_1='a', value_2='b')
         task.run()
         self.workflow.do_engine_steps()
-        self.assertEqual(self.workflow.correlations, {'message': {'prop_1': 'a', 'prop_2': 'b'}})
+        self.assertEqual(self.workflow.correlations, {'test': {'prop_1': 'a', 'prop_2': 'b'}})
         waiting_task = self.workflow.get_next_task(state=TaskState.WAITING)
         event_def = waiting_task.task_spec.event_definition
         payload = {'msg_value_1': 'a', 'msg_value_2': 'b'}

tests/SpiffWorkflow/spiff/data/receive_correlations.bpmn

@@ -32,6 +32,13 @@
       </bpmn:messageEventDefinition>
     </bpmn:intermediateCatchEvent>
   </bpmn:process>
+  <bpmn:collaboration id="receive_correlation_test">
+    <bpmn:participant id="collaboration" processRef="correlation-test" />
+    <bpmn:correlationKey name="test">
+      <bpmn:correlationPropertyRef>prop_1</bpmn:correlationPropertyRef>
+      <bpmn:correlationPropertyRef>prop_2</bpmn:correlationPropertyRef>
+    </bpmn:correlationKey>
+  </bpmn:collaboration>
   <bpmn:message id="Message_16t6tet" name="message" />
   <bpmn:correlationProperty id="prop_1" name="prop_1">
     <bpmn:correlationPropertyRetrievalExpression messageRef="Message_16t6tet">