CDMS-1223 - Refactors routing to use queue-only destinations (#251)

* Refactors routing to use queue-only destinations

Eliminates the LinkType enum and removes logic for distinguishing between URL and Queue routing. All primary message routing now exclusively uses the queue sender.

Removes the direct HTTP API sending path from the MessageRouter and ApiSender, simplifying the overall message flow. Streamlines configuration by removing LinkType properties from routing records and appsettings. Updates health checks to consider all named links.

Removes the unused CdsAlvs endpoint configuration.

Relates to CDMS-1223

* fixed merge issue

Author: t11omas

BtmsGateway/Middleware/RoutingInterceptor.cs

@@ -101,7 +101,7 @@ private async Task Route(HttpContext context, MessageData messageData, IMetrics
 
         RecordRequest(routingResult, RouteAction);
 
-        if (routingResult.RouteFound && routingResult.RouteLinkType != LinkType.None)
+        if (routingResult.RouteFound)
             LogRouteFoundResults(messageData, routingResult, RouteAction);
         else
             LogRouteNotFoundResults(messageData, routingResult, RouteAction);

BtmsGateway/Services/Health/ConfigureHealthChecks.cs

@@ -59,7 +59,7 @@ private static IHealthChecksBuilder AddTopicChecks(this IHealthChecksBuilder bui
         if (routingConfig == null || routingConfig.AutomatedHealthCheckDisabled)
             return builder;
 
-        foreach (var queues in routingConfig.NamedLinks.Where(x => x.Value.LinkType == LinkType.Queue))
+        foreach (var queues in routingConfig.NamedLinks)
         {
             builder.AddTypeActivatedCheck<TopicHealthCheck>(
                 queues.Key,

BtmsGateway/Services/Routing/ApiSender.cs

@@ -1,13 +1,10 @@
-using System.Net;
 using System.Text;
-using BtmsGateway.Middleware;
 using BtmsGateway.Utils.Http;
 
 namespace BtmsGateway.Services.Routing;
 
 public interface IApiSender
 {
-    Task<RoutingResult> Send(RoutingResult routingResult, MessageData messageData);
     Task<HttpResponseMessage> SendSoapMessageAsync(
         string method,
         string destination,
@@ -21,34 +18,6 @@ CancellationToken cancellationToken
 
 public class ApiSender(IHttpClientFactory clientFactory) : IApiSender
 {
-    public async Task<RoutingResult> Send(RoutingResult routingResult, MessageData messageData)
-    {
-        var proxyName = routingResult.NamedProxy ?? Proxy.RoutedClientWithRetry;
-        var client = clientFactory.CreateClient(proxyName);
-
-        HttpRequestMessage request;
-
-        request = routingResult.ConvertRoutedContentToFromJson
-            ? messageData.CreateConvertedJsonRequest(
-                routingResult.FullRouteLink,
-                routingResult.RouteHostHeader,
-                routingResult.MessageSubXPath
-            )
-            : messageData.CreateOriginalSoapRequest(routingResult.FullRouteLink, routingResult.RouteHostHeader);
-
-        var response = await client.SendAsync(request);
-        var content =
-            response.StatusCode == HttpStatusCode.NoContent ? null : await response.Content.ReadAsStringAsync();
-
-        return routingResult with
-        {
-            RoutingSuccessful = response.IsSuccessStatusCode,
-            ResponseContent = content,
-            StatusCode = response.StatusCode,
-            ResponseDate = response.Headers.Date,
-        };
-    }
-
     public async Task<HttpResponseMessage> SendSoapMessageAsync(
         string method,
         string destination,

BtmsGateway/Services/Routing/DecisionSender.cs

@@ -103,7 +103,7 @@ await GetResponseContentAsync(cdsResponse, cancellationToken)
         return routingResult with
         {
             RouteFound = true,
-            RouteLinkType = _btmsToCdsDestination.LinkType,
+            // RouteLinkType = _btmsToCdsDestination.LinkType,
             RoutingSuccessful = true,
             FullRouteLink = destination,
             StatusCode = cdsResponse.StatusCode,

BtmsGateway/Services/Routing/ErrorNotificationSender.cs

@@ -91,7 +91,6 @@ await GetResponseContentAsync(cdsResponse, cancellationToken)
         return routingResult with
         {
             RouteFound = true,
-            RouteLinkType = _btmsToCdsDestination.LinkType,
             RoutingSuccessful = true,
             FullRouteLink = destination,
             StatusCode = cdsResponse.StatusCode,

BtmsGateway/Services/Routing/MessageRouter.cs

@@ -10,31 +10,19 @@ public interface IMessageRouter
     Task<RoutingResult> Route(MessageData messageData, IMetrics metrics);
 }
 
-public class MessageRouter(
-    IMessageRoutes messageRoutes,
-    IApiSender apiSender,
-    IQueueSender queueSender,
-    ILogger<MessageRouter> logger
-) : IMessageRouter
+public class MessageRouter(IMessageRoutes messageRoutes, IQueueSender queueSender, ILogger<MessageRouter> logger)
+    : IMessageRouter
 {
     public async Task<RoutingResult> Route(MessageData messageData, IMetrics metrics)
     {
         var routingResult = GetRoutingResult(messageData);
-        if (!routingResult.RouteFound || routingResult.RouteLinkType == LinkType.None)
+        if (!routingResult.RouteFound)
             return routingResult;
 
         try
         {
             metrics.StartRoutedRequest();
-
-            routingResult = routingResult.RouteLinkType switch
-            {
-                LinkType.Queue => await queueSender.Send(routingResult, messageData, routingResult.FullRouteLink),
-                LinkType.Url => await apiSender.Send(routingResult, messageData),
-                _ => routingResult,
-            };
-
-            return routingResult;
+            return await queueSender.Send(routingResult, messageData, routingResult.FullRouteLink);
         }
         catch (Exception ex)
         {

BtmsGateway/Services/Routing/MessageRoutes.cs

@@ -21,15 +21,6 @@ public MessageRoutes(RoutingConfig routingConfig, ILogger<MessageRoutes> logger)
         _logger = logger;
         try
         {
-            if (
-                routingConfig.NamedLinks.Any(x =>
-                    x.Value.LinkType == LinkType.Url && !Uri.TryCreate(x.Value.Link, UriKind.Absolute, out _)
-                )
-            )
-                throw new InvalidDataException("Invalid URL(s) in config");
-
-            if (routingConfig.NamedLinks.Any(x => !Enum.IsDefined(x.Value.LinkType)))
-                throw new InvalidDataException("Invalid Link Type in config");
             _routes = routingConfig.AllRoutes;
         }
         catch (Exception ex)
@@ -66,19 +57,13 @@ public RoutingResult GetRoute(string routePath, SoapContent soapContent, string?
                     RouteName = route.Name,
                     MessageSubXPath = route.MessageSubXPath,
                     Legend = route.Legend,
-                    RouteLinkType = route.BtmsLinkType,
-                    FullRouteLink = SelectLink(route.BtmsLinkType, route.BtmsLink, routePath),
+                    FullRouteLink = route.BtmsLink,
                     RouteHostHeader = route.BtmsHostHeader,
                     ConvertRoutedContentToFromJson = true,
                     UrlPath = routePath,
-                    StatusCode = StatusCode(),
+                    StatusCode = HttpStatusCode.Accepted,
                     NamedProxy = route.NamedProxy,
                 };
-
-            HttpStatusCode StatusCode()
-            {
-                return route.BtmsLinkType == LinkType.None ? HttpStatusCode.Accepted : default;
-            }
         }
         catch (Exception ex)
         {
@@ -100,14 +85,4 @@ public bool IsCdsRoute(string routePath)
             x.IsCds && x.RoutePath.Equals(routePath.Trim('/'), StringComparison.InvariantCultureIgnoreCase)
         );
     }
-
-    [SuppressMessage(
-        "SonarLint",
-        "S3358",
-        Justification = "The second nested ternary in each case (lines 55, 56, 68, 69) is within a string interpolation so is very clearly independent of the first"
-    )]
-    private static string? SelectLink(LinkType linkType, string? link, string routePath)
-    {
-        return linkType == LinkType.None ? null : $"{link}{(linkType == LinkType.Url ? routePath : null)}";
-    }
 }

BtmsGateway/Services/Routing/RoutingConfig.cs

@@ -18,7 +18,6 @@ private RoutedLink[] GetAllRoutes()
                     {
                         Name = nr.Key,
                         BtmsLink = nl.Value.Link.TrimEnd('/'),
-                        BtmsLinkType = nl.Value.LinkType,
                         BtmsHostHeader = nl.Value.HostHeader,
                         RoutePath = nr.Value.RoutePath.Trim('/'),
                         MessageSubXPath = nr.Value.MessageSubXPath,
@@ -48,35 +47,25 @@ public record NamedRoute
 public record NamedLink
 {
     public required string Link { get; init; }
-    public required LinkType LinkType { get; init; }
     public string? HostHeader { get; init; }
 }
 
 public record Destination
 {
-    public required LinkType LinkType { get; init; }
     public required string Link { get; init; }
     public required string RoutePath { get; init; }
     public required string ContentType { get; init; }
     public string? HostHeader { get; init; }
     public string? Method { get; init; }
 }
 
-public enum LinkType
-{
-    None,
-    Url,
-    Queue,
-}
-
 public record RoutedLink
 {
     public required string Name { get; init; }
     public required string Legend { get; init; }
     public required string RoutePath { get; init; }
     public required string MessageSubXPath { get; init; }
     public string? BtmsLink { get; init; }
-    public required LinkType BtmsLinkType { get; init; }
     public string? BtmsHostHeader { get; init; }
     public required bool IsCds { get; init; }
     public string? NamedProxy { get; init; }

BtmsGateway/Services/Routing/RoutingResult.cs

@@ -11,7 +11,6 @@ public record RoutingResult
     public string? Legend { get; init; }
     public bool RouteFound { get; init; }
     public bool RoutingSuccessful { get; init; }
-    public LinkType RouteLinkType { get; init; }
     public string? FullRouteLink { get; init; }
     public string? RouteHostHeader { get; init; }
     public bool ConvertRoutedContentToFromJson { get; init; }

BtmsGateway/appsettings.Development.json

@@ -37,9 +37,6 @@
       "Stub": {
         "Link": "http://localhost:9090/stub/"
       },
-      "CdsAlvs": {
-        "Link": "http://localhost:9090/alvs/"
-      },
       "InboundCustomsDeclarationReceivedTopic": {
         "Link": "arn:aws:sns:eu-west-2:000000000000:trade_imports_inbound_customs_declarations.fifo"
       }