fix: azure queue extension (#1224)

Author: MWClayson-NHS

application/CohortManager/src/Functions/Shared/Common/AzureServiceBusClient.cs

@@ -1,21 +1,22 @@
 namespace Common;
 
 using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
 using System.Text.Json;
 using Azure.Messaging.ServiceBus;
 using Microsoft.Extensions.Azure;
 using Microsoft.Extensions.Logging;
 
 public class AzureServiceBusClient : IQueueClient
 {
-    private readonly IAzureClientFactory<ServiceBusSender> _senderFactory;
+    private readonly ServiceBusClient _serviceBusClient;
     private readonly ILogger<AzureServiceBusClient> _logger;
     private readonly ConcurrentDictionary<string, ServiceBusSender> _senders = new();
 
-    public AzureServiceBusClient(ILogger<AzureServiceBusClient> logger, IAzureClientFactory<ServiceBusSender> senderFactory)
+    public AzureServiceBusClient(ILogger<AzureServiceBusClient> logger, ServiceBusClient serviceBusClient)
     {
         _logger = logger;
-        _senderFactory = senderFactory;
+        _serviceBusClient = serviceBusClient;
     }
 
 
@@ -29,7 +30,7 @@ public AzureServiceBusClient(ILogger<AzureServiceBusClient> logger, IAzureClient
     /// <returns></returns>
     public async Task<bool> AddAsync<T>(T message, string queueTopicName)
     {
-        var sender = _senders.GetOrAdd(queueTopicName, _senderFactory.CreateClient(queueTopicName));
+        var sender = _senders.GetOrAdd(queueTopicName, _serviceBusClient.CreateSender(queueTopicName));
 
         try
         {

application/CohortManager/src/Functions/Shared/Common/Extensions/AzureQueueExtension.cs

@@ -26,7 +26,7 @@ public static IHostBuilder AddAzureQueues(this IHostBuilder hostBuilder, bool Us
                     builder.UseCredential(new DefaultAzureCredential());
 
                 });
-                _.AddSingleton<IQueueClient, AzureStorageQueueClient>();
+                _.AddSingleton<IQueueClient, AzureServiceBusClient>();
             }
             else
             {
@@ -64,11 +64,11 @@ public static IHostBuilder AddKeyedAzureQueues(this IHostBuilder hostBuilder, bo
                 {
                     _.AddAzureClients(builder =>
                     {
-                        builder.AddServiceBusClient(serviceBusConnectionString);
-                        builder.UseCredential(new DefaultAzureCredential());
+                        builder.AddServiceBusClient(serviceBusConnectionString)
+                            .WithCredential(new DefaultAzureCredential());
 
                     });
-                    _.AddKeyedSingleton<IQueueClient, AzureStorageQueueClient>(keyName);
+                    _.AddKeyedSingleton<IQueueClient, AzureServiceBusClient>(keyName);
                 }
                 else
                 {