Phase 2 WP-1–13+23: Template Engine CRUD, composition, overrides, locking, collision detection, acyclicity

- WP-23: ITemplateEngineRepository full EF Core implementation
- WP-1: Template CRUD with deletion constraints (instances, children, compositions)
- WP-2–4: Attribute, alarm, script definitions with lock flags and override granularity
- WP-5: Shared script CRUD with syntax validation
- WP-6–7: Composition with recursive nesting and canonical naming
- WP-8–11: Override granularity, locking rules, inheritance/composition scope
- WP-12: Naming collision detection on canonical names (recursive)
- WP-13: Graph acyclicity (inheritance + composition cycles)
Core services: TemplateService, SharedScriptService, TemplateResolver,
LockEnforcer, CollisionDetector, CycleDetector. 358 tests pass.
This commit is contained in:
Joseph Doherty
2026-03-16 20:10:34 -04:00
parent 84ad6bb77d
commit faef2d0de6
47 changed files with 7741 additions and 11 deletions
@@ -0,0 +1,155 @@
using Microsoft.EntityFrameworkCore;
using ScadaLink.Commons.Entities.Instances;
using ScadaLink.Commons.Entities.Sites;
using ScadaLink.Commons.Interfaces.Repositories;
namespace ScadaLink.ConfigurationDatabase.Repositories;
/// <summary>
/// EF Core implementation of ISiteRepository for site and data connection management.
/// </summary>
public class SiteRepository : ISiteRepository
{
private readonly ScadaLinkDbContext _dbContext;
public SiteRepository(ScadaLinkDbContext dbContext)
{
_dbContext = dbContext ?? throw new ArgumentNullException(nameof(dbContext));
}
// --- Sites ---
public async Task<Site?> GetSiteByIdAsync(int id, CancellationToken cancellationToken = default)
{
return await _dbContext.Sites.FindAsync([id], cancellationToken);
}
public async Task<Site?> GetSiteByIdentifierAsync(string siteIdentifier, CancellationToken cancellationToken = default)
{
return await _dbContext.Sites
.FirstOrDefaultAsync(s => s.SiteIdentifier == siteIdentifier, cancellationToken);
}
public async Task<IReadOnlyList<Site>> GetAllSitesAsync(CancellationToken cancellationToken = default)
{
return await _dbContext.Sites.OrderBy(s => s.Name).ToListAsync(cancellationToken);
}
public async Task AddSiteAsync(Site site, CancellationToken cancellationToken = default)
{
await _dbContext.Sites.AddAsync(site, cancellationToken);
}
public Task UpdateSiteAsync(Site site, CancellationToken cancellationToken = default)
{
_dbContext.Sites.Update(site);
return Task.CompletedTask;
}
public Task DeleteSiteAsync(int id, CancellationToken cancellationToken = default)
{
var entity = _dbContext.Sites.Local.FirstOrDefault(s => s.Id == id);
if (entity != null)
{
_dbContext.Sites.Remove(entity);
}
else
{
var stub = new Site("stub", "stub") { Id = id };
_dbContext.Sites.Attach(stub);
_dbContext.Sites.Remove(stub);
}
return Task.CompletedTask;
}
// --- Data Connections ---
public async Task<DataConnection?> GetDataConnectionByIdAsync(int id, CancellationToken cancellationToken = default)
{
return await _dbContext.DataConnections.FindAsync([id], cancellationToken);
}
public async Task<IReadOnlyList<DataConnection>> GetDataConnectionsBySiteIdAsync(int siteId, CancellationToken cancellationToken = default)
{
var connectionIds = await _dbContext.SiteDataConnectionAssignments
.Where(a => a.SiteId == siteId)
.Select(a => a.DataConnectionId)
.ToListAsync(cancellationToken);
return await _dbContext.DataConnections
.Where(c => connectionIds.Contains(c.Id))
.OrderBy(c => c.Name)
.ToListAsync(cancellationToken);
}
public async Task AddDataConnectionAsync(DataConnection connection, CancellationToken cancellationToken = default)
{
await _dbContext.DataConnections.AddAsync(connection, cancellationToken);
}
public Task UpdateDataConnectionAsync(DataConnection connection, CancellationToken cancellationToken = default)
{
_dbContext.DataConnections.Update(connection);
return Task.CompletedTask;
}
public Task DeleteDataConnectionAsync(int id, CancellationToken cancellationToken = default)
{
var entity = _dbContext.DataConnections.Local.FirstOrDefault(c => c.Id == id);
if (entity != null)
{
_dbContext.DataConnections.Remove(entity);
}
else
{
var stub = new DataConnection("stub", "stub") { Id = id };
_dbContext.DataConnections.Attach(stub);
_dbContext.DataConnections.Remove(stub);
}
return Task.CompletedTask;
}
// --- Site-Connection Assignments ---
public async Task<SiteDataConnectionAssignment?> GetSiteDataConnectionAssignmentAsync(
int siteId, int dataConnectionId, CancellationToken cancellationToken = default)
{
return await _dbContext.SiteDataConnectionAssignments
.FirstOrDefaultAsync(a => a.SiteId == siteId && a.DataConnectionId == dataConnectionId, cancellationToken);
}
public async Task AddSiteDataConnectionAssignmentAsync(SiteDataConnectionAssignment assignment, CancellationToken cancellationToken = default)
{
await _dbContext.SiteDataConnectionAssignments.AddAsync(assignment, cancellationToken);
}
public Task DeleteSiteDataConnectionAssignmentAsync(int id, CancellationToken cancellationToken = default)
{
var entity = _dbContext.SiteDataConnectionAssignments.Local.FirstOrDefault(a => a.Id == id);
if (entity != null)
{
_dbContext.SiteDataConnectionAssignments.Remove(entity);
}
else
{
var stub = new SiteDataConnectionAssignment { Id = id };
_dbContext.SiteDataConnectionAssignments.Attach(stub);
_dbContext.SiteDataConnectionAssignments.Remove(stub);
}
return Task.CompletedTask;
}
// --- Instances (for deletion constraint checks) ---
public async Task<IReadOnlyList<Instance>> GetInstancesBySiteIdAsync(int siteId, CancellationToken cancellationToken = default)
{
return await _dbContext.Instances
.Where(i => i.SiteId == siteId)
.ToListAsync(cancellationToken);
}
public async Task<int> SaveChangesAsync(CancellationToken cancellationToken = default)
{
return await _dbContext.SaveChangesAsync(cancellationToken);
}
}