Three layers were each blind to nested composition in different ways: - FlatteningPipeline only loaded compositions for templates in the parent's inheritance chain, so depth-2 composed attributes (e.g. Pump.AlarmSensor.SensorReading) never materialized. Walk composed chains breadth-first so the flattener's nested step has the data it needs. - InstanceConfigure's alarm trigger picker was fed only direct, non-locked attributes, hiding inherited and composed-member paths. Feed it the full flattened attribute list via FlatteningPipeline. - ValidationService.ExtractAttributeNameFromTriggerConfig only recognized "attributeName", silently passing alarms still using the legacy "attribute" key. Accept both keys, matching FlatteningService, AlarmActor, and AlarmTriggerConfigCodec.
143 lines
5.8 KiB
C#
143 lines
5.8 KiB
C#
using ScadaLink.Commons.Entities.Sites;
|
|
using ScadaLink.Commons.Interfaces.Repositories;
|
|
using ScadaLink.Commons.Types;
|
|
using ScadaLink.Commons.Types.Flattening;
|
|
using ScadaLink.TemplateEngine.Flattening;
|
|
using ScadaLink.TemplateEngine.Validation;
|
|
|
|
namespace ScadaLink.DeploymentManager;
|
|
|
|
/// <summary>
|
|
/// Orchestrates the TemplateEngine services (FlatteningService, ValidationService, RevisionHashService)
|
|
/// into a single pipeline for deployment use.
|
|
///
|
|
/// WP-16: This captures template state at the time of flatten, ensuring that concurrent template edits
|
|
/// (last-write-wins) do not conflict with in-progress deployments.
|
|
/// </summary>
|
|
public class FlatteningPipeline : IFlatteningPipeline
|
|
{
|
|
private readonly ITemplateEngineRepository _templateRepo;
|
|
private readonly ISiteRepository _siteRepo;
|
|
private readonly FlatteningService _flatteningService;
|
|
private readonly ValidationService _validationService;
|
|
private readonly RevisionHashService _revisionHashService;
|
|
|
|
public FlatteningPipeline(
|
|
ITemplateEngineRepository templateRepo,
|
|
ISiteRepository siteRepo,
|
|
FlatteningService flatteningService,
|
|
ValidationService validationService,
|
|
RevisionHashService revisionHashService)
|
|
{
|
|
_templateRepo = templateRepo;
|
|
_siteRepo = siteRepo;
|
|
_flatteningService = flatteningService;
|
|
_validationService = validationService;
|
|
_revisionHashService = revisionHashService;
|
|
}
|
|
|
|
public async Task<Result<FlatteningPipelineResult>> FlattenAndValidateAsync(
|
|
int instanceId,
|
|
CancellationToken cancellationToken = default)
|
|
{
|
|
// Load instance with full graph
|
|
var instance = await _templateRepo.GetInstanceByIdAsync(instanceId, cancellationToken);
|
|
if (instance == null)
|
|
return Result<FlatteningPipelineResult>.Failure($"Instance with ID {instanceId} not found.");
|
|
|
|
// Build template chain
|
|
var templateChain = await BuildTemplateChainAsync(instance.TemplateId, cancellationToken);
|
|
if (templateChain.Count == 0)
|
|
return Result<FlatteningPipelineResult>.Failure("Template chain is empty.");
|
|
|
|
// Build composition maps, walking nested compositions so the flattener
|
|
// can resolve composed-of-composed attributes / alarms / scripts (e.g.
|
|
// a parent that composes Pump where Pump itself composes AlarmSensor
|
|
// produces "Pump.AlarmSensor.SensorReading").
|
|
var compositionMap = new Dictionary<int, IReadOnlyList<Commons.Entities.Templates.TemplateComposition>>();
|
|
var composedChains = new Dictionary<int, IReadOnlyList<Commons.Entities.Templates.Template>>();
|
|
var processedTemplateIds = new HashSet<int>();
|
|
var pendingChains = new Queue<IReadOnlyList<Commons.Entities.Templates.Template>>();
|
|
|
|
pendingChains.Enqueue(templateChain);
|
|
while (pendingChains.Count > 0)
|
|
{
|
|
var chain = pendingChains.Dequeue();
|
|
foreach (var template in chain)
|
|
{
|
|
if (!processedTemplateIds.Add(template.Id)) continue;
|
|
|
|
var compositions = await _templateRepo.GetCompositionsByTemplateIdAsync(template.Id, cancellationToken);
|
|
if (compositions.Count == 0) continue;
|
|
|
|
compositionMap[template.Id] = compositions;
|
|
foreach (var comp in compositions)
|
|
{
|
|
if (composedChains.ContainsKey(comp.ComposedTemplateId)) continue;
|
|
|
|
var composedChain = await BuildTemplateChainAsync(comp.ComposedTemplateId, cancellationToken);
|
|
composedChains[comp.ComposedTemplateId] = composedChain;
|
|
pendingChains.Enqueue(composedChain);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Load data connections for the site
|
|
var dataConnections = await LoadDataConnectionsAsync(instance.SiteId, cancellationToken);
|
|
|
|
// Flatten
|
|
var flattenResult = _flatteningService.Flatten(
|
|
instance, templateChain, compositionMap, composedChains, dataConnections);
|
|
|
|
if (flattenResult.IsFailure)
|
|
return Result<FlatteningPipelineResult>.Failure(flattenResult.Error);
|
|
|
|
var config = flattenResult.Value;
|
|
|
|
// Load shared scripts for semantic validation
|
|
var sharedScriptEntities = await _templateRepo.GetAllSharedScriptsAsync(cancellationToken);
|
|
var resolvedSharedScripts = sharedScriptEntities.Select(s => new ResolvedScript
|
|
{
|
|
CanonicalName = s.Name,
|
|
Code = s.Code,
|
|
ParameterDefinitions = s.ParameterDefinitions,
|
|
ReturnDefinition = s.ReturnDefinition
|
|
}).ToList();
|
|
|
|
// Validate
|
|
var validation = _validationService.Validate(config, resolvedSharedScripts);
|
|
|
|
// Compute revision hash
|
|
var hash = _revisionHashService.ComputeHash(config);
|
|
|
|
return Result<FlatteningPipelineResult>.Success(
|
|
new FlatteningPipelineResult(config, hash, validation));
|
|
}
|
|
|
|
private async Task<IReadOnlyList<Commons.Entities.Templates.Template>> BuildTemplateChainAsync(
|
|
int templateId,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
var chain = new List<Commons.Entities.Templates.Template>();
|
|
var currentId = (int?)templateId;
|
|
|
|
while (currentId.HasValue)
|
|
{
|
|
var template = await _templateRepo.GetTemplateWithChildrenAsync(currentId.Value, cancellationToken);
|
|
if (template == null) break;
|
|
chain.Add(template);
|
|
currentId = template.ParentTemplateId;
|
|
}
|
|
|
|
return chain;
|
|
}
|
|
|
|
private async Task<IReadOnlyDictionary<int, DataConnection>> LoadDataConnectionsAsync(
|
|
int siteId,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
var connections = await _siteRepo.GetDataConnectionsBySiteIdAsync(siteId, cancellationToken);
|
|
return connections.ToDictionary(c => c.Id);
|
|
}
|
|
}
|