feat(scripted-alarms): DeploymentArtifact byte-parity for the alarm plan (T6)

2026-06-10 14:41:46 -04:00
parent 55101baaa4
commit 8e8ca9efe8
4 changed files with 376 additions and 45 deletions
@@ -195,11 +195,13 @@ public static class DeploymentArtifact
            var galaxyTags = BuildGalaxyTagPlans(root, drivers);
            var equipmentTags = BuildEquipmentTagPlans(root);
            var equipmentVirtualTags = BuildEquipmentVirtualTagPlans(root, equipmentTags);
+            var equipmentScriptedAlarms = BuildEquipmentScriptedAlarmPlans(root);

            return new Phase7CompositionResult(areas, lines, equipment, drivers, alarms, galaxyTags)
            {
                EquipmentTags = equipmentTags,
                EquipmentVirtualTags = equipmentVirtualTags,
+                EquipmentScriptedAlarms = equipmentScriptedAlarms,
            };
        }
        catch (JsonException)
@@ -261,6 +263,7 @@ public static class DeploymentArtifact
        {
            EquipmentTags = full.EquipmentTags.Where(t => sets.DriverIds.Contains(t.DriverInstanceId)).ToArray(),
            EquipmentVirtualTags = full.EquipmentVirtualTags.Where(v => sets.EquipmentIds.Contains(v.EquipmentId)).ToArray(),
+            EquipmentScriptedAlarms = full.EquipmentScriptedAlarms.Where(a => sets.EquipmentIds.Contains(a.EquipmentId)).ToArray(),
        };
    }

@@ -606,6 +609,87 @@ public static class DeploymentArtifact
        return result;
    }

+    /// <summary>
+    ///     Join the artifact's ScriptedAlarms array to its Scripts array (by PredicateScriptId) to emit
+    ///     one <see cref="EquipmentScriptedAlarmPlan"/> per alarm. The artifact-decode mirror of
+    ///     <c>Phase7Composer.Compose</c>'s scripted-alarm producer — so the compose-side + artifact-decode
+    ///     plans agree byte-for-byte. An alarm whose <c>PredicateScriptId</c> has no matching Script row is
+    ///     SKIPPED (matching the composer's skip behaviour) to preserve parity. <c>PredicateSource</c> = the
+    ///     joined script source ("" when missing — but such alarms are skipped above); <c>DependencyRefs</c>
+    ///     = the shared <see cref="EquipmentScriptPaths.ExtractAlarmDependencyRefs"/> merge of the predicate's
+    ///     distinct <c>ctx.GetTag("…")</c> reads UNION the message template's <c>{TagPath}</c> tokens. Scripted
+    ///     alarms do NOT use <c>{{equip}}</c> substitution (only virtual tags do) — the predicate source is
+    ///     used as-is. Ordered by EquipmentId then ScriptedAlarmId to match the composer's deterministic order.
+    /// </summary>
+    private static IReadOnlyList<EquipmentScriptedAlarmPlan> BuildEquipmentScriptedAlarmPlans(JsonElement root)
+    {
+        if (!root.TryGetProperty("ScriptedAlarms", out var alarmsArr) || alarmsArr.ValueKind != JsonValueKind.Array)
+            return Array.Empty<EquipmentScriptedAlarmPlan>();
+
+        // scriptId → SourceCode (the predicate source the alarm host evaluates). Same join the
+        // VirtualTag builder uses; an alarm whose PredicateScriptId is absent here is skipped below.
+        var scriptSourceById = new Dictionary<string, string>(StringComparer.Ordinal);
+        if (root.TryGetProperty("Scripts", out var scriptsArr) && scriptsArr.ValueKind == JsonValueKind.Array)
+        {
+            foreach (var el in scriptsArr.EnumerateArray())
+            {
+                if (el.ValueKind != JsonValueKind.Object) continue;
+                var sid = el.TryGetProperty("ScriptId", out var sidEl) ? sidEl.GetString() : null;
+                if (string.IsNullOrWhiteSpace(sid)) continue;
+                var src = el.TryGetProperty("SourceCode", out var srcEl) && srcEl.ValueKind == JsonValueKind.String
+                    ? srcEl.GetString() : null;
+                scriptSourceById[sid!] = src ?? string.Empty;
+            }
+        }
+
+        var result = new List<EquipmentScriptedAlarmPlan>(alarmsArr.GetArrayLength());
+        foreach (var el in alarmsArr.EnumerateArray())
+        {
+            if (el.ValueKind != JsonValueKind.Object) continue;
+            var scriptedAlarmId = el.TryGetProperty("ScriptedAlarmId", out var idEl) ? idEl.GetString() : null;
+            var equipmentId = el.TryGetProperty("EquipmentId", out var eqEl) ? eqEl.GetString() : null;
+            var name = el.TryGetProperty("Name", out var nmEl) ? nmEl.GetString() : null;
+            var alarmType = el.TryGetProperty("AlarmType", out var atEl) ? atEl.GetString() : null;
+            var severity = el.TryGetProperty("Severity", out var svEl) && svEl.TryGetInt32(out var sv) ? sv : 0;
+            var messageTemplate = el.TryGetProperty("MessageTemplate", out var mtEl) ? mtEl.GetString() : null;
+            var predicateScriptId = el.TryGetProperty("PredicateScriptId", out var psEl) ? psEl.GetString() : null;
+            var historize = el.TryGetProperty("HistorizeToAveva", out var hEl) && hEl.ValueKind != JsonValueKind.Null
+                ? hEl.GetBoolean() : false;
+            var retain = el.TryGetProperty("Retain", out var rEl) && rEl.ValueKind != JsonValueKind.Null
+                ? rEl.GetBoolean() : false;
+            var enabled = el.TryGetProperty("Enabled", out var enEl) && enEl.ValueKind != JsonValueKind.Null
+                ? enEl.GetBoolean() : false;
+
+            if (string.IsNullOrWhiteSpace(scriptedAlarmId)) continue;
+
+            // Skip alarms whose predicate script is missing — matching Phase7Composer's skip behaviour
+            // so both sides emit the same set (byte-parity).
+            if (predicateScriptId is null || !scriptSourceById.TryGetValue(predicateScriptId, out var source))
+                continue;
+
+            result.Add(new EquipmentScriptedAlarmPlan(
+                ScriptedAlarmId: scriptedAlarmId!,
+                EquipmentId: equipmentId ?? string.Empty,
+                Name: name ?? string.Empty,
+                AlarmType: alarmType ?? string.Empty,
+                Severity: severity,
+                MessageTemplate: messageTemplate ?? string.Empty,
+                PredicateScriptId: predicateScriptId,
+                PredicateSource: source,
+                DependencyRefs: EquipmentScriptPaths.ExtractAlarmDependencyRefs(source, messageTemplate),
+                HistorizeToAveva: historize,
+                Retain: retain,
+                Enabled: enabled));
+        }
+
+        result.Sort((a, b) =>
+        {
+            var byEquipment = string.CompareOrdinal(a.EquipmentId, b.EquipmentId);
+            return byEquipment != 0 ? byEquipment : string.CompareOrdinal(a.ScriptedAlarmId, b.ScriptedAlarmId);
+        });
+        return result;
+    }
+
    /// <summary>
    ///     Extract the driver-side full reference from a tag's TagConfig JSON (top-level "FullName"
    ///     field). The artifact-decode mirror of <c>Phase7Composer.ExtractTagFullName</c> /