Added generic attributes

dei79 · dei79 · commit af3bd139da33 · 2023-04-18T22:04:00.000+02:00
diff --git a/Branding.sln b/Branding.sln
@@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreHelpers.Branding.AspNet
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreHelpers.Branding.Stores.AzureStorage.Tests", "CoreHelpers.Branding.Stores.AzureStorage.Tests\CoreHelpers.Branding.Stores.AzureStorage.Tests.csproj", "{802BB680-BF47-4B74-A7DF-3FC81B07D6E9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreHelpers.Branding.Runtime.Tests", "CoreHelpers.Branding.Runtime.Tests\CoreHelpers.Branding.Runtime.Tests.csproj", "{7C362EF5-CD21-4A26-835C-24AB6194A614}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -44,6 +46,10 @@ Global
 		{802BB680-BF47-4B74-A7DF-3FC81B07D6E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{802BB680-BF47-4B74-A7DF-3FC81B07D6E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{802BB680-BF47-4B74-A7DF-3FC81B07D6E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C362EF5-CD21-4A26-835C-24AB6194A614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C362EF5-CD21-4A26-835C-24AB6194A614}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C362EF5-CD21-4A26-835C-24AB6194A614}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C362EF5-CD21-4A26-835C-24AB6194A614}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CoreHelpers.Branding.Runtime.Abstractions/ICompanyBranding.cs b/CoreHelpers.Branding.Runtime.Abstractions/ICompanyBranding.cs
@@ -25,17 +25,19 @@ public interface ICompanyBrandingColors
         string Primary { get; }
         string PrimaryHover { get; }
 		string PrimaryFont { get; }
-	}
-    
+	}    
+
     public interface ICompanyBranding
 	{
-		string Name { get; }
+		string Name { get; }		
 
 		Dictionary<nLogoSize, string> Logos { get; }
 
 		Dictionary<nLegalItems, string> Legals { get; }
 
         ICompanyBrandingColors Colors { get; }
+
+		Dictionary<string, string> Attributes { get; }
     }
 }
 
diff --git a/CoreHelpers.Branding.Runtime.Tests/BrandingBuilderTests.cs b/CoreHelpers.Branding.Runtime.Tests/BrandingBuilderTests.cs
@@ -0,0 +1,32 @@
+﻿namespace CoreHelpers.Branding.Runtime.Tests;
+
+using CoreHelpers.Branding.Runtime.Services;
+
+public class BrandingBuilderTests
+{
+    [Fact]
+    public void TestLogos()
+    {
+        var builder = new BrandingBuilder();
+        Assert.Equal("small", builder.AddLogo(nLogoSize.small, "small").Build().Logos[nLogoSize.small]);
+        Assert.Equal("medium", builder.AddLogo(nLogoSize.medium, "medium").Build().Logos[nLogoSize.medium]);
+        Assert.Equal("large", builder.AddLogo(nLogoSize.large, "large").Build().Logos[nLogoSize.large]);
+        Assert.Equal("fav16", builder.AddLogo(nLogoSize.fav16, "fav16").Build().Logos[nLogoSize.fav16]);
+        Assert.Equal("fav32", builder.AddLogo(nLogoSize.fav32, "fav32").Build().Logos[nLogoSize.fav32]);
+    }
+
+    [Fact]
+    public void TestLegals()
+    {
+        var builder = new BrandingBuilder();
+        Assert.Equal("IMPRINT", builder.AddLegal(nLegalItems.imprint, "IMPRINT").Build().Legals[nLegalItems.imprint]);
+        Assert.Equal("DP", builder.AddLegal(nLegalItems.dataPrivacy, "DP").Build().Legals[nLegalItems.dataPrivacy]);
+    }
+
+    [Fact]
+    public void TestAttributes()
+    {
+        var builder = new BrandingBuilder();
+        Assert.Equal("demo", builder.AddAttribute("attr01", "demo").Build().Attributes["attr01"]);        
+    }
+}
diff --git a/CoreHelpers.Branding.Runtime.Tests/CoreHelpers.Branding.Runtime.Tests.csproj b/CoreHelpers.Branding.Runtime.Tests/CoreHelpers.Branding.Runtime.Tests.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CoreHelpers.Branding.Runtime\CoreHelpers.Branding.Runtime.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/CoreHelpers.Branding.Runtime.Tests/Usings.cs b/CoreHelpers.Branding.Runtime.Tests/Usings.cs
@@ -0,0 +1 @@
+﻿global using Xunit;
diff --git a/CoreHelpers.Branding.Runtime/CoreHelpers.Branding.Runtime.csproj b/CoreHelpers.Branding.Runtime/CoreHelpers.Branding.Runtime.csproj
@@ -14,9 +14,11 @@
 
   <ItemGroup>
     <None Remove="Services\" />
+    <None Remove="Properties\" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Services\" />
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CoreHelpers.Branding.Runtime.Abstractions\CoreHelpers.Branding.Runtime.Abstractions.csproj" />
diff --git a/CoreHelpers.Branding.Runtime/Properties/AssemblyInfo.cs b/CoreHelpers.Branding.Runtime/Properties/AssemblyInfo.cs
@@ -0,0 +1,4 @@
+﻿using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("CoreHelpers.Branding.Runtime.Tests")]
diff --git a/CoreHelpers.Branding.Runtime/Services/BrandingBuilder.cs b/CoreHelpers.Branding.Runtime/Services/BrandingBuilder.cs
@@ -3,7 +3,7 @@
 
 namespace CoreHelpers.Branding.Runtime.Services
 {
-    public class BrandingBuilderColorModel : ICompanyBrandingColors
+    internal class BrandingBuilderColorModel : ICompanyBrandingColors
     {
         public string Font { get; set; } = string.Empty;
 
@@ -18,7 +18,7 @@ public class BrandingBuilderColorModel : ICompanyBrandingColors
         public string PrimaryFont { get; set; } = string.Empty;
     }
 
-    public class BrandingBuilderModel : ICompanyBranding
+    internal class BrandingBuilderModel : ICompanyBranding
     {
         public string Name { get; set; } = string.Empty;
 
@@ -27,9 +27,11 @@ public class BrandingBuilderModel : ICompanyBranding
         public Dictionary<nLegalItems, string> Legals { get; } = new Dictionary<nLegalItems, string>();
 
         public ICompanyBrandingColors Colors { get; set; } = new BrandingBuilderColorModel();
+
+        public Dictionary<string, string> Attributes { get; set; } = new Dictionary<string, string>();
     }
-  
-    public class BrandingBuilder : IBrandingBuilder
+
+    internal class BrandingBuilder : IBrandingBuilder
     {
         private BrandingBuilderModel model = new BrandingBuilderModel();
         private BrandingBuilderColorModel colorModel = new BrandingBuilderColorModel();
@@ -93,6 +95,16 @@ public IBrandingBuilder SetColor(nColorType colorType, string colorValue)
             return this;
         }
 
+        public IBrandingBuilder AddAttribute(string key, string value)
+        {
+            if (model.Attributes.ContainsKey(key))
+                model.Attributes[key] = value;
+            else
+                model.Attributes.Add(key, value);
+
+            return this;
+        }
+
         public ICompanyBranding Build()
         {
             return model;
diff --git a/CoreHelpers.Branding.Runtime/Services/BrandingManager.cs b/CoreHelpers.Branding.Runtime/Services/BrandingManager.cs
@@ -5,7 +5,7 @@
 
 namespace CoreHelpers.Branding.Runtime.Services
 {
-	public class BrandingManager : IBrandingManager
+	internal class BrandingManager : IBrandingManager
     {
         private IEnumerable<IBrandingStore> _stores;
         private IMemoryCache _memoryCache;
diff --git a/CoreHelpers.Branding.Runtime/Services/BrandingStateService.cs b/CoreHelpers.Branding.Runtime/Services/BrandingStateService.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 namespace CoreHelpers.Branding.Runtime.Services
 {
-	public class BrandingStateService : IBrandingStateService
+	internal class BrandingStateService : IBrandingStateService
     {
 		public ICompanyBranding CurrentCompanyBranding { get; private set; }
 
diff --git a/CoreHelpers.Branding.Stores.AzureStorage.Tests/CoreHelpers.Branding.Stores.AzureStorage.Tests.csproj b/CoreHelpers.Branding.Stores.AzureStorage.Tests/CoreHelpers.Branding.Stores.AzureStorage.Tests.csproj
@@ -31,6 +31,9 @@
     <None Update="DataFiles\BasicCompanyBranding.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="DataFiles\BasicCompanyBranding %28copy%29.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CoreHelpers.Branding.Stores.AzureStorage\CoreHelpers.Branding.Stores.AzureStorage.csproj" />
diff --git a/CoreHelpers.Branding.Stores.AzureStorage.Tests/DataFiles/BasicCompanyBranding.json b/CoreHelpers.Branding.Stores.AzureStorage.Tests/DataFiles/BasicCompanyBranding.json
@@ -10,5 +10,9 @@
   "colors": {
     "primary": "#e20074",
     "PrimaryFont": "white"
+  },
+  "attributes": {
+    "attr01": "demo01",
+    "attr02": "demo02"
   }
 }
diff --git a/CoreHelpers.Branding.Stores.AzureStorage.Tests/DataFiles/BasicCompanyBrandingWithAttributes.json b/CoreHelpers.Branding.Stores.AzureStorage.Tests/DataFiles/BasicCompanyBrandingWithAttributes.json
@@ -0,0 +1,14 @@
+﻿{
+  "name": "Demo App",
+  "logos": {
+    "small": "https://acme.org/demo.png"
+  },
+  "legals": {
+    "imprint": "https://acme.org/imprint",
+    "dataPrivacy": "https://acme.org/privacy"
+  },
+  "colors": {
+    "primary": "#e20074",
+    "PrimaryFont": "white"
+  }
+}
diff --git a/CoreHelpers.Branding.Stores.AzureStorage.Tests/VerifySerialization.cs b/CoreHelpers.Branding.Stores.AzureStorage.Tests/VerifySerialization.cs
@@ -7,7 +7,7 @@ namespace CoreHelpers.Branding.Stores.AzureStorage.Tests;
 public class UnitTest1
 {
     [Fact]
-    public void Test1()
+    public void TestwithoutAttributes()
     {
         // read the data
         var dataAsString = File.ReadAllText("./DataFiles/BasicCompanyBranding.json");
@@ -23,4 +23,25 @@ public void Test1()
         Assert.Equal("#e20074", dataModel?.Colors.Primary);
         Assert.Equal("white", dataModel?.Colors.PrimaryFont);
     }
+
+    [Fact]
+    public void TestWithAttributes()
+    {
+        // read the data
+        var dataAsString = File.ReadAllText("./DataFiles/BasicCompanyBranding.json");
+
+        // deserialize
+        var dataModel = JsonConvert.DeserializeObject<AzureStorageCompanyBranding>(dataAsString);
+
+        // verify the properties
+        Assert.Equal("https://acme.org/imprint", dataModel?.Legals[nLegalItems.imprint]);
+        Assert.Equal("https://acme.org/privacy", dataModel?.Legals[nLegalItems.dataPrivacy]);
+        Assert.Equal("https://acme.org/demo.png", dataModel?.Logos[nLogoSize.small]);
+
+        Assert.Equal("#e20074", dataModel?.Colors.Primary);
+        Assert.Equal("white", dataModel?.Colors.PrimaryFont);
+
+        Assert.Equal("demo01", dataModel?.Attributes["attr01"]);
+        Assert.Equal("demo02", dataModel?.Attributes["attr02"]);
+    }
 }
diff --git a/CoreHelpers.Branding.Stores.AzureStorage/AzureStorageCompanyBranding.cs b/CoreHelpers.Branding.Stores.AzureStorage/AzureStorageCompanyBranding.cs
@@ -30,6 +30,8 @@ internal class AzureStorageCompanyBranding : ICompanyBranding
 
         [JsonConverter(typeof(ConcreteTypeConverter<AzureStorageCompanyBrandingColors>))]
         public ICompanyBrandingColors Colors { get; set; }
+
+        public Dictionary<string, string> Attributes { get; set; } = new Dictionary<string, string>();
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -25,17 +25,19 @@ public interface ICompanyBrandingColors`
`25`	`25`	`string Primary { get; }`
`26`	`26`	`string PrimaryHover { get; }`
`27`	`27`	`string PrimaryFont { get; }`
`28`		`- }`
`29`		`-`
	`28`	`+ }`
	`29`	`+`
`30`	`30`	`public interface ICompanyBranding`
`31`	`31`	`{`
`32`		`- string Name { get; }`
	`32`	`+ string Name { get; }`
`33`	`33`
`34`	`34`	`Dictionary<nLogoSize, string> Logos { get; }`
`35`	`35`
`36`	`36`	`Dictionary<nLegalItems, string> Legals { get; }`
`37`	`37`
`38`	`38`	`ICompanyBrandingColors Colors { get; }`
	`39`	`+`
	`40`	`+ Dictionary<string, string> Attributes { get; }`
`39`	`41`	`}`
`40`	`42`	`}`
`41`	`43`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace CoreHelpers.Branding.Runtime.Services`
`5`	`5`	`{`
`6`		`- public class BrandingBuilderColorModel : ICompanyBrandingColors`
	`6`	`+ internal class BrandingBuilderColorModel : ICompanyBrandingColors`
`7`	`7`	`{`
`8`	`8`	`public string Font { get; set; } = string.Empty;`
`9`	`9`
`@@ -18,7 +18,7 @@ public class BrandingBuilderColorModel : ICompanyBrandingColors`
`18`	`18`	`public string PrimaryFont { get; set; } = string.Empty;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public class BrandingBuilderModel : ICompanyBranding`
	`21`	`+ internal class BrandingBuilderModel : ICompanyBranding`
`22`	`22`	`{`
`23`	`23`	`public string Name { get; set; } = string.Empty;`
`24`	`24`
`@@ -27,9 +27,11 @@ public class BrandingBuilderModel : ICompanyBranding`
`27`	`27`	`public Dictionary<nLegalItems, string> Legals { get; } = new Dictionary<nLegalItems, string>();`
`28`	`28`
`29`	`29`	`public ICompanyBrandingColors Colors { get; set; } = new BrandingBuilderColorModel();`
	`30`	`+`
	`31`	`+ public Dictionary<string, string> Attributes { get; set; } = new Dictionary<string, string>();`
`30`	`32`	`}`
`31`		`-`
`32`		`- public class BrandingBuilder : IBrandingBuilder`
	`33`	`+`
	`34`	`+ internal class BrandingBuilder : IBrandingBuilder`
`33`	`35`	`{`
`34`	`36`	`private BrandingBuilderModel model = new BrandingBuilderModel();`
`35`	`37`	`private BrandingBuilderColorModel colorModel = new BrandingBuilderColorModel();`
`@@ -93,6 +95,16 @@ public IBrandingBuilder SetColor(nColorType colorType, string colorValue)`
`93`	`95`	`return this;`
`94`	`96`	`}`
`95`	`97`
	`98`	`+ public IBrandingBuilder AddAttribute(string key, string value)`
	`99`	`+ {`
	`100`	`+ if (model.Attributes.ContainsKey(key))`
	`101`	`+ model.Attributes[key] = value;`
	`102`	`+ else`
	`103`	`+ model.Attributes.Add(key, value);`
	`104`	`+`
	`105`	`+ return this;`
	`106`	`+ }`
	`107`	`+`
`96`	`108`	`public ICompanyBranding Build()`
`97`	`109`	`{`
`98`	`110`	`return model;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace CoreHelpers.Branding.Runtime.Services`
`7`	`7`	`{`
`8`		`- public class BrandingManager : IBrandingManager`
	`8`	`+ internal class BrandingManager : IBrandingManager`
`9`	`9`	`{`
`10`	`10`	`private IEnumerable<IBrandingStore> _stores;`
`11`	`11`	`private IMemoryCache _memoryCache;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`namespace CoreHelpers.Branding.Runtime.Services`
`3`	`3`	`{`
`4`		`- public class BrandingStateService : IBrandingStateService`
	`4`	`+ internal class BrandingStateService : IBrandingStateService`
`5`	`5`	`{`
`6`	`6`	`public ICompanyBranding CurrentCompanyBranding { get; private set; }`
`7`	`7`