From d1581ac0eaeb4484928ec9ad9356fc591a6fcd76 Mon Sep 17 00:00:00 2001
From: Ronny Birkeli <ronny.birkeli@digdir.no>
Date: Fri, 16 Jun 2023 11:49:21 +0200
Subject: [PATCH 1/2] Document the used parameters for the SSB classifications
 provider

---
 src/Altinn.Codelists/Altinn.Codelists.csproj  |  2 +-
 .../SSB/ClassificationCodelistProvider.cs     | 19 +++++++++++++++++++
 .../IndustryGroupingCodelistProviderTests.cs  |  2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/Altinn.Codelists/Altinn.Codelists.csproj b/src/Altinn.Codelists/Altinn.Codelists.csproj
index 3886e71..12ead0f 100644
--- a/src/Altinn.Codelists/Altinn.Codelists.csproj
+++ b/src/Altinn.Codelists/Altinn.Codelists.csproj
@@ -24,7 +24,7 @@
 
   <ItemGroup>
 		<!-- This defines the minimum required version of Altinn.App.Core and should not be bumped unless new features require it.-->
-    <PackageReference Include="Altinn.App.Core" Version="7.8.0" />
+    <PackageReference Include="Altinn.App.Core" Version="7.11.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
     <PackageReference Include="Scrutor" Version="4.2.2" />
 	<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
diff --git a/src/Altinn.Codelists/SSB/ClassificationCodelistProvider.cs b/src/Altinn.Codelists/SSB/ClassificationCodelistProvider.cs
index 7983363..0565fa2 100644
--- a/src/Altinn.Codelists/SSB/ClassificationCodelistProvider.cs
+++ b/src/Altinn.Codelists/SSB/ClassificationCodelistProvider.cs
@@ -67,6 +67,25 @@ public async Task<AppOptions> GetAppOptionsAsync(string language, Dictionary<str
 
         AppOptions appOptions = GetAppOptions(classificationCode, parentCode);
 
+        // Parameters used added to Parameters collection in AppOptions for reference and documentation purposes.
+        // Add well known parameters first.
+        appOptions.Parameters.Add("id", _classificationId.ToString());
+        appOptions.Parameters.Add("variant", variant);
+        appOptions.Parameters.Add("date", dateOnly.ToString());
+        appOptions.Parameters.Add("language", language);
+        appOptions.Parameters.Add("level", level);
+        appOptions.Parameters.Add("parentCode", parentCode);
+
+        // Add any other parameters.
+        List<string> knownKeys = new () { "id", "variant", "date", "language", "level", "parentCode" };
+        foreach (var keyValuePair in mergedKeyValuePairs)
+        {
+            if (!knownKeys.Contains(keyValuePair.Key))
+            {
+                appOptions.Parameters.Add(keyValuePair.Key, keyValuePair.Value);
+            }
+        }
+
         return appOptions;
     }
 
diff --git a/test/Altinn.Codelists.Tests/SSB/IndustryGroupingCodelistProviderTests.cs b/test/Altinn.Codelists.Tests/SSB/IndustryGroupingCodelistProviderTests.cs
index 1cf1b77..192ae99 100644
--- a/test/Altinn.Codelists.Tests/SSB/IndustryGroupingCodelistProviderTests.cs
+++ b/test/Altinn.Codelists.Tests/SSB/IndustryGroupingCodelistProviderTests.cs
@@ -32,6 +32,7 @@ public async Task GetAppOptionsAsync_FirstLevelOnly_ShouldReturnListOfCodes()
 
         appOptions.Options.Should().HaveCount(21);
         appOptions.Options.First(x => x.Value == "A").Label.Should().Be("Jordbruk, skogbruk og fiske");
+        appOptions.Parameters.First(x => x.Key == "level").Value.Should().Be("1");
     }
 
     [Fact]
@@ -44,5 +45,6 @@ public async Task GetAppOptionsAsync_DefaultFirstLevel_ShouldReturnListOfCodes()
 
         appOptions.Options.Should().HaveCount(21);
         appOptions.Options.First(x => x.Value == "A").Label.Should().Be("Jordbruk, skogbruk og fiske");
+        appOptions.Parameters.First(x => x.Key == "language").Value.Should().Be("nb");
     }
 }

From 407df852140ef4255996d4dc5b3f22cc47c0f9c6 Mon Sep 17 00:00:00 2001
From: Ronny Birkeli <ronny.birkeli@digdir.no>
Date: Thu, 19 Oct 2023 06:39:42 +0200
Subject: [PATCH 2/2] Fix error when adding parameter allready added.

---
 .../SSB/ClassificationCodelistProvider.cs          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Altinn.Codelists/SSB/ClassificationCodelistProvider.cs b/src/Altinn.Codelists/SSB/ClassificationCodelistProvider.cs
index f57c700..35f3547 100644
--- a/src/Altinn.Codelists/SSB/ClassificationCodelistProvider.cs
+++ b/src/Altinn.Codelists/SSB/ClassificationCodelistProvider.cs
@@ -72,12 +72,12 @@ public async Task<AppOptions> GetAppOptionsAsync(string language, Dictionary<str
 
         // Parameters used added to Parameters collection in AppOptions for reference and documentation purposes.
         // Add well known parameters first.
-        appOptions.Parameters.Add("id", _classificationId.ToString());
-        appOptions.Parameters.Add("variant", variant);
-        appOptions.Parameters.Add("date", dateOnly.ToString());
-        appOptions.Parameters.Add("language", language);
-        appOptions.Parameters.Add("level", level);
-        appOptions.Parameters.Add("parentCode", parentCode);
+        appOptions.Parameters.TryAdd("id", _classificationId.ToString());
+        appOptions.Parameters.TryAdd("variant", variant);
+        appOptions.Parameters.TryAdd("date", dateOnly.ToString());
+        appOptions.Parameters.TryAdd("language", language);
+        appOptions.Parameters.TryAdd("level", level);
+        appOptions.Parameters.TryAdd("parentCode", parentCode);
 
         // Add any other parameters.
         List<string> knownKeys = new () { "id", "variant", "date", "language", "level", "parentCode" };
@@ -85,7 +85,7 @@ public async Task<AppOptions> GetAppOptionsAsync(string language, Dictionary<str
         {
             if (!knownKeys.Contains(keyValuePair.Key))
             {
-                appOptions.Parameters.Add(keyValuePair.Key, keyValuePair.Value);
+                appOptions.Parameters.TryAdd(keyValuePair.Key, keyValuePair.Value);
             }
         }