Joseph Doherty
dc9c0c950c
Apply the ZB.MOM.WW. prefix to all gateway-side projects, folders,
.csproj/.sln contents, C# namespaces, using directives, generated proto
C# (csharp_namespace + checked-in generated files), InternalsVisibleTo
attributes, project-name string literals (LoadProject, .sln lookups,
worker exe paths, staticwebassets manifest), and the install/script/doc
references that point at any of the above. Migrate the solution from
.sln to .slnx via `dotnet sln migrate` and delete the old file.
External-runtime identifiers are intentionally NOT prefixed so external
configuration keeps working:
- GatewayMetrics.cs MeterName ("MxGateway.Server")
- DashboardAuthenticationDefaults Scheme/Policy ("MxGateway.Dashboard")
- GatewayRequestLoggingMiddleware logger category ("MxGateway.Request")
- StaRuntime thread name ("MxGateway.Worker.STA")
- appsettings.json root section "MxGateway" + env-var prefix
MxGateway__... and secret-name MxGateway:ApiKeyPepper
- C:\ProgramData\MxGateway\ data dir paths
Also fixes two tests that were not rename-related but became visible
while validating the rename:
- WorkerLiveMxAccessSmokeTests.ShutDownAsync: cancellation that the
gateway service correctly maps to RpcException(Cancelled) per gRPC
convention was being misclassified as a stream fault. Added a sibling
catch on RpcException with StatusCode.Cancelled.
- IntegrationTestEnvironment.ResolveRepositoryRoot: extracted IsRepositoryRoot
and made it accept either a .git marker OR a .sln/.slnx next to src/
so the worker-exe walker works in non-git working copies.
clients/proto/proto-inputs.json's protoRoot updated to point at
src/ZB.MOM.WW.MxGateway.Contracts/Protos.
Verified by `dotnet build` and a full `dotnet test` of the .slnx with
MXGATEWAY_RUN_LIVE_{MXACCESS,LDAP,GALAXY}_TESTS=1:
Tests: 472/472 pass
Worker.Tests: 280/280 pass (4 dev-rig [Fact(Skip=...)] skipped)
IntegrationTests: 18/18 pass
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
78 lines
3.1 KiB
C#
78 lines
3.1 KiB
C#
using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
|
|
using ZB.MOM.WW.MxGateway.Server.Galaxy;
|
|
|
|
namespace ZB.MOM.WW.MxGateway.Server.Grpc;
|
|
|
|
/// <summary>
|
|
/// Maps <see cref="GalaxyHierarchyRow"/> + <see cref="GalaxyAttributeRow"/> rows produced
|
|
/// by <see cref="GalaxyRepository"/> into <c>galaxy_repository.v1</c> proto messages.
|
|
/// Pure function, separated so it can be unit-tested without a SQL connection.
|
|
/// </summary>
|
|
public static class GalaxyProtoMapper
|
|
{
|
|
/// <summary>Maps Galaxy hierarchy and attribute rows to Galaxy object protos.</summary>
|
|
/// <param name="hierarchy">Hierarchy rows from Galaxy Repository.</param>
|
|
/// <param name="attributes">Attribute rows from Galaxy Repository.</param>
|
|
public static IEnumerable<GalaxyObject> MapHierarchy(
|
|
IReadOnlyList<GalaxyHierarchyRow> hierarchy,
|
|
IReadOnlyList<GalaxyAttributeRow> attributes)
|
|
{
|
|
Dictionary<int, List<GalaxyAttributeRow>> attributesByGobjectId = attributes
|
|
.GroupBy(a => a.GobjectId)
|
|
.ToDictionary(g => g.Key, g => g.ToList());
|
|
|
|
foreach (GalaxyHierarchyRow row in hierarchy)
|
|
{
|
|
yield return MapObject(row, attributesByGobjectId);
|
|
}
|
|
}
|
|
|
|
/// <summary>Maps a Galaxy hierarchy row to a Galaxy object proto.</summary>
|
|
/// <param name="row">Hierarchy row from Galaxy Repository.</param>
|
|
/// <param name="attributesByGobjectId">Attributes indexed by gobject ID.</param>
|
|
public static GalaxyObject MapObject(
|
|
GalaxyHierarchyRow row,
|
|
IReadOnlyDictionary<int, List<GalaxyAttributeRow>> attributesByGobjectId)
|
|
{
|
|
GalaxyObject obj = new()
|
|
{
|
|
GobjectId = row.GobjectId,
|
|
TagName = row.TagName,
|
|
ContainedName = row.ContainedName,
|
|
BrowseName = row.BrowseName,
|
|
ParentGobjectId = row.ParentGobjectId,
|
|
IsArea = row.IsArea,
|
|
CategoryId = row.CategoryId,
|
|
HostedByGobjectId = row.HostedByGobjectId,
|
|
};
|
|
obj.TemplateChain.AddRange(row.TemplateChain);
|
|
|
|
if (attributesByGobjectId.TryGetValue(row.GobjectId, out List<GalaxyAttributeRow>? attrs))
|
|
{
|
|
foreach (GalaxyAttributeRow attr in attrs)
|
|
{
|
|
obj.Attributes.Add(MapAttribute(attr));
|
|
}
|
|
}
|
|
|
|
return obj;
|
|
}
|
|
|
|
/// <summary>Maps a Galaxy attribute row to a Galaxy attribute proto.</summary>
|
|
/// <param name="row">Attribute row from Galaxy Repository.</param>
|
|
public static GalaxyAttribute MapAttribute(GalaxyAttributeRow row) => new()
|
|
{
|
|
AttributeName = row.AttributeName,
|
|
FullTagReference = row.FullTagReference,
|
|
MxDataType = row.MxDataType,
|
|
DataTypeName = row.DataTypeName ?? string.Empty,
|
|
IsArray = row.IsArray,
|
|
ArrayDimension = row.ArrayDimension ?? 0,
|
|
ArrayDimensionPresent = row.ArrayDimension.HasValue,
|
|
MxAttributeCategory = row.MxAttributeCategory,
|
|
SecurityClassification = row.SecurityClassification,
|
|
IsHistorized = row.IsHistorized,
|
|
IsAlarm = row.IsAlarm,
|
|
};
|
|
}
|