🐛 adjust outgoing and incoming nodes

Author: Charizhardt

src/processpiper/bpmn.py

@@ -243,28 +243,57 @@ def _add_sub_element(self, parent: ET.Element, bpmn_element: str, shape: Any):
             )
 
             # *** Generate bpmn:outgoing and bpmn:incoming elements ***
-            if shape.connection_to is not None:
-                for connection in shape.connection_to:
-                    # Check if connection is of type Connection
-                    if isinstance(connection, Connection):
-                        # Use the bpmn_id of the target as the target is a Connection which references a different shape
-                        if connection.target is not None:
-                            ET.SubElement(element, "bpmn:outgoing").text = connection.target.bpmn_id
-                    else:
-                        # The bpmn_id can be used directly as the target is one of:
-                        # Activity, Event or Gateway
-                        ET.SubElement(element, "bpmn:outgoing").text = connection.bpmn_id
-            if shape.connection_from is not None:
-                for connection in shape.connection_from:
-                    # Check if connection is of type Connection
-                    if isinstance(connection, Connection):
-                        # Use the bpmn_id of the source as the source is a Connection which references a different shape
-                        if connection.source is not None:
-                            ET.SubElement(element, "bpmn:incoming").text = connection.source.bpmn_id
-                    else:
-                        # The bpmn_id can be used directly as the source is one of:
-                        # Activity, Event or Gateway
-                        ET.SubElement(element, "bpmn:incoming").text = connection.bpmn_id
+            #
+            # The following shapes are considered:
+            # - startEvent
+            # - endEvent
+            # - intermediateCatchEvent
+            # - task
+            # - subProcess
+            # - serviceTask
+            # - exclusiveGateway
+            # - inclusiveGateway
+            # - parallelGateway
+            #
+            # The following shapes are ignored:
+            # - timerEventDefinition        (nested under startEvent, intermediateCatchEvent or endEvent)
+            # - messageEventDefinition      (nested under startEvent, intermediateCatchEvent or endEvent)
+            # - signalEventDefinition       (nested under startEvent, intermediateCatchEvent or endEvent)
+            # - conditionalEventDefinition  (nested under startEvent, intermediateCatchEvent or endEvent)
+            # - linkEventDefinition         (nested under startEvent, intermediateCatchEvent or endEvent)
+            if (
+                    isinstance(shape, Start)
+                    or isinstance(shape, End)
+                    or isinstance(shape, Intermediate)
+                    or isinstance(shape, Task)
+                    or isinstance(shape, Subprocess)
+                    or isinstance(shape, ServiceTask)
+                    or isinstance(shape, Exclusive)
+                    or isinstance(shape, Inclusive)
+                    or isinstance(shape, Parallel)
+            ):
+                if shape.connection_to is not None:
+                    for connection in shape.connection_to:
+                        # Check if connection is of type Connection
+                        if isinstance(connection, Connection):
+                            # Use the bpmn_id of the target as the target is a Connection which references a different shape
+                            if connection.target is not None:
+                                ET.SubElement(element, "bpmn:outgoing").text = connection.target.bpmn_id
+                        else:
+                            # The bpmn_id can be used directly as the target is one of:
+                            # Activity, Event or Gateway
+                            ET.SubElement(element, "bpmn:outgoing").text = connection.bpmn_id
+                if shape.connection_from is not None:
+                    for connection in shape.connection_from:
+                        # Check if connection is of type Connection
+                        if isinstance(connection, Connection):
+                            # Use the bpmn_id of the source as the source is a Connection which references a different shape
+                            if connection.source is not None:
+                                ET.SubElement(element, "bpmn:incoming").text = connection.source.bpmn_id
+                        else:
+                            # The bpmn_id can be used directly as the source is one of:
+                            # Activity, Event or Gateway
+                            ET.SubElement(element, "bpmn:incoming").text = connection.bpmn_id
             return element
         else:
             return ET.SubElement(parent, bpmn_element, {"id": Helper.get_uuid()})