13d3aeab09
Phase 1b of the v2 entity-model rewrite. The design's live-edit model means
the 12 v2 live-edit entities no longer carry a generation scope — they're
edited directly via AdminOperationsActor, with RowVersion (added in Task 14a)
providing last-write-wins detection.
Entity changes (12 files):
Equipment, DriverInstance, Device, Tag, PollGroup, Namespace,
UnsArea, UnsLine, NodeAcl, Script, VirtualTag, ScriptedAlarm
- Removed: public long GenerationId
- Removed: public ConfigGeneration? Generation (navigation)
DbContext changes (OtOpcUaConfigDbContext.cs):
- Removed 12 HasOne(x => x.Generation).WithMany().HasForeignKey... mappings
- Rewrote ~36 indexes: dropped the GenerationId column from each composite
key, renamed UX_<Table>_Generation_<X> -> UX_<Table>_<X> and
IX_<Table>_Generation_<X> -> IX_<Table>_<X>. Logical IDs become globally
unique (UX_<Table>_LogicalId on the LogicalId column alone).
- Removed Namespace's redundant UX_Namespace_Generation_LogicalId_Cluster
index (subsumed by the new UX_Namespace_LogicalId).
Core.Tests fixtures (4 files):
Removed "GenerationId = 1," lines from:
- PermissionTrieBuilderTests.cs (NodeAcl Row factory)
- PermissionTrieTests.cs (NodeAcl Row factory)
- TriePermissionEvaluatorTests.cs (NodeAcl Row factory + 2 gen{1,5}Row
mutations that test stale-generation evaluation; the trie itself still
carries a generation tag via PermissionTrie.GenerationId, fed in via
PermissionTrieBuilder.Build's generationId parameter, so the tests
still exercise the production code path)
- EquipmentNodeWalkerTests.cs (Area/Line/Eq/Tag/VirtualTag/ScriptedAlarm
builders)
Expected breakage (accepted per Task 56 policy):
src/Server/ZB.MOM.WW.OtOpcUa.Server ~25 errors (DriverInstanceBootstrapper,
AuthorizationBootstrap,
EquipmentNamespaceContentLoader,
Phase7Composer, ...)
src/Server/ZB.MOM.WW.OtOpcUa.Admin ~45 errors (VirtualTags.razor,
ScriptedAlarms.razor,
DriverInstanceService,
EquipmentService,
EquipmentImportBatchService,
UnsService,
FocasDriverDetailService,
...)
Server.Tests, Admin.Tests, Admin.E2ETests also break transitively (they
project-reference Server/Admin). All deleted in Task 56.
Verification:
dotnet build src/Core/ZB.MOM.WW.OtOpcUa.Configuration -> 0 errors
dotnet build tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests -> 0 errors
dotnet build tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests -> 0 errors
dotnet build (whole solution) -> 70 errors, all in Server/Admin
64 lines
2.9 KiB
C#
64 lines
2.9 KiB
C#
namespace ZB.MOM.WW.OtOpcUa.Configuration.Entities;
|
||
|
||
/// <summary>
|
||
/// UNS level-5 entity. Only for drivers in Equipment-kind namespaces.
|
||
/// Per decisions #109 (first-class), #116 (5-identifier model), #125 (system-generated EquipmentId),
|
||
/// #138–139 (OPC 40010 Identification fields as first-class columns).
|
||
/// </summary>
|
||
public sealed class Equipment
|
||
{
|
||
public Guid EquipmentRowId { get; set; }
|
||
|
||
/// <summary>
|
||
/// System-generated stable internal logical ID. Format: <c>'EQ-' + first 12 hex chars of EquipmentUuid</c>.
|
||
/// NEVER operator-supplied, NEVER in CSV imports, NEVER editable in Admin UI (decision #125).
|
||
/// </summary>
|
||
public required string EquipmentId { get; set; }
|
||
|
||
/// <summary>UUIDv4, IMMUTABLE across all generations of the same EquipmentId. Downstream-consumer join key.</summary>
|
||
public Guid EquipmentUuid { get; set; }
|
||
|
||
/// <summary>Logical FK to the driver providing data for this equipment.</summary>
|
||
public required string DriverInstanceId { get; set; }
|
||
|
||
/// <summary>Optional logical FK to a multi-device driver's device.</summary>
|
||
public string? DeviceId { get; set; }
|
||
|
||
/// <summary>Logical FK to <see cref="UnsLine.UnsLineId"/>.</summary>
|
||
public required string UnsLineId { get; set; }
|
||
|
||
/// <summary>UNS level 5 segment, matches <c>^[a-z0-9-]{1,32}$</c>.</summary>
|
||
public required string Name { get; set; }
|
||
|
||
// Operator-facing / external-system identifiers (decision #116)
|
||
|
||
/// <summary>Operator colloquial id (e.g. "machine_001"). Unique within cluster. Required.</summary>
|
||
public required string MachineCode { get; set; }
|
||
|
||
/// <summary>ERP equipment id. Unique fleet-wide via <see cref="ExternalIdReservation"/>. Primary browse identifier in Admin UI.</summary>
|
||
public string? ZTag { get; set; }
|
||
|
||
/// <summary>SAP PM equipment id. Unique fleet-wide via <see cref="ExternalIdReservation"/>.</summary>
|
||
public string? SAPID { get; set; }
|
||
|
||
// OPC UA Companion Spec OPC 40010 Machinery Identification fields (decision #139).
|
||
// All nullable so equipment can be added before identity is fully captured.
|
||
public string? Manufacturer { get; set; }
|
||
public string? Model { get; set; }
|
||
public string? SerialNumber { get; set; }
|
||
public string? HardwareRevision { get; set; }
|
||
public string? SoftwareRevision { get; set; }
|
||
public short? YearOfConstruction { get; set; }
|
||
public string? AssetLocation { get; set; }
|
||
public string? ManufacturerUri { get; set; }
|
||
public string? DeviceManualUri { get; set; }
|
||
|
||
/// <summary>Nullable hook for future schemas-repo template ID (decision #112).</summary>
|
||
public string? EquipmentClassRef { get; set; }
|
||
|
||
public bool Enabled { get; set; } = true;
|
||
|
||
/// <summary>Optimistic concurrency token for last-write-wins detection in the v2 live-edit model.</summary>
|
||
public byte[] RowVersion { get; set; } = Array.Empty<byte>();
|
||
}
|