configuration of queue clients and extract function

ianfnelson · ianfnelson · commit c60973631e5d · 2025-05-13T13:40:35.000+01:00
diff --git a/src/ServiceLayer.Mesh/Configuration/AppConfiguration.cs b/src/ServiceLayer.Mesh/Configuration/AppConfiguration.cs
@@ -1,9 +1,17 @@
 namespace ServiceLayer.Mesh.Configuration;
 
-public class AppConfiguration : IFileDiscoveryFunctionConfiguration
+public class AppConfiguration :
+    IFileDiscoveryFunctionConfiguration,
+    IFileExtractFunctionConfiguration,
+    IFileExtractQueueClientConfiguration,
+    IFileTransformQueueClientConfiguration
 {
     public string NbssMeshMailboxId => GetRequired("NbssMailboxId");
 
+    public string FileExtractQueueName => GetRequired("FileExtractQueueName");
+
+    public string FileTransformQueueName => GetRequired("FileTransformQueueName");
+
     private static string GetRequired(string key)
     {
         var value = Environment.GetEnvironmentVariable(key);
diff --git a/src/ServiceLayer.Mesh/Configuration/IFileExtractFunctionConfiguration.cs b/src/ServiceLayer.Mesh/Configuration/IFileExtractFunctionConfiguration.cs
@@ -0,0 +1,6 @@
+namespace ServiceLayer.Mesh.Configuration;
+
+public interface IFileExtractFunctionConfiguration
+{
+    string NbssMeshMailboxId { get; }
+}
diff --git a/src/ServiceLayer.Mesh/Configuration/IFileExtractQueueClientConfiguration.cs b/src/ServiceLayer.Mesh/Configuration/IFileExtractQueueClientConfiguration.cs
@@ -0,0 +1,6 @@
+namespace ServiceLayer.Mesh.Configuration;
+
+public interface IFileExtractQueueClientConfiguration
+{
+    string FileExtractQueueName { get; }
+}
diff --git a/src/ServiceLayer.Mesh/Configuration/IFileTransformQueueClientConfiguration.cs b/src/ServiceLayer.Mesh/Configuration/IFileTransformQueueClientConfiguration.cs
@@ -0,0 +1,6 @@
+namespace ServiceLayer.Mesh.Configuration;
+
+public interface IFileTransformQueueClientConfiguration
+{
+    string FileTransformQueueName { get; }
+}
diff --git a/src/ServiceLayer.Mesh/Messaging/FileExtractQueueClient.cs b/src/ServiceLayer.Mesh/Messaging/FileExtractQueueClient.cs
@@ -1,11 +1,15 @@
 using Azure.Storage.Queues;
 using Microsoft.Extensions.Logging;
+using ServiceLayer.Mesh.Configuration;
 using ServiceLayer.Mesh.Models;
 
 namespace ServiceLayer.Mesh.Messaging;
 
-public class FileExtractQueueClient(ILogger<FileExtractQueueClient> logger, QueueServiceClient queueServiceClient)
-    : QueueClientBase(logger, queueServiceClient, "file-extract"), IFileExtractQueueClient
+public class FileExtractQueueClient(
+    ILogger<FileExtractQueueClient> logger,
+    IFileExtractQueueClientConfiguration configuration,
+    QueueServiceClient queueServiceClient)
+    : QueueClientBase(logger, queueServiceClient), IFileExtractQueueClient
 {
     public async Task EnqueueFileExtractAsync(MeshFile file)
     {
@@ -16,4 +20,6 @@ public async Task SendToPoisonQueueAsync(FileExtractQueueMessage message)
     {
         await base.SendToPoisonQueueAsync(message);
     }
+
+    protected override string QueueName => configuration.FileExtractQueueName;
 }
diff --git a/src/ServiceLayer.Mesh/Messaging/FileTransformQueueClient.cs b/src/ServiceLayer.Mesh/Messaging/FileTransformQueueClient.cs
@@ -1,11 +1,15 @@
 using Azure.Storage.Queues;
 using Microsoft.Extensions.Logging;
+using ServiceLayer.Mesh.Configuration;
 using ServiceLayer.Mesh.Models;
 
 namespace ServiceLayer.Mesh.Messaging;
 
-public class FileTransformQueueClient(ILogger<FileTransformQueueClient> logger, QueueServiceClient queueServiceClient)
-    : QueueClientBase(logger, queueServiceClient, "file-transform"), IFileTransformQueueClient
+public class FileTransformQueueClient(
+    ILogger<FileTransformQueueClient> logger,
+    IFileTransformQueueClientConfiguration configuration,
+    QueueServiceClient queueServiceClient)
+    : QueueClientBase(logger, queueServiceClient), IFileTransformQueueClient
 {
     public async Task EnqueueFileTransformAsync(MeshFile file)
     {
@@ -16,4 +20,6 @@ public async Task SendToPoisonQueueAsync(FileTransformQueueMessage message)
     {
         await base.SendToPoisonQueueAsync(message);
     }
+
+    protected override string QueueName => configuration.FileTransformQueueName;
 }
diff --git a/src/ServiceLayer.Mesh/Messaging/QueueClientBase.cs b/src/ServiceLayer.Mesh/Messaging/QueueClientBase.cs
@@ -4,14 +4,16 @@
 
 namespace ServiceLayer.Mesh.Messaging;
 
-public abstract class QueueClientBase(ILogger logger, QueueServiceClient queueServiceClient, string queueName)
+public abstract class QueueClientBase(ILogger logger, QueueServiceClient queueServiceClient)
 {
     private QueueClient? _queueClient;
     private QueueClient? _poisonQueueClient;
 
     private QueueClient Client => _queueClient ??= CreateClient();
     private QueueClient PoisonClient => _poisonQueueClient ??= CreatePoisonClient();
 
+    protected abstract string QueueName { get; }
+
     private static readonly JsonSerializerOptions QueueJsonOptions = new()
     {
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
@@ -20,14 +22,14 @@ public abstract class QueueClientBase(ILogger logger, QueueServiceClient queueSe
 
     private QueueClient CreateClient()
     {
-        var client = queueServiceClient.GetQueueClient(queueName);
+        var client = queueServiceClient.GetQueueClient(QueueName);
         client.CreateIfNotExists(); // TODO - consider environment gating this
         return client;
     }
 
     private QueueClient CreatePoisonClient()
     {
-        var poisonQueueName = $"{queueName}-poison";
+        var poisonQueueName = $"{QueueName}-poison";
         var client = queueServiceClient.GetQueueClient(poisonQueueName);
         client.CreateIfNotExists(); // TODO - consider environment gating this
         return client;
@@ -43,7 +45,7 @@ protected async Task SendJsonMessageAsync<T>(T message)
         catch (Exception e)
         {
             // TODO - consider including file ID or correlation ID in error logs
-            logger.LogError(e, "Error sending message to queue {QueueName}", queueName);
+            logger.LogError(e, "Error sending message to queue {QueueName}", QueueName);
             throw;
         }
     }
@@ -57,7 +59,7 @@ protected async Task SendToPoisonQueueAsync<T>(T message)
         }
         catch (Exception e)
         {
-            logger.LogError(e, "Error sending message to poison queue {PoisonQueueName}", $"{queueName}-poison");
+            logger.LogError(e, "Error sending message to poison queue {PoisonQueueName}", $"{QueueName}-poison");
             throw;
         }
     }
diff --git a/src/ServiceLayer.Mesh/Program.cs b/src/ServiceLayer.Mesh/Program.cs
@@ -60,6 +60,9 @@
         });
 
         services.AddTransient<IFileDiscoveryFunctionConfiguration, AppConfiguration>();
+        services.AddTransient<IFileExtractFunctionConfiguration, AppConfiguration>();
+        services.AddTransient<IFileExtractQueueClientConfiguration, AppConfiguration>();
+        services.AddTransient<IFileTransformQueueClientConfiguration, AppConfiguration>();
     });
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,15 @@`
`1`	`1`	`using Azure.Storage.Queues;`
`2`	`2`	`using Microsoft.Extensions.Logging;`
	`3`	`+using ServiceLayer.Mesh.Configuration;`
`3`	`4`	`using ServiceLayer.Mesh.Models;`
`4`	`5`
`5`	`6`	`namespace ServiceLayer.Mesh.Messaging;`
`6`	`7`
`7`		`-public class FileExtractQueueClient(ILogger<FileExtractQueueClient> logger, QueueServiceClient queueServiceClient)`
`8`		`- : QueueClientBase(logger, queueServiceClient, "file-extract"), IFileExtractQueueClient`
	`8`	`+public class FileExtractQueueClient(`
	`9`	`+ ILogger<FileExtractQueueClient> logger,`
	`10`	`+ IFileExtractQueueClientConfiguration configuration,`
	`11`	`+ QueueServiceClient queueServiceClient)`
	`12`	`+ : QueueClientBase(logger, queueServiceClient), IFileExtractQueueClient`
`9`	`13`	`{`
`10`	`14`	`public async Task EnqueueFileExtractAsync(MeshFile file)`
`11`	`15`	`{`
`@@ -16,4 +20,6 @@ public async Task SendToPoisonQueueAsync(FileExtractQueueMessage message)`
`16`	`20`	`{`
`17`	`21`	`await base.SendToPoisonQueueAsync(message);`
`18`	`22`	`}`
	`23`	`+`
	`24`	`+ protected override string QueueName => configuration.FileExtractQueueName;`
`19`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,16 @@`
`4`	`4`
`5`	`5`	`namespace ServiceLayer.Mesh.Messaging;`
`6`	`6`
`7`		`-public abstract class QueueClientBase(ILogger logger, QueueServiceClient queueServiceClient, string queueName)`
	`7`	`+public abstract class QueueClientBase(ILogger logger, QueueServiceClient queueServiceClient)`
`8`	`8`	`{`
`9`	`9`	`private QueueClient? _queueClient;`
`10`	`10`	`private QueueClient? _poisonQueueClient;`
`11`	`11`
`12`	`12`	`private QueueClient Client => _queueClient ??= CreateClient();`
`13`	`13`	`private QueueClient PoisonClient => _poisonQueueClient ??= CreatePoisonClient();`
`14`	`14`
	`15`	`+ protected abstract string QueueName { get; }`
	`16`	`+`
`15`	`17`	`private static readonly JsonSerializerOptions QueueJsonOptions = new()`
`16`	`18`	`{`
`17`	`19`	`PropertyNamingPolicy = JsonNamingPolicy.CamelCase,`
`@@ -20,14 +22,14 @@ public abstract class QueueClientBase(ILogger logger, QueueServiceClient queueSe`
`20`	`22`
`21`	`23`	`private QueueClient CreateClient()`
`22`	`24`	`{`
`23`		`- var client = queueServiceClient.GetQueueClient(queueName);`
	`25`	`+ var client = queueServiceClient.GetQueueClient(QueueName);`
`24`	`26`	`client.CreateIfNotExists(); // TODO - consider environment gating this`
`25`	`27`	`return client;`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`private QueueClient CreatePoisonClient()`
`29`	`31`	`{`
`30`		`- var poisonQueueName = $"{queueName}-poison";`
	`32`	`+ var poisonQueueName = $"{QueueName}-poison";`
`31`	`33`	`var client = queueServiceClient.GetQueueClient(poisonQueueName);`
`32`	`34`	`client.CreateIfNotExists(); // TODO - consider environment gating this`
`33`	`35`	`return client;`
`@@ -43,7 +45,7 @@ protected async Task SendJsonMessageAsync<T>(T message)`
`43`	`45`	`catch (Exception e)`
`44`	`46`	`{`
`45`	`47`	`// TODO - consider including file ID or correlation ID in error logs`
`46`		`- logger.LogError(e, "Error sending message to queue {QueueName}", queueName);`
	`48`	`+ logger.LogError(e, "Error sending message to queue {QueueName}", QueueName);`
`47`	`49`	`throw;`
`48`	`50`	`}`
`49`	`51`	`}`
`@@ -57,7 +59,7 @@ protected async Task SendToPoisonQueueAsync<T>(T message)`
`57`	`59`	`}`
`58`	`60`	`catch (Exception e)`
`59`	`61`	`{`
`60`		`- logger.LogError(e, "Error sending message to poison queue {PoisonQueueName}", $"{queueName}-poison");`
	`62`	`+ logger.LogError(e, "Error sending message to poison queue {PoisonQueueName}", $"{QueueName}-poison");`
`61`	`63`	`throw;`
`62`	`64`	`}`
`63`	`65`	`}`