refactor GetStorageSettings to AddStorageAccountSettings

Related to: #319
aliencube · Sep 14, 2024 · 7e5a9a5 · 7e5a9a5
1 parent 29b9486
commit 7e5a9a5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/src/AzureOpenAIProxy.ApiApp/Extensions/StorageSettingsExtensions.cs b/src/AzureOpenAIProxy.ApiApp/Extensions/StorageSettingsExtensions.cs
@@ -13,14 +13,18 @@ public static class StorageSettingsExtensions
     /// </summary>
     /// <param name="services"><see cref="IServiceCollection"/> instance.</param>
     /// <returns>Returns <see cref="StorageAccountSettings"/> instance.</returns>
-    public static StorageAccountSettings GetStorageSettings(this IServiceCollection services)
+    public static IServiceCollection AddStorageAccountSettings(this IServiceCollection services)
     {
-        var configuration = services.BuildServiceProvider().GetService<IConfiguration>()
-            ?? throw new InvalidOperationException($"{nameof(IConfiguration)} service is not registered.");
+        services.AddSingleton<StorageAccountSettings>(sp => {
+            var configuration = sp.GetService<IConfiguration>()
+                ?? throw new InvalidOperationException($"{nameof(IConfiguration)} service is not registered.");
 
-        var settings = configuration.GetSection(StorageAccountSettings.Name).Get<StorageAccountSettings>()
-            ?? throw new InvalidOperationException($"{nameof(StorageAccountSettings)} could not be retrieved from the configuration.");
+            var settings = configuration.GetSection(StorageAccountSettings.Name).Get<StorageAccountSettings>()
+                ?? throw new InvalidOperationException($"{nameof(StorageAccountSettings)} could not be retrieved from the configuration.");
 
-        return settings;
+            return settings;
+        });
+
+        return services;
     }
 }
diff --git a/src/AzureOpenAIProxy.ApiApp/Program.cs b/src/AzureOpenAIProxy.ApiApp/Program.cs
@@ -16,6 +16,9 @@
 // Add OpenAPI service
 builder.Services.AddOpenApiService();
 
+// Add Storage Account settings
+builder.Services.AddStorageAccountSettings();
+
 // Add TableStorageClient
 builder.Services.AddTableStorageService();
 

diff --git a/src/AzureOpenAIProxy.ApiApp/Repositories/AdminEventRepository.cs b/src/AzureOpenAIProxy.ApiApp/Repositories/AdminEventRepository.cs
@@ -1,4 +1,6 @@
-using AzureOpenAIProxy.ApiApp.Configurations;
+using Azure.Data.Tables;
+
+using AzureOpenAIProxy.ApiApp.Configurations;
 using AzureOpenAIProxy.ApiApp.Extensions;
 using AzureOpenAIProxy.ApiApp.Models;
 
@@ -41,9 +43,10 @@ public interface IAdminEventRepository
 /// <summary>
 /// This represents the repository entity for the admin event.
 /// </summary>
-public class AdminEventRepository(IServiceCollection sc) : IAdminEventRepository
+public class AdminEventRepository(TableServiceClient tableServiceClient, StorageAccountSettings storageAccountSettings) : IAdminEventRepository
 {
-    private readonly StorageAccountSettings _storageSettings = sc.GetStorageSettings();
+    private readonly TableServiceClient _tableServiceClient = tableServiceClient;
+    private readonly StorageAccountSettings _storageAccountSettings = storageAccountSettings;
 
     /// <inheritdoc />
     public async Task<AdminEventDetails> CreateEvent(AdminEventDetails eventDetails)
@@ -82,7 +85,7 @@ public static class AdminEventRepositoryExtensions
     /// <returns>Returns <see cref="IServiceCollection"/> instance.</returns>
     public static IServiceCollection AddAdminEventRepository(this IServiceCollection services)
     {
-        services.AddScoped<IAdminEventRepository>(p => new AdminEventRepository(services));
+        services.AddScoped<IAdminEventRepository, AdminEventRepository>();
 
         return services;
     }