Janus007/PlanTempusApp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More work in this Configuration Manager

Browse source
This commit is contained in:
Janus Knudsen 2025-01-31 22:08:54 +01:00
parent 8e6492e979
commit 21d7128e74
11 changed files with 299 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Core/Configurations/AzureConfigurationManager.cs
View file

@ -18,7 +18,7 @@ namespace Core.Configurations
{
if (_configurationBuilder == null)
{
var envConfiguration = new ConfigurationBuilder()
var envConfiguration = new Microsoft.Extensions.Configuration.ConfigurationBuilder()
.AddEnvironmentVariables()
.Build();
@ -27,7 +27,7 @@ namespace Core.Configurations
var appConfigEndpoint = envConfiguration["AppConfigEndpoint"];
var appConfigLabel = envConfiguration["AppConfigLabelFilter"];
_configurationBuilder = new ConfigurationBuilder();
_configurationBuilder = new Microsoft.Extensions.Configuration.ConfigurationBuilder();
if (!string.IsNullOrEmpty(appConfigEndpoint))
{
_configurationBuilder

61
Core/Configurations/ConfigurationBuilder.cs Normal file
View file

@ -0,0 +1,61 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Core.Configurations
{
public class ConfigurationBuilder
{
private readonly List<IConfigurationProvider> _providers = new();
public ConfigurationBuilder AddProvider(IConfigurationProvider provider)
{
_providers.Add(provider);
return this;
}
public IConfigurationRoot Build()
{
// Her kan du implementere din egen sammenlægningslogik
return new ConfigurationRoot(_providers);
}
}
public class ConfigurationRoot : IConfigurationRoot
{
public ConfigurationRoot(List<IConfigurationProvider> configurationProviders)
{
}
public T GetSection<T>(string key)
{
throw new NotImplementedException();
}
}
public static class ConfigurationPredicateExtensions
{
public static IConfigurationSection GetSection(this IConfigurationRoot configurationSection, string key)
{
return null;
}
public static T Get<T>(this IConfigurationSection configuration, string key)
{
return default(T);
}
}
public interface IConfigurationProvider
{
Dictionary<string, object> Configuration();
}
public interface IConfigurationSection
{
string Key { get; }
string Path { get; }
string Value { get; set; }
}
}

14
Core/Configurations/IConfigurationRoot.cs Normal file
View file

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Core.Configurations
{
public interface IConfigurationRoot
{
}
}

4
Core/Configurations/PostgresqlConfigurationBuilder/Class1.cs
View file

@ -8,7 +8,7 @@ using System.Threading.Tasks;
namespace Core.Configurations.PostgresqlConfigurationBuilder
{
public class PostgresConfigurationSource : IConfigurationSource
public class PostgresConfigurationSource : Microsoft.Extensions.Configuration.IConfigurationSource
{
private readonly string _connectionString;
private readonly string _channel;
@ -21,7 +21,7 @@ namespace Core.Configurations.PostgresqlConfigurationBuilder
_configurationQuery = configurationQuery ?? throw new ArgumentNullException(nameof(configurationQuery));
}
public IConfigurationProvider Build(IConfigurationBuilder builder)
public Microsoft.Extensions.Configuration.IConfigurationProvider Build(IConfigurationBuilder builder)
{
return new PostgresConfigurationProvider(_connectionString, _channel, _configurationQuery);
}

11
Core/Configurations/SmartConfiguration/JsonConfiguration.cs
View file

@ -4,7 +4,7 @@ using Microsoft.Extensions.Primitives;
using System.Data;
namespace Core.Configurations.SmartConfiguration;
public class JsonConfiguration : IConfiguration
public class JsonConfiguration : Microsoft.Extensions.Configuration.IConfiguration
{
private readonly JObject _data;
@ -19,11 +19,16 @@ public class JsonConfiguration : IConfiguration
set => throw new NotImplementedException();
}
public IConfigurationSection GetSection(string key) =>
new JsonConfigurationSection(_data, key);
public Microsoft.Extensions.Configuration.IConfigurationSection GetSection(string key) => null;
//new JsonConfigurationSection(_data, key);
public IEnumerable<IConfigurationSection> GetChildren() =>
_data.Properties().Select(p => new JsonConfigurationSection(_data, p.Name));
public IChangeToken GetReloadToken() => throw new NotImplementedException();
IEnumerable<Microsoft.Extensions.Configuration.IConfigurationSection> IConfiguration.GetChildren()
{
throw new NotImplementedException();
}
}

4
Core/Configurations/SmartConfiguration/JsonConfigurationSection.cs
View file

@ -43,12 +43,12 @@ namespace Core.Configurations.SmartConfiguration
set => throw new NotImplementedException("Setting values is not supported.");
}
public IConfigurationSection GetSection(string key)
public Microsoft.Extensions.Configuration.IConfigurationSection GetSection(string key)
{
if (string.IsNullOrEmpty(key))
throw new ArgumentNullException(nameof(key));
return new JsonConfigurationSection(_data, string.IsNullOrEmpty(_path) ? key : $"{_path}:{key}");
return null;// new JsonConfigurationSection(_data, string.IsNullOrEmpty(_path) ? key : $"{_path}:{key}");
}
public JToken GetToken() => _data.SelectToken(_normalizedPath);

4
Core/Configurations/SmartConfiguration/SmartConfigManager.cs
View file

@ -18,14 +18,14 @@ namespace Core.Configurations
{
if (_configurationBuilder == null)
{
var envConfiguration = new ConfigurationBuilder()
var envConfiguration = new Microsoft.Extensions.Configuration.ConfigurationBuilder()
.AddEnvironmentVariables()
.Build();
var appConfigEndpoint = envConfiguration["AppConfigEndpoint"];
var appConfigLabel = envConfiguration["AppConfigLabelFilter"];
_configurationBuilder = new ConfigurationBuilder();
_configurationBuilder = new Microsoft.Extensions.Configuration.ConfigurationBuilder();
if (!string.IsNullOrEmpty(appConfigEndpoint))
{
_configurationBuilder

139
Tests/ConfigurationTests/KeyValueJsonHandlingTests.cs Normal file
View file

@ -0,0 +1,139 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json.Linq;
using System.Collections.Generic;
using System.Linq;
namespace Tests.ConfigurationTests
{
[TestClass]
public class KeyValueJsonHandlingTests : TestFixture
{
[TestMethod]
public void FunMixedTypesTest()
{
var pairs = new List<KeyValuePair<string, object>>
{
new("developer:coffeeLevel", 9001.5),
new("developer:bugsFixed", 42),
new("developer:awake", false),
new("compiler:errors:semicolon:0", "Missing ;"),
new("compiler:errors:semicolon:1", "Found ; but why?"),
new("computer:ram:status", "Out of memory"),
new("computer:cpu:temperature", 99.9),
new("friday:beer:count", 6),
new("friday:code:working", true),
new("friday:bugs:count", int.MaxValue),
new("real:object", JObject.Parse(@"{
""beer"": {
""count"": 6
},
""code"": {
""working"": true
},
""bugs"": {
""count"": 2147483647
}
}"))
};
var result = KeyValueToJson.Convert(pairs);
var expected = JObject.Parse(@"{
'developer': {
'coffeeLevel': 9001.5,
'bugsFixed': 42,
'awake': false
},
'compiler': {
'errors': { 'semicolon': ['Missing ;', 'Found ; but why?'] }
},
'computer': {
'ram': { 'status': 'Out of memory' },
'cpu': { 'temperature': 99.9 }
},
'friday': {
'beer': { 'count': 6 },
'code': { 'working': true },
'bugs': { 'count': 2147483647 }
}
}");
Assert.IsTrue(JToken.DeepEquals(expected, result));
}
}
public static class KeyValueToJson
{
public static JObject Convert(List<KeyValuePair<string, object>> pairs)
{
var root = new JObject();
foreach (var pair in pairs)
{
var keys = pair.Key.Split(':');
var current = root;
// Gennemgå hierarkiet og opret underobjekter, hvis de ikke eksisterer
for (int i = 0; i < keys.Length - 1; i++)
{
var key = keys[i];
if (current[key] == null)
{
current[key] = new JObject();
}
current = (JObject)current[key];
}
// Håndter den sidste nøgle og tilføj værdien
var lastKey = keys[keys.Length - 1];
var value = ConvertValue(pair.Value);
// Hvis den sidste nøgle allerede eksisterer, tilføj til en liste
if (current[lastKey] != null)
{
// Hvis den allerede er en liste, tilføj til listen
if (current[lastKey].Type == JTokenType.Array)
{
((JArray)current[lastKey]).Add(value);
}
// Hvis den ikke er en liste, konverter til en liste
else
{
var existingValue = current[lastKey];
current[lastKey] = new JArray { existingValue, value };
}
}
// Ellers tilføj som en enkelt værdi
else
{
current[lastKey] = value;
}
}
return root;
}
private static JToken ConvertValue(object value)
{
// Konverter værdien til det korrekte JToken-format
return value switch
{
int i => new JValue(i),
double d => new JValue(d),
bool b => new JValue(b),
string s => new JValue(s),
_ => new JValue(value.ToString()) // Fallback for andre typer
};
}
}
}

3
Tests/TestConfigurationManagement.cs
View file

@ -23,6 +23,7 @@ public class ConfigurationTests : TestFixture
_builder = new KeyValueConfigurationBuilder(_mockRepo.Object);
}
[TestMethod]
public async Task LoadConfiguration_WithValidData_BuildsCorrectly()
{
@ -142,7 +143,7 @@ public class ConfigurationTests : TestFixture
}
};
IConfiguration configuration = new JsonConfiguration(configData, new Microsoft.Extensions.Configuration.ConfigurationReloadToken());
Microsoft.Extensions.Configuration.IConfiguration configuration = null;// new JsonConfiguration(configData, new Microsoft.Extensions.Configuration.ConfigurationReloadToken());
// Act
var welcomeConfig = configuration.GetSection("Email:Templates:Welcome").Get<WelcomeEmailConfig>();

130
Tests/TestFixture.cs
View file

@ -9,89 +9,89 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Tests
{
/// <summary>
/// Act as base class for tests. Avoids duplication of test setup code
/// </summary>
[TestClass]
public abstract partial class TestFixture
{
protected IContainer Container { get; private set; }
protected ContainerBuilder ContainerBuilder { get; private set; }
/// <summary>
/// Act as base class for tests. Avoids duplication of test setup code
/// </summary>
[TestClass]
public abstract partial class TestFixture
{
protected IContainer Container { get; private set; }
protected ContainerBuilder ContainerBuilder { get; private set; }
[AssemblyInitialize]
public static void AssemblySetup(TestContext tc)
{
Trace.Listeners.Add(new TextWriterTraceListener(Console.Out));
[AssemblyInitialize]
public static void AssemblySetup(TestContext tc)
{
Trace.Listeners.Add(new TextWriterTraceListener(Console.Out));
var envConfiguration = new ConfigurationBuilder()
.AddEnvironmentVariables()
.Build();
var envConfiguration = new ConfigurationBuilder()
.AddEnvironmentVariables()
.Build();
}
}
public virtual IConfigurationRoot Configuration()
{
public virtual IConfigurationRoot Configuration()
{
IConfigurationBuilder configBuilder = Core.Configurations.SmartConfigManager.AppConfigBuilder("appsettings.dev.json");
IConfigurationRoot configuration = configBuilder.Build();
IConfigurationBuilder configBuilder = Core.Configurations.AzureConfigurationManager.AppConfigBuilder("appsettings.dev.json");
IConfigurationRoot configuration = configBuilder.Build();
return configuration;
}
return configuration;
}
/// <summary>
/// Should not be overriden. Rather override PreArrangeAll to setup data needed for a test class.
/// Override PrebuildContainer with a method that does nothing to prevent early build of IOC container
/// </summary>
[TestInitialize]
public void Setup()
{
CreateContainerBuilder();
Container = ContainerBuilder.Build();
Insight.Database.Providers.PostgreSQL.PostgreSQLInsightDbProvider.RegisterProvider();
}
/// <summary>
/// Should not be overriden. Rather override PreArrangeAll to setup data needed for a test class.
/// Override PrebuildContainer with a method that does nothing to prevent early build of IOC container
/// </summary>
[TestInitialize]
public void Setup()
{
CreateContainerBuilder();
Container = ContainerBuilder.Build();
Insight.Database.Providers.PostgreSQL.PostgreSQLInsightDbProvider.RegisterProvider();
}
protected virtual void CreateContainerBuilder()
{
IConfigurationRoot configuration = Configuration();
protected virtual void CreateContainerBuilder()
{
IConfigurationRoot configuration = Configuration();
var builder = new ContainerBuilder();
builder.RegisterInstance(new LoggerFactory())
.As<ILoggerFactory>();
var builder = new ContainerBuilder();
builder.RegisterInstance(new LoggerFactory())
.As<ILoggerFactory>();
builder.RegisterGeneric(typeof(Logger<>))
.As(typeof(ILogger<>))
.SingleInstance();
builder.RegisterGeneric(typeof(Logger<>))
.As(typeof(ILogger<>))
.SingleInstance();
builder.RegisterModule(new Core.ModuleRegistry.DbPostgreSqlModule
{
ConnectionString = configuration.GetConnectionString("ptdb")
});
builder.RegisterModule(new Core.ModuleRegistry.DbPostgreSqlModule
{
ConnectionString = configuration.GetConnectionString("ptdb")
});
builder.RegisterModule(new Core.ModuleRegistry.TelemetryModule
{
TelemetryConfig = configuration.GetSection("ApplicationInsights").Get<Core.ModuleRegistry.TelemetryConfig>()
});
builder.RegisterModule(new Core.ModuleRegistry.TelemetryModule
{
TelemetryConfig = configuration.GetSection("ApplicationInsights").Get<Core.ModuleRegistry.TelemetryConfig>()
});
ContainerBuilder = builder;
}
ContainerBuilder = builder;
}
[TestCleanup]
public void CleanUp()
{
Trace.Flush();
var telemetryClient = Container.Resolve<TelemetryClient>();
telemetryClient.Flush();
[TestCleanup]
public void CleanUp()
{
Trace.Flush();
var telemetryClient = Container.Resolve<TelemetryClient>();
telemetryClient.Flush();
if (Container != null)
{
Container.Dispose();
Container = null;
}
}
if (Container != null)
{
Container.Dispose();
Container = null;
}
}
}
}
}

4
Tests/UnitTest1.cs
View file

@ -35,8 +35,8 @@ namespace Tests
{
var conn = Container.Resolve<IDbConnection>();
var dbSetup = new Database.Identity.DbInfrastructureSetup(conn);
await dbSetup.CreateDatabaseWithSchema("swp");
var dbSetup = new Database.AppConfigurationSystem.ConfigurationDatabaseSetup(conn);
//await dbSetup..CreateDatabaseWithSchema("swp");
}