feat(dcl): populate obtainable NativeAlarmTransition fields from OPC UA and MxGateway (#27, M2.13)

OPC UA (RealOpcUaClient): - Append 5 new SelectClauses at indices 13–17 (never renumber 0–12): - 13: AlarmConditionType/ActiveState/TransitionTime → OriginalRaiseTime - 14–17: LimitAlarmType HighHighLimit/HighLimit/LowLimit/LowLowLimit → LimitValue - New OpcUaAlarmMapper.PickLimitValue helper: first non-null in HiHi→Hi→Lo→LoLo priority order, InvariantCulture-formatted; empty string for non-limit alarm types. - HandleAlarmEvent reads new indices with fields.Count > N guards; hard minimum (6) unchanged so base ConditionType events still process without the limit fields. - Document unavailable-by-protocol fields (Category, Description, OperatorUser, CurrentValue) inline in BuildAlarmEventFilter and HandleAlarmEvent. MxGateway (MxGatewayAlarmMapper): - MapTransition: CurrentValue and LimitValue now populated via MxValueToString (uses MxValueExtensions.ToClrValue + InvariantCulture) from OnAlarmTransitionEvent proto fields current_value/limit_value. - MapSnapshot: same — populated from ActiveAlarmSnapshot.current_value/limit_value. - MxValueToString helper (internal): null-safe MxValue → string conversion. Tests (17 new, 40 total pass): - OpcUaAlarmMapperTests: PickLimitValue priority, InvariantCulture, all-null case. - MxGatewayAlarmMapperTests: CurrentValue/LimitValue populate from double/string MxValue; absent fields yield empty strings. - RealOpcUaClientAlarmFilterTests: index alignment assertions (count=18, per-index TypeDefinitionId+BrowsePath), regression guard on existing indices 0–12.
2026-06-16 06:37:19 -04:00
parent e2b31a9fd2
commit 722b8663c1
8 changed files with 338 additions and 9 deletions
@@ -1,3 +1,4 @@
+using ZB.MOM.WW.MxGateway.Client;
 using ZB.MOM.WW.MxGateway.Contracts.Proto;
 using ZB.MOM.WW.ScadaBridge.DataConnectionLayer.Adapters;
 using CommonsTransitionKind = ZB.MOM.WW.ScadaBridge.Commons.Types.Enums.AlarmTransitionKind;
@@ -63,4 +64,91 @@ public class MxGatewayAlarmMapperTests
        Assert.False(t.Condition.Acknowledged);
        Assert.Equal(1000, t.Condition.Severity);
    }
+
+    // ── CurrentValue / LimitValue (M2.13 / #27) ──────────────────────────────
+
+    [Fact]
+    public void MapTransition_CurrentAndLimitValue_PopulatedFromProto()
+    {
+        // The gateway proto OnAlarmTransitionEvent carries current_value and
+        // limit_value as MxValue union fields.  Verify both are mapped through
+        // MxValueToString into the neutral NativeAlarmTransition strings.
+        var ev = new OnAlarmTransitionEvent
+        {
+            AlarmFullReference = "Tank01.Level.HiHi",
+            SourceObjectReference = "Tank01",
+            AlarmTypeName = "AnalogLimitAlarm.HiHi",
+            TransitionKind = ProtoTransitionKind.Raise,
+            Severity = 800,
+            CurrentValue = 95.3.ToMxValue(),
+            LimitValue = 90.0.ToMxValue()
+        };
+
+        var t = MxGatewayAlarmMapper.MapTransition(ev);
+
+        Assert.Equal("95.3", t.CurrentValue);
+        Assert.Equal("90", t.LimitValue);
+    }
+
+    [Fact]
+    public void MapTransition_AbsentCurrentAndLimitValue_YieldsEmpty()
+    {
+        // When the gateway sends events without current/limit value fields (optional),
+        // the resulting transition must have empty strings — never null.
+        var ev = new OnAlarmTransitionEvent
+        {
+            AlarmFullReference = "Tank01.Level.Hi",
+            SourceObjectReference = "Tank01",
+            AlarmTypeName = "AnalogLimitAlarm.Hi",
+            TransitionKind = ProtoTransitionKind.Raise,
+            Severity = 600
+            // CurrentValue and LimitValue not set → proto default (null reference)
+        };
+
+        var t = MxGatewayAlarmMapper.MapTransition(ev);
+
+        Assert.Equal("", t.CurrentValue);
+        Assert.Equal("", t.LimitValue);
+    }
+
+    [Fact]
+    public void MapSnapshot_CurrentAndLimitValue_PopulatedFromProto()
+    {
+        // ActiveAlarmSnapshot also carries current_value and limit_value.
+        var snap = new ActiveAlarmSnapshot
+        {
+            AlarmFullReference = "Pump01.Vibration.HiHi",
+            SourceObjectReference = "Pump01",
+            AlarmTypeName = "AnalogLimitAlarm.HiHi",
+            CurrentState = ProtoConditionState.Active,
+            Severity = 900,
+            CurrentValue = 12.7.ToMxValue(),
+            LimitValue = 10.0.ToMxValue()
+        };
+
+        var t = MxGatewayAlarmMapper.MapSnapshot(snap);
+
+        Assert.Equal("12.7", t.CurrentValue);
+        Assert.Equal("10", t.LimitValue);
+    }
+
+    [Fact]
+    public void MapSnapshot_StringMxValue_ProducesStringCurrentValue()
+    {
+        // MxValue can carry string values (e.g. for discrete/string-type tags).
+        var snap = new ActiveAlarmSnapshot
+        {
+            AlarmFullReference = "Mode.Alarm",
+            SourceObjectReference = "Mode",
+            AlarmTypeName = "DiscreteAlarm",
+            CurrentState = ProtoConditionState.Active,
+            Severity = 500,
+            CurrentValue = "FAULT".ToMxValue()
+        };
+
+        var t = MxGatewayAlarmMapper.MapSnapshot(snap);
+
+        Assert.Equal("FAULT", t.CurrentValue);
+        Assert.Equal("", t.LimitValue); // not set
+    }
 }