From 25b9cd074f42f197275854482558d95dff96bf1c Mon Sep 17 00:00:00 2001
From: ewuerger <ernst.wuerger@gmail.com>
Date: Thu, 19 Jan 2023 13:45:48 +0100
Subject: [PATCH] fix(aird): Add `ChangeEvent` expression text in label of
 `StateTransition`

---
 capellambse/aird/_edge_factories.py           | 29 +++++++++++++++++--
 .../melodymodel/5_2/Melody Model Test.aird    |  4 +--
 .../melodymodel/5_2/Melody Model Test.capella |  3 +-
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/capellambse/aird/_edge_factories.py b/capellambse/aird/_edge_factories.py
index 616b98d0a..a3bf5f957 100644
--- a/capellambse/aird/_edge_factories.py
+++ b/capellambse/aird/_edge_factories.py
@@ -9,6 +9,8 @@
 import math
 import typing as t
 
+from lxml import etree
+
 from capellambse import diagram, helpers
 
 from . import _common as C
@@ -474,9 +476,7 @@ def state_transition_factory(seb: C.SemanticElementBuilder) -> diagram.Edge:
             seb.melodyobjs[0], seb.melodyobjs[0].get("triggers", "")
         )
         label = ", ".join(
-            i.get("name", "(unnamed trigger)")
-            for i in triggers
-            if i is not None
+            _get_trigger_expression(i, seb) for i in triggers if i is not None
         )
 
         if guard := _guard_condition(seb, "guard"):
@@ -495,6 +495,29 @@ def state_transition_factory(seb: C.SemanticElementBuilder) -> diagram.Edge:
     return edge
 
 
+def _get_trigger_expression(
+    trigger: etree._Element, seb: C.SemanticElementBuilder
+) -> str:
+    exprid = trigger.get("expression")
+    if not exprid:
+        return ""
+
+    change_event_type = trigger.attrib[helpers.ATT_XT]
+    if change_event_type.endswith("TimeEvent"):
+        kind = trigger.get("kind", "AT")
+    elif change_event_type.endswith("ChangeEvent"):
+        kind = trigger.get("kind", "WHEN")
+
+    constraint = seb.melodyloader.follow_link(seb.melodyobjs[0], exprid)
+    try:
+        spec = next(constraint.iterchildren("ownedSpecification"))
+        body = next(spec.iterchildren("bodies"))
+    except StopIteration:
+        return ""
+
+    return f"({kind}) {body.text}"
+
+
 def sequence_link_factory(seb: C.SemanticElementBuilder) -> diagram.Edge:
     """Create a SequenceLink.
 
diff --git a/tests/data/melodymodel/5_2/Melody Model Test.aird b/tests/data/melodymodel/5_2/Melody Model Test.aird
index b1549ab89..5a56fb70f 100644
--- a/tests/data/melodymodel/5_2/Melody Model Test.aird	
+++ b/tests/data/melodymodel/5_2/Melody Model Test.aird	
@@ -12,7 +12,7 @@
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']"/>
         <target xmi:type="org.polarsys.capella.core.data.capellacommon:Region" href="Melody%20Model%20Test.capella#eeeb98a7-6063-4115-8b4b-40a51cc0df49"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_KLGoEKyJEeqCdMaqCWkrKg" name="[MSM] Weather Modes" repPath="#_KK2wcKyJEeqCdMaqCWkrKg" changeId="ad7ad644-891d-4133-bfa7-a2428cafaa7a">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_KLGoEKyJEeqCdMaqCWkrKg" name="[MSM] Weather Modes" repPath="#_KK2wcKyJEeqCdMaqCWkrKg" changeId="2ecc9bed-c64f-436c-86e3-daa962188a17">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']"/>
         <target xmi:type="org.polarsys.capella.core.data.capellacommon:Region" href="Melody%20Model%20Test.capella#a94806d8-71bb-4eb8-987b-bdce6ca99cb8"/>
       </ownedRepresentationDescriptors>
@@ -1905,7 +1905,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/common.odesign#//@ownedViewpoints[name='Common']/@ownedRepresentations[name='Mode%20State%20Machine']/@defaultLayer/@edgeMappings[name='MSM_Transition']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_uoAC9KyJEeqCdMaqCWkrKg" name="(AT) Night, (WHEN) Sleeping [SUN = 0] " sourceNode="_o9NqYKyJEeqCdMaqCWkrKg" targetNode="_p-qgUKyJEeqCdMaqCWkrKg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_uoAC9KyJEeqCdMaqCWkrKg" name="(AFTER) Night, (WHEN) Sleeping [SUN = 0] " sourceNode="_o9NqYKyJEeqCdMaqCWkrKg" targetNode="_p-qgUKyJEeqCdMaqCWkrKg">
       <target xmi:type="org.polarsys.capella.core.data.capellacommon:StateTransition" href="Melody%20Model%20Test.capella#d0ea4afa-4231-4a3d-b1db-03655738dab8"/>
       <semanticElements xmi:type="org.polarsys.capella.core.data.capellacommon:StateTransition" href="Melody%20Model%20Test.capella#d0ea4afa-4231-4a3d-b1db-03655738dab8"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_uoAC9ayJEeqCdMaqCWkrKg" strokeColor="0,0,0">
diff --git a/tests/data/melodymodel/5_2/Melody Model Test.capella b/tests/data/melodymodel/5_2/Melody Model Test.capella
index f8113e57e..7499686ca 100644
--- a/tests/data/melodymodel/5_2/Melody Model Test.capella	
+++ b/tests/data/melodymodel/5_2/Melody Model Test.capella	
@@ -764,7 +764,8 @@ The predator is far away</bodies>
           </ownedConstraints>
         </ownedStateEvents>
         <ownedStateEvents xsi:type="org.polarsys.capella.core.data.capellacommon:TimeEvent"
-            id="680f13b6-c446-4510-974f-0de9da6bd2be" name="TimeEvent 3" expression="#20925467-cfbf-47bc-bad6-ad842973f4d4">
+            id="680f13b6-c446-4510-974f-0de9da6bd2be" name="TimeEvent 3" expression="#20925467-cfbf-47bc-bad6-ad842973f4d4"
+            kind="AFTER">
           <ownedConstraints xsi:type="org.polarsys.capella.core.data.capellacore:Constraint"
               id="20925467-cfbf-47bc-bad6-ad842973f4d4" name="">
             <ownedSpecification xsi:type="org.polarsys.capella.core.data.information.datavalue:OpaqueExpression"