chore(comm): delete dead IntegrationCallRequest routing (Gitea #32)

'Pattern 4: Integration Routing' — RouteIntegrationCallAsync → SiteEnvelope(IntegrationCallRequest) → SiteCommunicationActor integration handler — was plumbed end to end but connected at neither end: no producer (zero callers) and no handler (AkkaHostedService never registered LocalHandlerType.Integration). It was an early scaffold the architecture routed around — the brokered External→Central→Site→Central round-trip is served by the Inbound API's routed-site-script path (the RouteTo* verbs, driven from CommunicationServiceInstanceRouter), which is live, tested, and shares IntegrationTimeout. Decision (#32): delete. Removed the IntegrationCall{Request,Response} messages, RouteIntegrationCallAsync, the SiteCommunicationActor receive block + _integrationHandler field + LocalHandlerType.Integration, and the four tests that covered them (2 actor, 2 message-contract, 1 dispatcher- reject, 1 mapper-reject). KEPT IntegrationTimeout — it is the live timeout for the RouteTo* verbs. Updated the exclusion-narrative comments (proto/mapper/dispatcher), design §4, the components doc timeout table, and marked the known-issue RESOLVED. Full solution build clean (0/0); Communication 634 + Host 421 green. Net -172/+20 across 14 files. Not in the gRPC proto (was deliberately excluded there), so no wire-format change.
2026-07-23 14:27:32 -04:00
parent e0f105c3b3
commit a5256e9b12
14 changed files with 20 additions and 172 deletions
@@ -1,4 +1,3 @@
-using ZB.MOM.WW.ScadaBridge.Commons.Messages.Integration;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.RemoteQuery;

 namespace ZB.MOM.WW.ScadaBridge.Communication.Tests;
@@ -8,25 +7,6 @@ namespace ZB.MOM.WW.ScadaBridge.Communication.Tests;
 /// </summary>
 public class MessageContractTests
 {
-    [Fact]
-    public void IntegrationCallRequest_HasCorrelationId()
-    {
-        var msg = new IntegrationCallRequest(
-            "corr-123", "site1", "inst1", "ExtSys1", "GetData",
-            new Dictionary<string, object?>(), DateTimeOffset.UtcNow);
-
-        Assert.Equal("corr-123", msg.CorrelationId);
-    }
-
-    [Fact]
-    public void IntegrationCallResponse_HasCorrelationId()
-    {
-        var msg = new IntegrationCallResponse(
-            "corr-123", "site1", true, "{}", null, DateTimeOffset.UtcNow);
-
-        Assert.Equal("corr-123", msg.CorrelationId);
-    }
-
    [Fact]
    public void EventLogQueryRequest_HasCorrelationId()
    {
@@ -79,10 +59,6 @@ public class MessageContractTests
        Assert.True(typeof(Commons.Messages.Artifacts.DeployArtifactsCommand).IsValueType == false);
        Assert.True(typeof(Commons.Messages.Artifacts.ArtifactDeploymentResponse).IsValueType == false);

-        // Pattern 4: Integration
-        Assert.True(typeof(IntegrationCallRequest).IsValueType == false);
-        Assert.True(typeof(IntegrationCallResponse).IsValueType == false);
-
        // Pattern 5: Debug View
        Assert.True(typeof(Commons.Messages.DebugView.SubscribeDebugViewRequest).IsValueType == false);
        Assert.True(typeof(Commons.Messages.DebugView.DebugViewSnapshot).IsValueType == false);
@@ -1,7 +1,6 @@
 using Akka.Actor;
 using Akka.TestKit.Xunit2;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.Artifacts;
-using ZB.MOM.WW.ScadaBridge.Commons.Messages.Integration;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.RemoteQuery;
 using ZB.MOM.WW.ScadaBridge.Commons.Types;
 using ZB.MOM.WW.ScadaBridge.Communication.Actors;
@@ -243,18 +242,6 @@ public class SiteCommandDispatcherTests : TestKit
            dispatcher.ResolveRoute(new TriggerSiteFailover("c", SiteId)));
    }

-    [Fact]
-    public void ResolveRoute_RejectsTheExcludedIntegrationCommand()
-    {
-        // IntegrationCallRequest is the 29th command, dead at both ends and deliberately excluded
-        // (28 of 29 migrate). It never enters the dispatcher.
-        var dispatcher = Build(CreateTestProbe().Ref);
-        var command = new IntegrationCallRequest(
-            "c", SiteId, "inst", "es", "m", new Dictionary<string, object?>(), DateTimeOffset.UtcNow);
-
-        Assert.Throws<ArgumentException>(() => dispatcher.ResolveRoute(command));
-    }
-
    // ── Failover (local path) ──

    [Fact]
@@ -94,10 +94,8 @@ public class SiteCommandDtoMapperGoldenTests
    }

    /// <summary>
-    /// The contract carries exactly 28 commands — 29 on
-    /// <c>SiteCommunicationActor</c>'s receive table minus the dead
-    /// <c>IntegrationCallRequest</c>. If the site gains a command, this count
-    /// moves deliberately, not silently.
+    /// The contract carries exactly 28 commands across six domain groups. If the
+    /// site gains a command, this count moves deliberately, not silently.
    /// </summary>
    [Fact]
    public void CommandInventory_Is28_AcrossSixGroups()
@@ -431,17 +429,6 @@ public class SiteCommandDtoMapperGoldenTests
    // Group classification + rejection
    // ─────────────────────────────────────────────────────────────────────

-    /// <summary><c>IntegrationCallRequest</c> is excluded by design and must be rejected, not silently dropped.</summary>
-    [Fact]
-    public void IntegrationCallRequest_IsRejected()
-    {
-        var dead = new Commons.Messages.Integration.IntegrationCallRequest(
-            "corr", "site-a", "Instance", "System", "Method",
-            new Dictionary<string, object?>(), DateTimeOffset.UtcNow);
-
-        Assert.Throws<ArgumentException>(() => SiteCommandDtoMapper.GroupOf(dead));
-    }
-
    /// <summary>Packing a command into the wrong group's envelope is a hard error, not a silent no-op.</summary>
    [Fact]
    public void PackingIntoTheWrongGroup_Throws() =>
@@ -5,7 +5,6 @@ using ZB.MOM.WW.ScadaBridge.Commons.Messages.DataConnection;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.Deployment;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.Health;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.Lifecycle;
-using ZB.MOM.WW.ScadaBridge.Commons.Messages.Integration;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.Management;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.Notification;
 using ZB.MOM.WW.ScadaBridge.Commons.Messages.RemoteQuery;
@@ -73,42 +72,6 @@ public class SiteCommunicationActorTests : TestKit
        dmProbe.ExpectMsg<DeploymentStateQueryRequest>(msg => msg.CorrelationId == "corr-q");
    }

-    [Fact]
-    public void IntegrationCall_WithoutHandler_ReturnsFailure()
-    {
-        var dmProbe = CreateTestProbe();
-        var siteActor = Sys.ActorOf(Props.Create(() =>
-            new SiteCommunicationActor("site1", _options, dmProbe.Ref)));
-
-        var request = new IntegrationCallRequest(
-            "corr1", "site1", "inst1", "ExtSys1", "GetData",
-            new Dictionary<string, object?>(), DateTimeOffset.UtcNow);
-
-        siteActor.Tell(request);
-
-        ExpectMsg<IntegrationCallResponse>(msg =>
-            !msg.Success && msg.ErrorMessage == "Integration handler not available");
-    }
-
-    [Fact]
-    public void IntegrationCall_WithHandler_ForwardedToHandler()
-    {
-        var dmProbe = CreateTestProbe();
-        var handlerProbe = CreateTestProbe();
-        var siteActor = Sys.ActorOf(Props.Create(() =>
-            new SiteCommunicationActor("site1", _options, dmProbe.Ref)));
-
-        // Register integration handler
-        siteActor.Tell(new RegisterLocalHandler(LocalHandlerType.Integration, handlerProbe.Ref));
-
-        var request = new IntegrationCallRequest(
-            "corr1", "site1", "inst1", "ExtSys1", "GetData",
-            new Dictionary<string, object?>(), DateTimeOffset.UtcNow);
-
-        siteActor.Tell(request);
-        handlerProbe.ExpectMsg<IntegrationCallRequest>(msg => msg.CorrelationId == "corr1");
-    }
-
    // The site→central send-forwarding tests that used to live here (NotificationSubmit /
    // NotificationStatusQuery, with and without a registered central ClusterClient) were removed
    // with the Akka transport in the ClusterClient→gRPC migration's Phase 4: the actor no longer