Fix multiple registrations of basic services.

Altinn · May 22, 2023 · 22aeff2 · 22aeff2
1 parent 9dc2fda
commit 22aeff2
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 8 deletions.
diff --git a/src/Altinn.Codelists/SSB/Extensions/ServiceCollectionExtensions.cs b/src/Altinn.Codelists/SSB/Extensions/ServiceCollectionExtensions.cs
@@ -15,11 +15,7 @@ public static class ServiceCollectionExtensions
     /// </summary>
     public static IServiceCollection AddSSBClassifications(this IServiceCollection services)
     {
-        // Basic setup
-        services.AddMemoryCache();
-        services.AddOptions<ClassificationSettings>();
-        services.AddHttpClient<IClassificationsClient, ClassificationsHttpClient>();
-        services.Decorate<IClassificationsClient, ClassificationsHttpClientCached>();
+        EnsureBasicServicesRegistered(services);
 
         // Add the codelist providers
         services.AddSSBClassificationCodelistProvider("kjønn", Classification.Sex);
@@ -34,6 +30,20 @@ public static IServiceCollection AddSSBClassifications(this IServiceCollection s
         return services;
     }
 
+    // Services added here should be safe to add multiple times
+    // either resulting in singleton or replacing the existing service
+    private static void EnsureBasicServicesRegistered(IServiceCollection services)
+    {
+        services.AddMemoryCache();
+        services.AddOptions<ClassificationSettings>();
+
+        if (services.All(x => x.ServiceType != typeof(IClassificationsClient)))
+        {
+            services.AddHttpClient<IClassificationsClient, ClassificationsHttpClient>();
+            services.TryDecorate<IClassificationsClient, ClassificationsHttpClientCached>();
+        }        
+    }
+
     /// <summary>
     /// Adds the specified <see cref="Classification"/> as an <see cref="IAppOptionsProvider"/> with the specified id.
     /// </summary>
@@ -43,6 +53,7 @@ public static IServiceCollection AddSSBClassifications(this IServiceCollection s
     /// <param name="defaultKeyValuePairs">Default set of key/value pairs to be used. Will be overriden by matching qyery parameters runtime.</param>
     public static IServiceCollection AddSSBClassificationCodelistProvider(this IServiceCollection services, string id, Classification classification, Dictionary<string, string>? defaultKeyValuePairs = null)
     {
+        EnsureBasicServicesRegistered(services);
         services.AddTransient<IAppOptionsProvider>(sp => new ClassificationCodelistProvider(id, classification, sp.GetRequiredService<IClassificationsClient>(), defaultKeyValuePairs));
 
         return services;
@@ -59,6 +70,7 @@ public static IServiceCollection AddSSBClassificationCodelistProvider(this IServ
     /// <param name="defaultKeyValuePairs">Default set of key/value pairs to be used. Will be overriden by matching qyery parameters runtime.</param>
     public static IServiceCollection AddSSBClassificationCodelistProvider(this IServiceCollection services, string id, Classification classification, ClassificationOptions options, Dictionary<string, string>? defaultKeyValuePairs = null)
     {
+        EnsureBasicServicesRegistered(services);
         services.AddTransient<IAppOptionsProvider>(sp => new ClassificationCodelistProvider(id, classification, sp.GetRequiredService<IClassificationsClient>(), options, defaultKeyValuePairs));
 
         return services;
@@ -74,6 +86,7 @@ public static IServiceCollection AddSSBClassificationCodelistProvider(this IServ
     /// <param name="defaultKeyValuePairs">Default set of key/value pairs to be used. Will be overriden by matching qyery parameters runtime.</param>
     public static IServiceCollection AddSSBClassificationCodelistProvider(this IServiceCollection services, string id, int classificationId, Dictionary<string, string>? defaultKeyValuePairs = null)
     {
+        EnsureBasicServicesRegistered(services);
         services.AddTransient<IAppOptionsProvider>(sp => new ClassificationCodelistProvider(id, classificationId, sp.GetRequiredService<IClassificationsClient>(), defaultKeyValuePairs));
 
         return services;
@@ -90,6 +103,7 @@ public static IServiceCollection AddSSBClassificationCodelistProvider(this IServ
     /// <param name="defaultKeyValuePairs">Default set of key/value pairs to be used. Will be overriden by matching qyery parameters runtime.</param>
     public static IServiceCollection AddSSBClassificationCodelistProvider(this IServiceCollection services, string id, int classificationId, ClassificationOptions options, Dictionary<string, string>? defaultKeyValuePairs = null)
     {
+        EnsureBasicServicesRegistered(services);
         services.AddTransient<IAppOptionsProvider>(sp => new ClassificationCodelistProvider(id, classificationId, sp.GetRequiredService<IClassificationsClient>(), defaultKeyValuePairs, options));
 
         return services;

diff --git a/test/Altinn.Codelists.Tests/SSB/Extensions/ExtensionTests.cs b/test/Altinn.Codelists.Tests/SSB/Extensions/ExtensionTests.cs
@@ -0,0 +1,27 @@
+using Altinn.Codelists.SSB;
+using Altinn.Codelists.SSB.Extensions;
+using Altinn.Codelists.SSB.Models;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Altinn.Codelists.Tests.SSB.Extensions
+{
+    public class ExtensionTests
+    {
+        [Fact]
+        public void AddSSBClassifications()
+        {
+            IServiceCollection services = new ServiceCollection();
+            services.AddSSBClassificationCodelistProvider("sivilstand", Classification.MaritalStatus);
+            services.AddSSBClassificationCodelistProvider("yrker", Classification.Occupations);
+
+            IServiceProvider serviceProvider = services.BuildServiceProvider();
+
+            services.Select(x => x.ServiceType == typeof(IClassificationsClient)).Should().HaveCount(2);
+        }
+    }
+}
diff --git a/test/Altinn.Codelists.Tests/SSB/Testdata/classifications.http b/test/Altinn.Codelists.Tests/SSB/Testdata/classifications.http
@@ -52,14 +52,14 @@ Accept: application/json;charset=utf-8
 
 ###
 # Småvilt med variant
-GET https://data.ssb.no/api/klass/v1/classifications/74/codesAt?date=2023-03-12
+GET https://data.ssb.no/api/klass/v1/classifications/74/codesAt?date=2023-03-12&language=nn
 Accept: application/json;charset=utf-8
 
 ###
-GET https://data.ssb.no/api/klass/v1/classifications/74/variantAt?&date=2023-01-01&language=nb&variantName=Hønsefugler, spurvefugler, skarver og due 2023-03  - variant av Klassifisering av småvilt 2017-04
+GET https://data.ssb.no/api/klass/v1/classifications/74/variantAt?language=nn&date=2023-03-03&variantName=Hønsefugler, spurvefugler og due 2023-03  - variant av Klassifisering av småvilt 2017-04
 Accept: application/json;charset=utf-8
 
 ###
 
-GET http://data.ssb.no/api/klass/v1/variants/2103
+GET http://data.ssb.no/api/klass/v1/variants/2103?language=nb
 Accept: application/json;charset=utf-8