feat(communication): map enriched alarm fields across gRPC (server + client)

tests/ZB.MOM.WW.ScadaBridge.Communication.Tests/Grpc/SiteStreamGrpcClientTests.cs

@@ -40,16 +40,31 @@ public class SiteStreamGrpcClientTests
     public void ConvertToDomainEvent_AlarmChanged_MapsCorrectly()
     {
         var ts = DateTimeOffset.UtcNow;
+        var raiseTime = ts.AddMinutes(-30);
         var evt = new SiteStreamEvent
         {
             CorrelationId = "corr-2",
             AlarmChanged = new AlarmStateUpdate
             {
                 InstanceUniqueName = "Site1.Motor01",
-                AlarmName = "OverTemp",
+                AlarmName = "T01.Hi",
                 State = AlarmStateEnum.AlarmStateActive,
-                Priority = 3,
-                Timestamp = Timestamp.FromDateTimeOffset(ts)
+                Priority = 850,
+                Timestamp = Timestamp.FromDateTimeOffset(ts),
+                Kind = "NativeOpcUa",
+                Active = true,
+                Acknowledged = false,
+                Confirmed = false,
+                ShelveState = "TimedShelved",
+                Suppressed = true,
+                SourceReference = "T01.Hi",
+                AlarmTypeName = "AnalogLimit.Hi",
+                Category = "Process",
+                OperatorUser = "op2",
+                OperatorComment = "shelved",
+                OriginalRaiseTime = Timestamp.FromDateTimeOffset(raiseTime),
+                CurrentValue = "120",
+                LimitValue = "100"
             }
         };
 
@@ -57,10 +72,26 @@ public class SiteStreamGrpcClientTests
 
         var alarm = Assert.IsType<AlarmStateChanged>(result);
         Assert.Equal("Site1.Motor01", alarm.InstanceUniqueName);
-        Assert.Equal("OverTemp", alarm.AlarmName);
+        Assert.Equal("T01.Hi", alarm.AlarmName);
         Assert.Equal(AlarmState.Active, alarm.State);
-        Assert.Equal(3, alarm.Priority);
+        Assert.Equal(850, alarm.Priority);
         Assert.Equal(ts, alarm.Timestamp);
+
+        // Native enrichment mapped back.
+        Assert.Equal(AlarmKind.NativeOpcUa, alarm.Kind);
+        Assert.True(alarm.Condition.Active);
+        Assert.False(alarm.Condition.Acknowledged);
+        Assert.Equal(AlarmShelveState.TimedShelved, alarm.Condition.Shelve);
+        Assert.True(alarm.Condition.Suppressed);
+        Assert.Equal(850, alarm.Condition.Severity);
+        Assert.Equal("T01.Hi", alarm.SourceReference);
+        Assert.Equal("AnalogLimit.Hi", alarm.AlarmTypeName);
+        Assert.Equal("Process", alarm.Category);
+        Assert.Equal("op2", alarm.OperatorUser);
+        Assert.Equal("shelved", alarm.OperatorComment);
+        Assert.Equal(raiseTime, alarm.OriginalRaiseTime);
+        Assert.Equal("120", alarm.CurrentValue);
+        Assert.Equal("100", alarm.LimitValue);
     }
 
     [Fact]

tests/ZB.MOM.WW.ScadaBridge.Communication.Tests/Grpc/StreamRelayActorTests.cs

@@ -3,6 +3,7 @@ using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using Google.Protobuf.WellKnownTypes;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.Streaming;
+using ZB.MOM.WW.ScadaBridge.Commons.Types.Alarms;
 using ZB.MOM.WW.ScadaBridge.Commons.Types.Enums;
 using ZB.MOM.WW.ScadaBridge.Communication.Actors;
 using ZB.MOM.WW.ScadaBridge.Communication.Grpc;
@@ -57,8 +58,23 @@ public class StreamRelayActorTests : TestKit
             new StreamRelayActor(correlationId, channel.Writer)));
 
         var timestamp = new DateTimeOffset(2026, 3, 21, 11, 0, 0, TimeSpan.Zero);
+        var raiseTime = new DateTimeOffset(2026, 3, 21, 10, 0, 0, TimeSpan.Zero);
         var domainEvent = new AlarmStateChanged(
-            "Site1.Pump01", "HighPressure", AlarmState.Active, 2, timestamp);
+            "Site1.Pump01", "T01.Hi", AlarmState.Active, 900, timestamp)
+        {
+            Kind = AlarmKind.NativeMxAccess,
+            SourceReference = "T01.Hi",
+            AlarmTypeName = "AnalogLimit.Hi",
+            Category = "Process",
+            OperatorUser = "op1",
+            OperatorComment = "ack",
+            OriginalRaiseTime = raiseTime,
+            CurrentValue = "92",
+            LimitValue = "90",
+            Condition = new AlarmConditionState(
+                Active: true, Acknowledged: true, Confirmed: null,
+                Shelve: AlarmShelveState.OneShotShelved, Suppressed: false, Severity: 900)
+        };
 
         actor.Tell(domainEvent);
 
@@ -76,10 +92,25 @@ public class StreamRelayActorTests : TestKit
 
         var alarm = protoEvent.AlarmChanged;
         Assert.Equal("Site1.Pump01", alarm.InstanceUniqueName);
-        Assert.Equal("HighPressure", alarm.AlarmName);
+        Assert.Equal("T01.Hi", alarm.AlarmName);
         Assert.Equal(AlarmStateEnum.AlarmStateActive, alarm.State);
-        Assert.Equal(2, alarm.Priority);
+        Assert.Equal(900, alarm.Priority);
         Assert.Equal(Timestamp.FromDateTimeOffset(timestamp), alarm.Timestamp);
+
+        // Native enrichment mapped out.
+        Assert.Equal("NativeMxAccess", alarm.Kind);
+        Assert.True(alarm.Active);
+        Assert.True(alarm.Acknowledged);
+        Assert.Equal("OneShotShelved", alarm.ShelveState);
+        Assert.False(alarm.Suppressed);
+        Assert.Equal("T01.Hi", alarm.SourceReference);
+        Assert.Equal("AnalogLimit.Hi", alarm.AlarmTypeName);
+        Assert.Equal("Process", alarm.Category);
+        Assert.Equal("op1", alarm.OperatorUser);
+        Assert.Equal("ack", alarm.OperatorComment);
+        Assert.Equal(Timestamp.FromDateTimeOffset(raiseTime), alarm.OriginalRaiseTime);
+        Assert.Equal("92", alarm.CurrentValue);
+        Assert.Equal("90", alarm.LimitValue);
     }
 
     [Fact]