feat: make explicit model for dataset alias

data-altinn-no · Jan 21, 2025 · 807b240 · 807b240
1 parent aa2fcd8
commit 807b240
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 13 deletions.
diff --git a/Dan.Common/Models/DatasetAlias.cs b/Dan.Common/Models/DatasetAlias.cs
@@ -0,0 +1,17 @@
+namespace Dan.Common.Models;
+
+/// <summary>
+/// Model for alias for a dataset
+/// </summary>
+public class DatasetAlias
+{
+    /// <summary>
+    /// Which service context this alias applies to
+    /// </summary>
+    public string ServiceContext { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Alias name
+    /// </summary>
+    public string DatasetAliasName { get; set; } = string.Empty;
+}
diff --git a/Dan.Common/Models/EvidenceCode.cs b/Dan.Common/Models/EvidenceCode.cs
@@ -147,10 +147,10 @@ public class EvidenceCode
     public string? License { get; set; }
 
     /// <summary>
-    /// Optional setting for aliases. Key is service context, value is Dataset name
+    /// Optional setting for aliases
     /// Allows for the same dataset to be shared between service contexts with different names.
     /// </summary>
     [DataMember(Name = "datasetAliases")]
     [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-    public Dictionary<string,string>? DatasetAliases { get; set; }
+    public List<DatasetAlias>? DatasetAliases { get; set; }
 }
diff --git a/Dan.Core.UnitTest/AvailableEvidenceCodesServiceTest.cs b/Dan.Core.UnitTest/AvailableEvidenceCodesServiceTest.cs
@@ -61,10 +61,10 @@ public class AvailableEvidenceCodesServiceTest
             {
                 EvidenceCodeName = "ec3",
                 BelongsToServiceContexts = new List<string> { "sc1", "sc2" },
-                DatasetAliases = new Dictionary<string, string>
+                DatasetAliases = new List<DatasetAlias>
                 {
-                    {"sc1", "a1"},
-                    {"sc2", "a2"}
+                    new() {ServiceContext = "sc1", DatasetAliasName = "a1"},
+                    new() {ServiceContext = "sc2", DatasetAliasName = "a2"}
                 },
                 AuthorizationRequirements = new List<Requirement>
                 {

diff --git a/Dan.Core/Services/AvailableEvidenceCodesService.cs b/Dan.Core/Services/AvailableEvidenceCodesService.cs
@@ -105,7 +105,7 @@ public Dictionary<string, string> GetAliases()
         {
             foreach (var alias in aliasedEvidenceCode.DatasetAliases!)
             {
-                aliases.Add(alias.Value, aliasedEvidenceCode.EvidenceCodeName);
+                aliases.Add(alias.DatasetAliasName, aliasedEvidenceCode.EvidenceCodeName);
             }
         }
 
@@ -270,15 +270,15 @@ private static List<EvidenceCode> SplitAliases(IEnumerable<EvidenceCode> evidenc
             foreach (var alias in evidenceCode.DatasetAliases!)
             {
                 var aliasedEvidenceCode = evidenceCode.DeepCopy();
-                aliasedEvidenceCode.ServiceContext = alias.Key;
-                aliasedEvidenceCode.BelongsToServiceContexts = [alias.Key];
-                aliasedEvidenceCode.EvidenceCodeName = alias.Value;
+                aliasedEvidenceCode.ServiceContext = alias.ServiceContext;
+                aliasedEvidenceCode.BelongsToServiceContexts = [alias.ServiceContext];
+                aliasedEvidenceCode.EvidenceCodeName = alias.DatasetAliasName;
                 aliasedEvidenceCode.DatasetAliases = null;
                 aliasedEvidenceCode.AuthorizationRequirements = aliasedEvidenceCode
                     .AuthorizationRequirements
                     .Where(a =>
                         a.AppliesToServiceContext.Count == 0 ||
-                        a.AppliesToServiceContext.Contains(alias.Key))
+                        a.AppliesToServiceContext.Contains(alias.ServiceContext))
                     .ToList();
 
                 splitEvidenceCodes.Add(aliasedEvidenceCode);

diff --git a/Dan.PluginTest/Metadata.cs b/Dan.PluginTest/Metadata.cs
@@ -36,10 +36,10 @@ public List<EvidenceCode> GetEvidenceCodes()
                 EvidenceCodeName = PluginConstants.DatasetOne,
                 EvidenceSource = PluginConstants.Source,
                 BelongsToServiceContexts = _serviceContexts,
-                DatasetAliases = new Dictionary<string, string>()
+                DatasetAliases = new List<DatasetAlias>()
                 {
-                    { DanTest, "AliasOne" },
-                    { AltinnStudioApps, "AliasTwo" },
+                    new (){ ServiceContext = DanTest, DatasetAliasName = "AliasOne" },
+                    new (){ ServiceContext = AltinnStudioApps, DatasetAliasName = "AliasTwo" },
                 },
                 Values =
                 [