From 0e78092c8e561890fcd6194e986d25a4f8003668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Sun, 17 Jul 2022 13:58:34 +0200 Subject: [PATCH 01/30] fix(ConfigurationWrapper): fix update interval typo --- TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs index 6991751e3..7315052e3 100644 --- a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs @@ -1,4 +1,4 @@ -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using TeslaSolarCharger.Shared.Contracts; @@ -36,7 +36,7 @@ internal string ConfigFileDirectory() public TimeSpan ChargingValueJobUpdateIntervall() { - var environmentVariableName = "UpdateIntervallSeconds"; + var environmentVariableName = "UpdateIntervalSeconds"; var minimum = TimeSpan.FromSeconds(20); var value = GetSecondsConfigurationValueIfGreaterThanMinumum(environmentVariableName, minimum); _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); From 3db8286daf0608df1ad831ff2fee037e404b399c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Fri, 15 Jul 2022 21:53:59 +0200 Subject: [PATCH 02/30] feat(MainLayout): Add link to Github --- TeslaSolarCharger/Client/Shared/MainLayout.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TeslaSolarCharger/Client/Shared/MainLayout.razor b/TeslaSolarCharger/Client/Shared/MainLayout.razor index c0417e00d..6ee3ed008 100644 --- a/TeslaSolarCharger/Client/Shared/MainLayout.razor +++ b/TeslaSolarCharger/Client/Shared/MainLayout.razor @@ -8,7 +8,7 @@
- About + About
From e84eb0cb28ced7cbf315f15e95969da32c6d2ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Fri, 15 Jul 2022 21:54:15 +0200 Subject: [PATCH 03/30] feat(NavMenu): Add new Head --- TeslaSolarCharger/Client/Shared/NavMenu.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TeslaSolarCharger/Client/Shared/NavMenu.razor b/TeslaSolarCharger/Client/Shared/NavMenu.razor index fe938da56..5689a60e7 100644 --- a/TeslaSolarCharger/Client/Shared/NavMenu.razor +++ b/TeslaSolarCharger/Client/Shared/NavMenu.razor @@ -1,6 +1,6 @@ 
- TeslaSolarCharger + Tesla Solar Charger ☀ From 76560ec0e4985d55107ecb7277f689a3cd43800d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Fri, 15 Jul 2022 22:39:12 +0200 Subject: [PATCH 04/30] feat(DtoBaseConfiguration): Add Dto --- .../Client/Pages/BaseConfiguration.razor | 7 +++ .../Client/Pages/CarSettings.razor | 2 +- TeslaSolarCharger/Client/Pages/Index.razor | 2 +- TeslaSolarCharger/Server/Program.cs | 2 + .../Shared/Dtos/DtoBaseConfiguration.cs | 57 +++++++++++++++++++ 5 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 TeslaSolarCharger/Client/Pages/BaseConfiguration.razor create mode 100644 TeslaSolarCharger/Shared/Dtos/DtoBaseConfiguration.cs diff --git a/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor new file mode 100644 index 000000000..3b0178bde --- /dev/null +++ b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor @@ -0,0 +1,7 @@ +Base Configuration + +

Base Configuration

+ +@code { + +} diff --git a/TeslaSolarCharger/Client/Pages/CarSettings.razor b/TeslaSolarCharger/Client/Pages/CarSettings.razor index 9ba027ba9..6a0443522 100644 --- a/TeslaSolarCharger/Client/Pages/CarSettings.razor +++ b/TeslaSolarCharger/Client/Pages/CarSettings.razor @@ -3,7 +3,7 @@ @inject HttpClient HttpClient @inject IToastService ToastService - +Car Settings

CarSettings

@if (_carBasicConfigurations == null) diff --git a/TeslaSolarCharger/Client/Pages/Index.razor b/TeslaSolarCharger/Client/Pages/Index.razor index d2f6d33d6..61cf186ed 100644 --- a/TeslaSolarCharger/Client/Pages/Index.razor +++ b/TeslaSolarCharger/Client/Pages/Index.razor @@ -7,7 +7,7 @@ @inject HttpClient HttpClient @inject IToastService ToastService -Index +Tesla Solar Charger @if (_settings == null) { diff --git a/TeslaSolarCharger/Server/Program.cs b/TeslaSolarCharger/Server/Program.cs index 8c1b2a450..df8949ddb 100644 --- a/TeslaSolarCharger/Server/Program.cs +++ b/TeslaSolarCharger/Server/Program.cs @@ -93,6 +93,8 @@ await mqttHelper.ConfigureMqttClient().ConfigureAwait(false); +//ToDo: Add Convert to config.json + var jobManager = app.Services.GetRequiredService(); jobManager.StartJobs(); diff --git a/TeslaSolarCharger/Shared/Dtos/DtoBaseConfiguration.cs b/TeslaSolarCharger/Shared/Dtos/DtoBaseConfiguration.cs new file mode 100644 index 000000000..3da453d4b --- /dev/null +++ b/TeslaSolarCharger/Shared/Dtos/DtoBaseConfiguration.cs @@ -0,0 +1,57 @@ +using System.ComponentModel.DataAnnotations; + +namespace TeslaSolarCharger.Shared.Dtos; + +public class DtoBaseConfiguration +{ + [Required] + public string? CurrentPowerToGridUrl { get; set; } + public string? CurrentInverterPowerUrl { get; set; } + [Required] + public string? TeslaMateApiBaseUrl { get; set; } + [Required] + [Range(30, int.MaxValue)] + public int? UpdateIntervalSeconds { get; set; } = 30; + [Required] + [Range(1, int.MaxValue)] + public int? PvValueUpdateIntervalSeconds { get; set; } = 1; + [Required] + public List CarPriorities { get; set; } = new(); + [Required] + public string? GeoFence { get; set; } + [Required] + [Range(1, int.MaxValue)] + public int? MinutesUntilSwitchOn { get; set; } = 5; + [Required] + [Range(1, int.MaxValue)] + public int? MinutesUntilSwitchOff { get; set; } = 5; + [Required] + public int? PowerBuffer { get; set; } = 0; + public string? CurrentPowerToGridJsonPattern { get; set; } + public bool? CurrentPowerToGridInvertValue { get; set; } + public string? CurrentInverterPowerJsonPattern { get; set; } + public string? TelegramBotKey { get; set; } + public string? TelegramChannelId { get; set; } + [Required] + public string? TeslaMateDbServer { get; set; } = "database"; + [Required] + public int? TeslaMateDbPort { get; set; } = 5432; + [Required] + public string? TeslaMateDbDatabaseName { get; set; } = "teslamate"; + [Required] + public string? TeslaMateDbUser { get; set; } = "teslamate"; + [Required] + public string? TeslaMateDbPassword { get; set; } = "secret"; + [Required] + public string? MqqtClientId { get; set; } = "TeslaSolarCharger"; + [Required] + public string? MosquitoServer { get; set; } = "mosquitto"; + public string? CurrentPowerToGridXmlPattern { get; set; } + public string? CurrentPowerToGridXmlAttributeHeaderName { get; set; } + public string? CurrentPowerToGridXmlAttributeHeaderValue { get; set; } + public string? CurrentPowerToGridXmlAttributeValueName { get; set; } + public string? CurrentInverterPowerXmlPattern { get; set; } + public string? CurrentInverterPowerAttributeHeaderName { get; set; } + public string? CurrentInverterPowerAttributeHeaderValue { get; set; } + public string? CurrentInverterPowerAttributeValueName { get; set; } +} \ No newline at end of file From e233dc47fc767811c43caa693e518b6d78635dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Fri, 15 Jul 2022 23:25:40 +0200 Subject: [PATCH 05/30] feat(EnvironmentVariableConverter): convert Environmentvariables to json file --- .../Helper/EnvironmentVariableConverter.cs | 58 +++++++++++++++++++ TeslaSolarCharger/Server/Program.cs | 2 + .../Server/TeslaSolarCharger.Server.csproj | 1 + .../Shared/Dtos/DtoBaseConfiguration.cs | 6 +- 4 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs diff --git a/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs new file mode 100644 index 000000000..827ceb823 --- /dev/null +++ b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs @@ -0,0 +1,58 @@ +using TeslaSolarCharger.Shared.Dtos; + +namespace TeslaSolarCharger.Server.Helper; + +public class EnvironmentVariableConverter +{ + private readonly ILogger _logger; + private readonly IConfiguration _configuration; + + public EnvironmentVariableConverter(ILogger logger, IConfiguration configuration) + { + _logger = logger; + _configuration = configuration; + } + + public void ConvertAllValues() + { + _logger.LogTrace("{method}()", nameof(ConvertAllValues)); + var dtoBaseConfiguration = new DtoBaseConfiguration() + { + CurrentPowerToGridUrl = _configuration.GetValue("CurrentPowerToGridUrl"), + CurrentInverterPowerUrl = _configuration.GetValue("CurrentInverterPowerUrl"), + TeslaMateApiBaseUrl = _configuration.GetValue("TeslaMateApiBaseUrl"), + UpdateIntervalSeconds = _configuration.GetValue("UpdateIntervalSeconds"), + PvValueUpdateIntervalSeconds = _configuration.GetValue("PvValueUpdateIntervalSeconds"), + GeoFence = _configuration.GetValue("GeoFence"), + MinutesUntilSwitchOn = _configuration.GetValue("MinutesUntilSwitchOn"), + MinutesUntilSwitchOff = _configuration.GetValue("MinutesUntilSwitchOff"), + PowerBuffer = _configuration.GetValue("PowerBuffer"), + CurrentPowerToGridJsonPattern = _configuration.GetValue("CurrentPowerToGridJsonPattern"), + CurrentPowerToGridInvertValue = _configuration.GetValue("CurrentPowerToGridInvertValue"), + CurrentInverterPowerJsonPattern = _configuration.GetValue("CurrentInverterPowerJsonPattern"), + TelegramBotKey = _configuration.GetValue("TelegramBotKey"), + TelegramChannelId = _configuration.GetValue("TelegramChannelId"), + TeslaMateDbServer = _configuration.GetValue("TeslaMateDbServer"), + TeslaMateDbPort = _configuration.GetValue("TeslaMateDbPort"), + TeslaMateDbDatabaseName = _configuration.GetValue("TeslaMateDbDatabaseName"), + TeslaMateDbUser = _configuration.GetValue("TeslaMateDbUser"), + TeslaMateDbPassword = _configuration.GetValue("TeslaMateDbPassword"), + MqqtClientId = _configuration.GetValue("MqqtClientId"), + MosquitoServer = _configuration.GetValue("MosquitoServer"), + CurrentPowerToGridXmlPattern = _configuration.GetValue("CurrentPowerToGridXmlPattern"), + CurrentPowerToGridXmlAttributeHeaderName = _configuration.GetValue("CurrentPowerToGridXmlAttributeHeaderName"), + CurrentPowerToGridXmlAttributeHeaderValue = _configuration.GetValue("CurrentPowerToGridXmlAttributeHeaderValue"), + CurrentPowerToGridXmlAttributeValueName = _configuration.GetValue("CurrentPowerToGridXmlAttributeValueName"), + CurrentInverterPowerXmlPattern = _configuration.GetValue("CurrentInverterPowerXmlPattern"), + CurrentInverterPowerXmlAttributeHeaderName = _configuration.GetValue("CurrentInverterPowerAttributeHeaderName"), + CurrentInverterPowerXmlAttributeHeaderValue = _configuration.GetValue("CurrentInverterPowerAttributeHeaderValue"), + CurrentInverterPowerXmlAttributeValueName = _configuration.GetValue("CurrentInverterPowerAttributeValueName"), + }; + var carPriorities = _configuration.GetValue(""); + var elements = carPriorities.Split('|').ToList(); + foreach (var element in elements) + { + dtoBaseConfiguration.CarPriorities.Add(Convert.ToInt32(element)); + } + } +} \ No newline at end of file diff --git a/TeslaSolarCharger/Server/Program.cs b/TeslaSolarCharger/Server/Program.cs index df8949ddb..f25dc0e3d 100644 --- a/TeslaSolarCharger/Server/Program.cs +++ b/TeslaSolarCharger/Server/Program.cs @@ -7,6 +7,7 @@ using TeslaSolarCharger.Model.Contracts; using TeslaSolarCharger.Model.EntityFramework; using TeslaSolarCharger.Server.Contracts; +using TeslaSolarCharger.Server.Helper; using TeslaSolarCharger.Server.Scheduling; using TeslaSolarCharger.Server.Services; using TeslaSolarCharger.Shared.Contracts; @@ -38,6 +39,7 @@ .AddTransient() .AddTransient() .AddTransient() + .AddTransient() .AddTransient() .AddTransient() .AddTransient() diff --git a/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj b/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj index 4e6bb2d5d..10587cfc1 100644 --- a/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj +++ b/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj @@ -50,6 +50,7 @@ + diff --git a/TeslaSolarCharger/Shared/Dtos/DtoBaseConfiguration.cs b/TeslaSolarCharger/Shared/Dtos/DtoBaseConfiguration.cs index 3da453d4b..af4f87ecf 100644 --- a/TeslaSolarCharger/Shared/Dtos/DtoBaseConfiguration.cs +++ b/TeslaSolarCharger/Shared/Dtos/DtoBaseConfiguration.cs @@ -51,7 +51,7 @@ public class DtoBaseConfiguration public string? CurrentPowerToGridXmlAttributeHeaderValue { get; set; } public string? CurrentPowerToGridXmlAttributeValueName { get; set; } public string? CurrentInverterPowerXmlPattern { get; set; } - public string? CurrentInverterPowerAttributeHeaderName { get; set; } - public string? CurrentInverterPowerAttributeHeaderValue { get; set; } - public string? CurrentInverterPowerAttributeValueName { get; set; } + public string? CurrentInverterPowerXmlAttributeHeaderName { get; set; } + public string? CurrentInverterPowerXmlAttributeHeaderValue { get; set; } + public string? CurrentInverterPowerXmlAttributeValueName { get; set; } } \ No newline at end of file From 418b7197a385653ddce7a2cf7036ed7dfa9c8215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Sat, 16 Jul 2022 01:06:38 +0200 Subject: [PATCH 06/30] refactor(BaseConfiguration): use json and base part --- .../Server/Helper/EnvironmentVariableConverter.cs | 1 + .../BaseConfigurationBase.cs} | 4 ++-- .../Shared/Dtos/BaseConfiguration/BaseConfigurationJson.cs | 6 ++++++ .../Shared/Dtos/BaseConfiguration/DtoBaseConfiguration.cs | 6 ++++++ 4 files changed, 15 insertions(+), 2 deletions(-) rename TeslaSolarCharger/Shared/Dtos/{DtoBaseConfiguration.cs => BaseConfiguration/BaseConfigurationBase.cs} (96%) create mode 100644 TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationJson.cs create mode 100644 TeslaSolarCharger/Shared/Dtos/BaseConfiguration/DtoBaseConfiguration.cs diff --git a/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs index 827ceb823..12b09ed59 100644 --- a/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs +++ b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs @@ -1,4 +1,5 @@ using TeslaSolarCharger.Shared.Dtos; +using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; namespace TeslaSolarCharger.Server.Helper; diff --git a/TeslaSolarCharger/Shared/Dtos/DtoBaseConfiguration.cs b/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationBase.cs similarity index 96% rename from TeslaSolarCharger/Shared/Dtos/DtoBaseConfiguration.cs rename to TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationBase.cs index af4f87ecf..ee6336e3b 100644 --- a/TeslaSolarCharger/Shared/Dtos/DtoBaseConfiguration.cs +++ b/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationBase.cs @@ -1,8 +1,8 @@ using System.ComponentModel.DataAnnotations; -namespace TeslaSolarCharger.Shared.Dtos; +namespace TeslaSolarCharger.Shared.Dtos.BaseConfiguration; -public class DtoBaseConfiguration +public class BaseConfigurationBase { [Required] public string? CurrentPowerToGridUrl { get; set; } diff --git a/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationJson.cs b/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationJson.cs new file mode 100644 index 000000000..532064fa6 --- /dev/null +++ b/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationJson.cs @@ -0,0 +1,6 @@ +namespace TeslaSolarCharger.Shared.Dtos.BaseConfiguration; + +public class BaseConfigurationJson : BaseConfigurationBase +{ + public DateTime? LastEditDateTime { get; set; } +} \ No newline at end of file diff --git a/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/DtoBaseConfiguration.cs b/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/DtoBaseConfiguration.cs new file mode 100644 index 000000000..6b08a4365 --- /dev/null +++ b/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/DtoBaseConfiguration.cs @@ -0,0 +1,6 @@ +namespace TeslaSolarCharger.Shared.Dtos.BaseConfiguration; + +public class DtoBaseConfiguration : BaseConfigurationBase +{ + +} \ No newline at end of file From 7e4a40633dafef07427013ae14eaee86df3a8d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Sat, 16 Jul 2022 02:27:03 +0200 Subject: [PATCH 07/30] feat(BaseConfiguration): Convert Environmentvariables to json file --- .../Contracts/IBaseConfigurationService.cs | 9 +++ .../IEnvironmentVariableConverter.cs | 6 ++ .../BaseConfigurationController.cs | 21 ++++++ .../Helper/EnvironmentVariableConverter.cs | 15 ++-- TeslaSolarCharger/Server/Program.cs | 6 +- .../Services/BaseConfigurationService.cs | 74 +++++++++++++++++++ .../Server/TeslaSolarCharger.Server.csproj | 1 + TeslaSolarCharger/Server/appsettings.json | 1 + .../Shared/Contracts/IConfigurationWrapper.cs | 1 + .../Shared/Wrappers/ConfigurationWrapper.cs | 9 +++ 10 files changed, 136 insertions(+), 7 deletions(-) create mode 100644 TeslaSolarCharger/Server/Contracts/IBaseConfigurationService.cs create mode 100644 TeslaSolarCharger/Server/Contracts/IEnvironmentVariableConverter.cs create mode 100644 TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs create mode 100644 TeslaSolarCharger/Server/Services/BaseConfigurationService.cs diff --git a/TeslaSolarCharger/Server/Contracts/IBaseConfigurationService.cs b/TeslaSolarCharger/Server/Contracts/IBaseConfigurationService.cs new file mode 100644 index 000000000..8f42e52b0 --- /dev/null +++ b/TeslaSolarCharger/Server/Contracts/IBaseConfigurationService.cs @@ -0,0 +1,9 @@ +using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; + +namespace TeslaSolarCharger.Server.Contracts; + +public interface IBaseConfigurationService +{ + Task GetBaseConfiguration(); + Task SaveBaseConfiguration(DtoBaseConfiguration baseConfiguration); +} \ No newline at end of file diff --git a/TeslaSolarCharger/Server/Contracts/IEnvironmentVariableConverter.cs b/TeslaSolarCharger/Server/Contracts/IEnvironmentVariableConverter.cs new file mode 100644 index 000000000..eb90d8bcb --- /dev/null +++ b/TeslaSolarCharger/Server/Contracts/IEnvironmentVariableConverter.cs @@ -0,0 +1,6 @@ +namespace TeslaSolarCharger.Server.Contracts; + +public interface IEnvironmentVariableConverter +{ + Task ConvertAllValues(); +} \ No newline at end of file diff --git a/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs b/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs new file mode 100644 index 000000000..bf4eec446 --- /dev/null +++ b/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs @@ -0,0 +1,21 @@ +using Microsoft.AspNetCore.Mvc; +using TeslaSolarCharger.Server.Contracts; +using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; + +namespace TeslaSolarCharger.Server.Controllers +{ + [Route("api/[controller]/[action]")] + [ApiController] + public class BaseConfigurationController : ControllerBase + { + private readonly IBaseConfigurationService _service; + + public BaseConfigurationController(IBaseConfigurationService service) + { + _service = service; + } + + [HttpGet] + public Task GetBaseConfiguration() => _service.GetBaseConfiguration(); + } +} diff --git a/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs index 12b09ed59..a41c5cd36 100644 --- a/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs +++ b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs @@ -1,20 +1,23 @@ -using TeslaSolarCharger.Shared.Dtos; +using TeslaSolarCharger.Server.Contracts; using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; namespace TeslaSolarCharger.Server.Helper; -public class EnvironmentVariableConverter +public class EnvironmentVariableConverter : IEnvironmentVariableConverter { private readonly ILogger _logger; private readonly IConfiguration _configuration; + private readonly IBaseConfigurationService _baseConfigurationService; - public EnvironmentVariableConverter(ILogger logger, IConfiguration configuration) + public EnvironmentVariableConverter(ILogger logger, IConfiguration configuration, + IBaseConfigurationService baseConfigurationService) { _logger = logger; _configuration = configuration; + _baseConfigurationService = baseConfigurationService; } - public void ConvertAllValues() + public async Task ConvertAllValues() { _logger.LogTrace("{method}()", nameof(ConvertAllValues)); var dtoBaseConfiguration = new DtoBaseConfiguration() @@ -49,11 +52,13 @@ public void ConvertAllValues() CurrentInverterPowerXmlAttributeHeaderValue = _configuration.GetValue("CurrentInverterPowerAttributeHeaderValue"), CurrentInverterPowerXmlAttributeValueName = _configuration.GetValue("CurrentInverterPowerAttributeValueName"), }; - var carPriorities = _configuration.GetValue(""); + var carPriorities = _configuration.GetValue("CarPriorities"); var elements = carPriorities.Split('|').ToList(); foreach (var element in elements) { dtoBaseConfiguration.CarPriorities.Add(Convert.ToInt32(element)); } + + await _baseConfigurationService.SaveBaseConfiguration(dtoBaseConfiguration); } } \ No newline at end of file diff --git a/TeslaSolarCharger/Server/Program.cs b/TeslaSolarCharger/Server/Program.cs index f25dc0e3d..230cfc8a6 100644 --- a/TeslaSolarCharger/Server/Program.cs +++ b/TeslaSolarCharger/Server/Program.cs @@ -39,7 +39,6 @@ .AddTransient() .AddTransient() .AddTransient() - .AddTransient() .AddTransient() .AddTransient() .AddTransient() @@ -65,6 +64,8 @@ options.EnableDetailedErrors(); }, ServiceLifetime.Transient, ServiceLifetime.Transient) .AddTransient() + .AddTransient() + .AddTransient() ; builder.Host.UseSerilog((context, configuration) => configuration @@ -95,7 +96,8 @@ await mqttHelper.ConfigureMqttClient().ConfigureAwait(false); -//ToDo: Add Convert to config.json +var environmentVariableConverter = app.Services.GetRequiredService(); +await environmentVariableConverter.ConvertAllValues(); var jobManager = app.Services.GetRequiredService(); jobManager.StartJobs(); diff --git a/TeslaSolarCharger/Server/Services/BaseConfigurationService.cs b/TeslaSolarCharger/Server/Services/BaseConfigurationService.cs new file mode 100644 index 000000000..57e1ca786 --- /dev/null +++ b/TeslaSolarCharger/Server/Services/BaseConfigurationService.cs @@ -0,0 +1,74 @@ +using System.Runtime.Caching; +using Newtonsoft.Json; +using TeslaSolarCharger.Server.Contracts; +using TeslaSolarCharger.Shared.Contracts; +using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; + +namespace TeslaSolarCharger.Server.Services; + +public class BaseConfigurationService : IBaseConfigurationService +{ + private readonly ILogger _logger; + private readonly IConfigurationWrapper _configurationWrapper; + private readonly string _baseConfigurationMemoryCacheName = "baseConfiguration"; + + public BaseConfigurationService(ILogger logger, IConfigurationWrapper configurationWrapper) + { + _logger = logger; + _configurationWrapper = configurationWrapper; + } + + public async Task GetBaseConfiguration() + { + _logger.LogTrace("{method}()", nameof(GetBaseConfiguration)); + var cache = MemoryCache.Default; + + if (cache[_baseConfigurationMemoryCacheName] is not string jsonFileContent) + { + var filePath = _configurationWrapper.BaseConfigFileFullName(); + var cacheItemPolicy = new CacheItemPolicy(); + + var filePathList = new List() + { + filePath, + }; + + cacheItemPolicy.ChangeMonitors.Add(new HostFileChangeMonitor(filePathList)); + + jsonFileContent = await File.ReadAllTextAsync(filePath).ConfigureAwait(false); + + cache.Set(_baseConfigurationMemoryCacheName, jsonFileContent, cacheItemPolicy); + } + + var dtoBaseConfiguration = JsonConvert.DeserializeObject(jsonFileContent); + + if (dtoBaseConfiguration == null) + { + throw new ArgumentException($"Could not deserialize {jsonFileContent} to {nameof(DtoBaseConfiguration)}"); + } + + return dtoBaseConfiguration; + } + + public async Task SaveBaseConfiguration(DtoBaseConfiguration baseConfiguration) + { + var baseConfigurationBase = (BaseConfigurationBase)baseConfiguration; + var baseConfigurationJson = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(baseConfigurationBase)); + //if (false) + //{ + // baseConfigurationJson.LastEditDateTime = DateTime.UtcNow; + //} + var jsonFileContent = JsonConvert.SerializeObject(baseConfigurationJson); + + var configFileLocation = _configurationWrapper.BaseConfigFileFullName(); + var fileInfo = new FileInfo(configFileLocation); + var configDirectoryFullName = fileInfo.Directory?.FullName; + if (!Directory.Exists(configDirectoryFullName)) + { + _logger.LogDebug("Config directory {directoryname} does not exist.", configDirectoryFullName); + Directory.CreateDirectory(configDirectoryFullName ?? throw new InvalidOperationException()); + } + + await File.WriteAllTextAsync(configFileLocation, jsonFileContent); + } +} \ No newline at end of file diff --git a/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj b/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj index 10587cfc1..3ed60e0ee 100644 --- a/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj +++ b/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj @@ -34,6 +34,7 @@ + diff --git a/TeslaSolarCharger/Server/appsettings.json b/TeslaSolarCharger/Server/appsettings.json index a3f16a438..37ff820c7 100644 --- a/TeslaSolarCharger/Server/appsettings.json +++ b/TeslaSolarCharger/Server/appsettings.json @@ -29,6 +29,7 @@ "AllowedHosts": "*", "ConfigFileLocation": "configs", "CarConfigFilename": "carConfig.json", + "BaseConfigFileName": "baseConfig.json", "GlobalConfigFileName": "globalConfig.json", "UpdateIntervalSeconds": 30, "PvValueUpdateIntervalSeconds": 1, diff --git a/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs index e223ca719..00c64aa15 100644 --- a/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs @@ -33,4 +33,5 @@ public interface IConfigurationWrapper string TeslaMateDbDatabaseName(); string TeslaMateDbUser(); string TeslaMateDbPassword(); + string BaseConfigFileFullName(); } \ No newline at end of file diff --git a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs index 7315052e3..61e066294 100644 --- a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs @@ -26,6 +26,15 @@ public string CarConfigFileFullName() return Path.Combine(configFileDirectory, value); } + public string BaseConfigFileFullName() + { + var configFileDirectory = ConfigFileDirectory(); + var environmentVariableName = "BaseConfigFileName"; + var value = GetNotNullableConfigurationValue(environmentVariableName); + _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); + return Path.Combine(configFileDirectory, value); + } + internal string ConfigFileDirectory() { var environmentVariableName = "ConfigFileLocation"; From 479a24dc55e11611173e02a0597c139b9fc73fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Sat, 16 Jul 2022 11:05:50 +0200 Subject: [PATCH 08/30] fix(swagger): rename CarConfig Enum --- .../Server/Contracts/ITeslaService.cs | 2 +- .../Server/Services/MqttService.cs | 18 +++++++++--------- .../Server/Services/TeslamateApiService.cs | 10 +++++----- .../Shared/Dtos/Settings/CarState.cs | 6 ++++-- .../Enums/{CarState.cs => CarStateEnum.cs} | 2 +- 5 files changed, 20 insertions(+), 18 deletions(-) rename TeslaSolarCharger/Shared/Enums/{CarState.cs => CarStateEnum.cs} (86%) diff --git a/TeslaSolarCharger/Server/Contracts/ITeslaService.cs b/TeslaSolarCharger/Server/Contracts/ITeslaService.cs index da3331ff4..f3bd66b14 100644 --- a/TeslaSolarCharger/Server/Contracts/ITeslaService.cs +++ b/TeslaSolarCharger/Server/Contracts/ITeslaService.cs @@ -4,7 +4,7 @@ namespace TeslaSolarCharger.Server.Contracts; public interface ITeslaService { - Task StartCharging(int carId, int startAmp, CarState? carState); + Task StartCharging(int carId, int startAmp, CarStateEnum? carState); Task WakeUpCar(int carId); Task StopCharging(int carId); Task SetAmp(int carId, int amps); diff --git a/TeslaSolarCharger/Server/Services/MqttService.cs b/TeslaSolarCharger/Server/Services/MqttService.cs index 2c0b4539c..5fd55e69e 100644 --- a/TeslaSolarCharger/Server/Services/MqttService.cs +++ b/TeslaSolarCharger/Server/Services/MqttService.cs @@ -3,7 +3,7 @@ using TeslaSolarCharger.Server.Contracts; using TeslaSolarCharger.Shared.Contracts; using TeslaSolarCharger.Shared.Dtos.Contracts; -using CarState = TeslaSolarCharger.Shared.Enums.CarState; +using TeslaSolarCharger.Shared.Enums; namespace TeslaSolarCharger.Server.Services; @@ -230,29 +230,29 @@ internal void UpdateCar(TeslaMateValue value) switch (value.Value) { case "asleep": - car.CarState.State = CarState.Asleep; + car.CarState.State = CarStateEnum.Asleep; break; case "offline": - car.CarState.State = CarState.Offline; + car.CarState.State = CarStateEnum.Offline; break; case "online": - car.CarState.State = CarState.Online; + car.CarState.State = CarStateEnum.Online; break; case "charging": - car.CarState.State = CarState.Charging; + car.CarState.State = CarStateEnum.Charging; break; case "suspended": - car.CarState.State = CarState.Suspended; + car.CarState.State = CarStateEnum.Suspended; break; case "driving": - car.CarState.State = CarState.Driving; + car.CarState.State = CarStateEnum.Driving; break; case "updating": - car.CarState.State = CarState.Updating; + car.CarState.State = CarStateEnum.Updating; break; default: _logger.LogWarning("Unknown car state deteckted: {carState}", value.Value); - car.CarState.State = CarState.Unknown; + car.CarState.State = CarStateEnum.Unknown; break; } _logger.LogDebug("New car state detected {car state}", car.CarState.StateString); diff --git a/TeslaSolarCharger/Server/Services/TeslamateApiService.cs b/TeslaSolarCharger/Server/Services/TeslamateApiService.cs index 78ef9c550..a4c43428e 100644 --- a/TeslaSolarCharger/Server/Services/TeslamateApiService.cs +++ b/TeslaSolarCharger/Server/Services/TeslamateApiService.cs @@ -3,7 +3,7 @@ using TeslaSolarCharger.Server.Contracts; using TeslaSolarCharger.Shared.Contracts; using TeslaSolarCharger.Shared.Dtos.Contracts; -using CarState = TeslaSolarCharger.Shared.Enums.CarState; +using TeslaSolarCharger.Shared.Enums; namespace TeslaSolarCharger.Server.Services; @@ -23,18 +23,18 @@ public TeslamateApiService(ILogger logger, ITelegramService _teslaMateBaseUrl = configurationWrapper.TeslaMateApiBaseUrl(); } - public async Task StartCharging(int carId, int startAmp, CarState? carState) + public async Task StartCharging(int carId, int startAmp, CarStateEnum? carState) { _logger.LogTrace("{method}({param1}, {param2}, {param3})", nameof(StartCharging), carId, startAmp, carState); - if (carState == CarState.Offline || - carState == CarState.Asleep) + if (carState == CarStateEnum.Offline || + carState == CarStateEnum.Asleep) { _logger.LogInformation("Wakeup car before charging"); await WakeUpCar(carId); } - if (carState == CarState.Suspended) + if (carState == CarStateEnum.Suspended) { _logger.LogInformation("Logging is suspended"); await ResumeLogging(carId); diff --git a/TeslaSolarCharger/Shared/Dtos/Settings/CarState.cs b/TeslaSolarCharger/Shared/Dtos/Settings/CarState.cs index 7e8b03bdf..f30e4831a 100644 --- a/TeslaSolarCharger/Shared/Dtos/Settings/CarState.cs +++ b/TeslaSolarCharger/Shared/Dtos/Settings/CarState.cs @@ -1,4 +1,6 @@ -namespace TeslaSolarCharger.Shared.Dtos.Settings; +using TeslaSolarCharger.Shared.Enums; + +namespace TeslaSolarCharger.Shared.Dtos.Settings; public class CarState { @@ -33,7 +35,7 @@ public int? ChargingPower } public string? StateString { get; set; } - public Enums.CarState? State { get; set; } + public CarStateEnum? State { get; set; } public bool? Healthy { get; set; } public bool ReducedChargeSpeedWarning { get; set; } } \ No newline at end of file diff --git a/TeslaSolarCharger/Shared/Enums/CarState.cs b/TeslaSolarCharger/Shared/Enums/CarStateEnum.cs similarity index 86% rename from TeslaSolarCharger/Shared/Enums/CarState.cs rename to TeslaSolarCharger/Shared/Enums/CarStateEnum.cs index 46a8f6628..a91bc8891 100644 --- a/TeslaSolarCharger/Shared/Enums/CarState.cs +++ b/TeslaSolarCharger/Shared/Enums/CarStateEnum.cs @@ -1,6 +1,6 @@ namespace TeslaSolarCharger.Shared.Enums; -public enum CarState +public enum CarStateEnum { Asleep, Offline, From f90f054477d62b6e6062e9a452c7387a96abb38d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Sat, 16 Jul 2022 11:36:54 +0200 Subject: [PATCH 09/30] feat(ConfigurationWrapper): extract getting current location --- .../Server/Services/ConfigJsonService.cs | 22 ++++++------------- .../Shared/Wrappers/ConfigurationWrapper.cs | 5 ++++- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/TeslaSolarCharger/Server/Services/ConfigJsonService.cs b/TeslaSolarCharger/Server/Services/ConfigJsonService.cs index 5a675d7f7..5323b3519 100644 --- a/TeslaSolarCharger/Server/Services/ConfigJsonService.cs +++ b/TeslaSolarCharger/Server/Services/ConfigJsonService.cs @@ -15,30 +15,22 @@ public class ConfigJsonService : IConfigJsonService { private readonly ILogger _logger; private readonly ISettings _settings; - private readonly IConfigurationWrapper _congConfigurationWrapper; + private readonly IConfigurationWrapper _configurationWrapper; public ConfigJsonService(ILogger logger, ISettings settings, - IConfigurationWrapper congConfigurationWrapper) + IConfigurationWrapper configurationWrapper) { _logger = logger; _settings = settings; - _congConfigurationWrapper = congConfigurationWrapper; + _configurationWrapper = configurationWrapper; } private bool CarConfigurationFileExists() { - var path = GetCarConfigurationFileFullPath(); + var path = _configurationWrapper.CarConfigFileFullName(); return File.Exists(path); } - private string GetCarConfigurationFileFullPath() - { - var configFileLocation = _congConfigurationWrapper.CarConfigFileFullName(); - var path = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory?.FullName; - path = Path.Combine(path ?? throw new InvalidOperationException("Could not get Assembly directory"), configFileLocation); - return path; - } - public async Task> GetCarsFromConfiguration() { var cars = new List(); @@ -55,7 +47,7 @@ public async Task> GetCarsFromConfiguration() } } - var carIds = _congConfigurationWrapper.CarPriorities(); + var carIds = _configurationWrapper.CarPriorities(); RemoveOldCars(cars, carIds); var newCarIds = carIds.Where(i => !cars.Any(c => c.Id == i)).ToList(); @@ -86,7 +78,7 @@ internal List DeserializeCarsFromConfigurationString(string fileContent) private async Task GetCarConfigurationFileContent() { - var fileContent = await File.ReadAllTextAsync(GetCarConfigurationFileFullPath()).ConfigureAwait(false); + var fileContent = await File.ReadAllTextAsync(_configurationWrapper.CarConfigFileFullName()).ConfigureAwait(false); return fileContent; } @@ -122,7 +114,7 @@ internal void AddNewCars(List newCarIds, List cars) public async Task UpdateConfigJson() { _logger.LogTrace("{method}()", nameof(UpdateConfigJson)); - var configFileLocation = GetCarConfigurationFileFullPath(); + var configFileLocation = _configurationWrapper.CarConfigFileFullName(); var minDate = new DateTime(2022, 1, 1); if (_settings.Cars.Any(c => c.CarConfiguration.UpdatedSincLastWrite || c.CarConfiguration.LatestTimeToReachSoC < minDate)) { diff --git a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs index 61e066294..7046b6a8d 100644 --- a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs @@ -1,3 +1,4 @@ +using System.Reflection; using System.Runtime.CompilerServices; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; @@ -40,7 +41,9 @@ internal string ConfigFileDirectory() var environmentVariableName = "ConfigFileLocation"; var value = GetNotNullableConfigurationValue(environmentVariableName); _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + var path = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory?.FullName; + path = Path.Combine(path ?? throw new InvalidOperationException("Could not get Assembly directory"), value); + return path; } public TimeSpan ChargingValueJobUpdateIntervall() From 61ad06590e31fe3d275487de954808bd3231364e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Sat, 16 Jul 2022 11:37:12 +0200 Subject: [PATCH 10/30] feat(UI): add FAvicon to menu bar --- TeslaSolarCharger/Client/Shared/NavMenu.razor | 2 +- TeslaSolarCharger/Server/appsettings.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/TeslaSolarCharger/Client/Shared/NavMenu.razor b/TeslaSolarCharger/Client/Shared/NavMenu.razor index 5689a60e7..b6bfc3b3e 100644 --- a/TeslaSolarCharger/Client/Shared/NavMenu.razor +++ b/TeslaSolarCharger/Client/Shared/NavMenu.razor @@ -1,6 +1,6 @@ 
- Tesla Solar Charger ☀ + Tesla Solar Charger diff --git a/TeslaSolarCharger/Server/appsettings.json b/TeslaSolarCharger/Server/appsettings.json index 37ff820c7..4b267e3f6 100644 --- a/TeslaSolarCharger/Server/appsettings.json +++ b/TeslaSolarCharger/Server/appsettings.json @@ -30,7 +30,6 @@ "ConfigFileLocation": "configs", "CarConfigFilename": "carConfig.json", "BaseConfigFileName": "baseConfig.json", - "GlobalConfigFileName": "globalConfig.json", "UpdateIntervalSeconds": 30, "PvValueUpdateIntervalSeconds": 1, "MqqtClientId": "TeslaSolarCharger", From b6d740bc116dbb1d997e4bb775039063fcebdf07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Sat, 16 Jul 2022 13:56:25 +0200 Subject: [PATCH 11/30] feat(EnvironmentvariableConverter): Only convert if json has not been edited yet --- .../Contracts/IBaseConfigurationService.cs | 1 + .../Helper/EnvironmentVariableConverter.cs | 5 ++++ .../Services/BaseConfigurationService.cs | 30 ++++++++++++++----- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/TeslaSolarCharger/Server/Contracts/IBaseConfigurationService.cs b/TeslaSolarCharger/Server/Contracts/IBaseConfigurationService.cs index 8f42e52b0..be99cb743 100644 --- a/TeslaSolarCharger/Server/Contracts/IBaseConfigurationService.cs +++ b/TeslaSolarCharger/Server/Contracts/IBaseConfigurationService.cs @@ -6,4 +6,5 @@ public interface IBaseConfigurationService { Task GetBaseConfiguration(); Task SaveBaseConfiguration(DtoBaseConfiguration baseConfiguration); + Task IsBaseConfigurationJsonRelevant(); } \ No newline at end of file diff --git a/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs index a41c5cd36..bfeac8fe6 100644 --- a/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs +++ b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs @@ -20,6 +20,11 @@ public EnvironmentVariableConverter(ILogger logger public async Task ConvertAllValues() { _logger.LogTrace("{method}()", nameof(ConvertAllValues)); + if (await _baseConfigurationService.IsBaseConfigurationJsonRelevant()) + { + _logger.LogInformation("Do not convert environment variables to json file as json file has been edited."); + return; + } var dtoBaseConfiguration = new DtoBaseConfiguration() { CurrentPowerToGridUrl = _configuration.GetValue("CurrentPowerToGridUrl"), diff --git a/TeslaSolarCharger/Server/Services/BaseConfigurationService.cs b/TeslaSolarCharger/Server/Services/BaseConfigurationService.cs index 57e1ca786..0e5773194 100644 --- a/TeslaSolarCharger/Server/Services/BaseConfigurationService.cs +++ b/TeslaSolarCharger/Server/Services/BaseConfigurationService.cs @@ -21,6 +21,20 @@ public BaseConfigurationService(ILogger logger, IConfi public async Task GetBaseConfiguration() { _logger.LogTrace("{method}()", nameof(GetBaseConfiguration)); + var jsonFileContent = await BaseConfigurationJsonFileContent(); + + var dtoBaseConfiguration = JsonConvert.DeserializeObject(jsonFileContent); + + if (dtoBaseConfiguration == null) + { + throw new ArgumentException($"Could not deserialize {jsonFileContent} to {nameof(DtoBaseConfiguration)}"); + } + + return dtoBaseConfiguration; + } + + private async Task BaseConfigurationJsonFileContent() + { var cache = MemoryCache.Default; if (cache[_baseConfigurationMemoryCacheName] is not string jsonFileContent) @@ -40,14 +54,7 @@ public async Task GetBaseConfiguration() cache.Set(_baseConfigurationMemoryCacheName, jsonFileContent, cacheItemPolicy); } - var dtoBaseConfiguration = JsonConvert.DeserializeObject(jsonFileContent); - - if (dtoBaseConfiguration == null) - { - throw new ArgumentException($"Could not deserialize {jsonFileContent} to {nameof(DtoBaseConfiguration)}"); - } - - return dtoBaseConfiguration; + return jsonFileContent; } public async Task SaveBaseConfiguration(DtoBaseConfiguration baseConfiguration) @@ -71,4 +78,11 @@ public async Task SaveBaseConfiguration(DtoBaseConfiguration baseConfiguration) await File.WriteAllTextAsync(configFileLocation, jsonFileContent); } + + public async Task IsBaseConfigurationJsonRelevant() + { + var jsonContent = await BaseConfigurationJsonFileContent().ConfigureAwait(false); + var baseConfigurationJson = JsonConvert.DeserializeObject(jsonContent); + return baseConfigurationJson?.LastEditDateTime != null; + } } \ No newline at end of file From 2528002c45d44f3741f8751d9e5a1d76084829e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Sun, 17 Jul 2022 13:20:51 +0200 Subject: [PATCH 12/30] feat(UI): Add BaseConfiguration site --- .../Client/Pages/BaseConfiguration.razor | 154 +++++++++++++++++- .../Helper/EnvironmentVariableConverter.cs | 9 +- .../Services/BaseConfigurationService.cs | 18 +- .../BaseConfigurationBase.cs | 21 ++- 4 files changed, 179 insertions(+), 23 deletions(-) diff --git a/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor index 3b0178bde..9fcc19487 100644 --- a/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor +++ b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor @@ -1,7 +1,159 @@ -Base Configuration +@page "/BaseConfiguration" +@using TeslaSolarCharger.Shared.Dtos.BaseConfiguration +@using System.Runtime.InteropServices +@inject HttpClient HttpClient + +Base Configuration

Base Configuration

+@if (_dtoBaseConfiguration == null) +{ +

Loading...

+} +else +{ + + + +
+
+ + + Car Ids separated by '|'. Note: The order of the IDs is the order of power distribution. +
+
+
+ + +
+
+ + + Set values higher than 0 to e.g. charge your home battery first, or lower than minimum adjustable power to charge your car first (e.g. 230V * 1A * 3 phases => -691W). +
+
+ + +
+ Use this if consuming power from the grid is a positive value. +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + You can use the name of the container and the default port even though you changed the external port. +
+
+ + + You have to add a geofence with the same name in TeslaMate +
+
+
+ + + You can use the name of the TeslaMate database container +
+
+ + + You can use the internal port of the TeslaMate database container +
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +} + @code { + private DtoBaseConfiguration? _dtoBaseConfiguration; + protected override async Task OnInitializedAsync() + { + _dtoBaseConfiguration = await HttpClient.GetFromJsonAsync("/api/BaseConfiguration/GetBaseConfiguration"); + } + private void HandleValidSubmit() + { + // Process the valid form + } } diff --git a/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs index bfeac8fe6..4d8063159 100644 --- a/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs +++ b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs @@ -32,12 +32,13 @@ public async Task ConvertAllValues() TeslaMateApiBaseUrl = _configuration.GetValue("TeslaMateApiBaseUrl"), UpdateIntervalSeconds = _configuration.GetValue("UpdateIntervalSeconds"), PvValueUpdateIntervalSeconds = _configuration.GetValue("PvValueUpdateIntervalSeconds"), + CarPriorities = _configuration.GetValue("CarPriorities"), GeoFence = _configuration.GetValue("GeoFence"), MinutesUntilSwitchOn = _configuration.GetValue("MinutesUntilSwitchOn"), MinutesUntilSwitchOff = _configuration.GetValue("MinutesUntilSwitchOff"), PowerBuffer = _configuration.GetValue("PowerBuffer"), CurrentPowerToGridJsonPattern = _configuration.GetValue("CurrentPowerToGridJsonPattern"), - CurrentPowerToGridInvertValue = _configuration.GetValue("CurrentPowerToGridInvertValue"), + CurrentPowerToGridInvertValue = _configuration.GetValue("CurrentPowerToGridInvertValue") == true, CurrentInverterPowerJsonPattern = _configuration.GetValue("CurrentInverterPowerJsonPattern"), TelegramBotKey = _configuration.GetValue("TelegramBotKey"), TelegramChannelId = _configuration.GetValue("TelegramChannelId"), @@ -57,12 +58,6 @@ public async Task ConvertAllValues() CurrentInverterPowerXmlAttributeHeaderValue = _configuration.GetValue("CurrentInverterPowerAttributeHeaderValue"), CurrentInverterPowerXmlAttributeValueName = _configuration.GetValue("CurrentInverterPowerAttributeValueName"), }; - var carPriorities = _configuration.GetValue("CarPriorities"); - var elements = carPriorities.Split('|').ToList(); - foreach (var element in elements) - { - dtoBaseConfiguration.CarPriorities.Add(Convert.ToInt32(element)); - } await _baseConfigurationService.SaveBaseConfiguration(dtoBaseConfiguration); } diff --git a/TeslaSolarCharger/Server/Services/BaseConfigurationService.cs b/TeslaSolarCharger/Server/Services/BaseConfigurationService.cs index 0e5773194..1e3ec36eb 100644 --- a/TeslaSolarCharger/Server/Services/BaseConfigurationService.cs +++ b/TeslaSolarCharger/Server/Services/BaseConfigurationService.cs @@ -33,15 +33,14 @@ public async Task GetBaseConfiguration() return dtoBaseConfiguration; } - private async Task BaseConfigurationJsonFileContent() + private async Task BaseConfigurationJsonFileContent() { var cache = MemoryCache.Default; - - if (cache[_baseConfigurationMemoryCacheName] is not string jsonFileContent) + var jsonFileContent = cache[_baseConfigurationMemoryCacheName] as string; + if (jsonFileContent == null) { var filePath = _configurationWrapper.BaseConfigFileFullName(); var cacheItemPolicy = new CacheItemPolicy(); - var filePathList = new List() { filePath, @@ -49,9 +48,12 @@ private async Task BaseConfigurationJsonFileContent() cacheItemPolicy.ChangeMonitors.Add(new HostFileChangeMonitor(filePathList)); - jsonFileContent = await File.ReadAllTextAsync(filePath).ConfigureAwait(false); + if (File.Exists(filePath)) + { + jsonFileContent = await File.ReadAllTextAsync(filePath).ConfigureAwait(false); - cache.Set(_baseConfigurationMemoryCacheName, jsonFileContent, cacheItemPolicy); + cache.Set(_baseConfigurationMemoryCacheName, jsonFileContent, cacheItemPolicy); + } } return jsonFileContent; @@ -82,6 +84,10 @@ public async Task SaveBaseConfiguration(DtoBaseConfiguration baseConfiguration) public async Task IsBaseConfigurationJsonRelevant() { var jsonContent = await BaseConfigurationJsonFileContent().ConfigureAwait(false); + if (jsonContent == null) + { + return false; + } var baseConfigurationJson = JsonConvert.DeserializeObject(jsonContent); return baseConfigurationJson?.LastEditDateTime != null; } diff --git a/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationBase.cs b/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationBase.cs index ee6336e3b..ad581577f 100644 --- a/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationBase.cs +++ b/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationBase.cs @@ -1,4 +1,5 @@ using System.ComponentModel.DataAnnotations; +using Newtonsoft.Json; namespace TeslaSolarCharger.Shared.Dtos.BaseConfiguration; @@ -16,7 +17,7 @@ public class BaseConfigurationBase [Range(1, int.MaxValue)] public int? PvValueUpdateIntervalSeconds { get; set; } = 1; [Required] - public List CarPriorities { get; set; } = new(); + public string? CarPriorities { get; set; } [Required] public string? GeoFence { get; set; } [Required] @@ -28,24 +29,26 @@ public class BaseConfigurationBase [Required] public int? PowerBuffer { get; set; } = 0; public string? CurrentPowerToGridJsonPattern { get; set; } - public bool? CurrentPowerToGridInvertValue { get; set; } + [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)] + public bool CurrentPowerToGridInvertValue { get; set; } public string? CurrentInverterPowerJsonPattern { get; set; } public string? TelegramBotKey { get; set; } public string? TelegramChannelId { get; set; } [Required] - public string? TeslaMateDbServer { get; set; } = "database"; + public string TeslaMateDbServer { get; set; } = "database"; [Required] - public int? TeslaMateDbPort { get; set; } = 5432; + public int TeslaMateDbPort { get; set; } = 5432; [Required] - public string? TeslaMateDbDatabaseName { get; set; } = "teslamate"; + public string TeslaMateDbDatabaseName { get; set; } = "teslamate"; [Required] - public string? TeslaMateDbUser { get; set; } = "teslamate"; + public string TeslaMateDbUser { get; set; } = "teslamate"; [Required] - public string? TeslaMateDbPassword { get; set; } = "secret"; + [DataType(DataType.Password)] + public string TeslaMateDbPassword { get; set; } = "secret"; [Required] - public string? MqqtClientId { get; set; } = "TeslaSolarCharger"; + public string MqqtClientId { get; set; } = "TeslaSolarCharger"; [Required] - public string? MosquitoServer { get; set; } = "mosquitto"; + public string MosquitoServer { get; set; } = "mosquitto"; public string? CurrentPowerToGridXmlPattern { get; set; } public string? CurrentPowerToGridXmlAttributeHeaderName { get; set; } public string? CurrentPowerToGridXmlAttributeHeaderValue { get; set; } From e05b3a553798a804d3e21c791a6ea10b508aa730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Sun, 17 Jul 2022 14:23:45 +0200 Subject: [PATCH 13/30] refactor(ConfigurationWrapper): rename class --- .../Wrappers/ConfigurationWrapper.cs | 14 +++++++------- TeslaSolarCharger/Server/Program.cs | 2 +- ... => EnvironmentVariableConfigurationWrapper.cs} | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) rename TeslaSolarCharger/Shared/Wrappers/{ConfigurationWrapper.cs => EnvironmentVariableConfigurationWrapper.cs} (97%) diff --git a/TeslaSolarCharger.Tests/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger.Tests/Wrappers/ConfigurationWrapper.cs index 093438bc0..7b77c2ace 100644 --- a/TeslaSolarCharger.Tests/Wrappers/ConfigurationWrapper.cs +++ b/TeslaSolarCharger.Tests/Wrappers/ConfigurationWrapper.cs @@ -15,7 +15,7 @@ public ConfigurationWrapper(ITestOutputHelper outputHelper) [Fact] public void Get_Not_Nullable_String() { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var existingConfigValue = "TeslaMateApiBaseUrl"; var teslaMateApiBaseUrl = @@ -29,7 +29,7 @@ public void Get_Not_Nullable_String() [InlineData("notExisiting")] public void Throw_Exception_On_Null_String(string notExisitingConfigValue) { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); Assert.Throws( () => configurationWrapper.GetNotNullableConfigurationValue(notExisitingConfigValue)); } @@ -39,7 +39,7 @@ public void Throw_Exception_On_Null_String(string notExisitingConfigValue) [InlineData("notExisiting")] public void Returns_Null_On_Non_Exisiting_Values(string notExisitingConfigValue) { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var value = configurationWrapper.GetNullableConfigurationValue(notExisitingConfigValue); Assert.Null(value); @@ -52,7 +52,7 @@ public void Returns_Null_On_Non_Exisiting_Values(string notExisitingConfigValue) [InlineData("notExisiting")] public void Get_TimeSpan_From_Minutes(string configName) { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var timespan = configurationWrapper.GetMinutesConfigurationValueIfGreaterThanMinumum(configName, TimeSpan.FromMinutes(1)); @@ -82,7 +82,7 @@ public void Get_TimeSpan_From_Minutes(string configName) [InlineData("notExisiting")] public void Get_TimeSpan_From_Seconds(string configName) { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var minimum = TimeSpan.FromSeconds(1); var timespan = configurationWrapper.GetSecondsConfigurationValueIfGreaterThanMinumum(configName, minimum); @@ -109,7 +109,7 @@ public void Get_TimeSpan_From_Seconds(string configName) [Fact] public void GetConfigurationFileDirectory() { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var value = configurationWrapper.ConfigFileDirectory(); Assert.Equal("configs", value); @@ -118,7 +118,7 @@ public void GetConfigurationFileDirectory() [Fact] public void GetCarConfigurationFileFullName() { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var value = configurationWrapper.CarConfigFileFullName(); var pathSeparator = Path.DirectorySeparatorChar; var linuxPathSeparator = '/'; diff --git a/TeslaSolarCharger/Server/Program.cs b/TeslaSolarCharger/Server/Program.cs index 230cfc8a6..fb5cb02c9 100644 --- a/TeslaSolarCharger/Server/Program.cs +++ b/TeslaSolarCharger/Server/Program.cs @@ -51,7 +51,7 @@ .AddTransient() .AddSingleton() .AddSingleton() - .AddSingleton() + .AddSingleton() .AddSingleton(mqttClient) .AddTransient() .AddTransient() diff --git a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Wrappers/EnvironmentVariableConfigurationWrapper.cs similarity index 97% rename from TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs rename to TeslaSolarCharger/Shared/Wrappers/EnvironmentVariableConfigurationWrapper.cs index 7046b6a8d..f96e3f00e 100644 --- a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Wrappers/EnvironmentVariableConfigurationWrapper.cs @@ -7,12 +7,12 @@ [assembly: InternalsVisibleTo("TeslaSolarCharger.Tests")] namespace TeslaSolarCharger.Shared.Wrappers; -public class ConfigurationWrapper : IConfigurationWrapper +public class EnvironmentVariableConfigurationWrapper : IConfigurationWrapper { - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly IConfiguration _configuration; - public ConfigurationWrapper(ILogger logger, IConfiguration configuration) + public EnvironmentVariableConfigurationWrapper(ILogger logger, IConfiguration configuration) { _logger = logger; _configuration = configuration; From 05b840769545bce0002c4b988836650f23041638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Sun, 17 Jul 2022 14:30:39 +0200 Subject: [PATCH 14/30] feat(BaseConfigurationService): move to shared project --- .../Server/Controllers/BaseConfigurationController.cs | 1 + .../Server/Helper/EnvironmentVariableConverter.cs | 1 + TeslaSolarCharger/Server/Program.cs | 1 + TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj | 1 - .../{Server => Shared}/Contracts/IBaseConfigurationService.cs | 2 +- .../{Server => Shared}/Services/BaseConfigurationService.cs | 4 ++-- TeslaSolarCharger/Shared/TeslaSolarCharger.Shared.csproj | 1 + 7 files changed, 7 insertions(+), 4 deletions(-) rename TeslaSolarCharger/{Server => Shared}/Contracts/IBaseConfigurationService.cs (86%) rename TeslaSolarCharger/{Server => Shared}/Services/BaseConfigurationService.cs (97%) diff --git a/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs b/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs index bf4eec446..f791821c5 100644 --- a/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs +++ b/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Mvc; using TeslaSolarCharger.Server.Contracts; +using TeslaSolarCharger.Shared.Contracts; using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; namespace TeslaSolarCharger.Server.Controllers diff --git a/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs index 4d8063159..1e5d2b786 100644 --- a/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs +++ b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs @@ -1,4 +1,5 @@ using TeslaSolarCharger.Server.Contracts; +using TeslaSolarCharger.Shared.Contracts; using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; namespace TeslaSolarCharger.Server.Helper; diff --git a/TeslaSolarCharger/Server/Program.cs b/TeslaSolarCharger/Server/Program.cs index fb5cb02c9..c1a487c70 100644 --- a/TeslaSolarCharger/Server/Program.cs +++ b/TeslaSolarCharger/Server/Program.cs @@ -14,6 +14,7 @@ using TeslaSolarCharger.Shared.Dtos; using TeslaSolarCharger.Shared.Dtos.Contracts; using TeslaSolarCharger.Shared.Dtos.Settings; +using TeslaSolarCharger.Shared.Services; using TeslaSolarCharger.Shared.TimeProviding; using TeslaSolarCharger.Shared.Wrappers; diff --git a/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj b/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj index 3ed60e0ee..10587cfc1 100644 --- a/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj +++ b/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj @@ -34,7 +34,6 @@ - diff --git a/TeslaSolarCharger/Server/Contracts/IBaseConfigurationService.cs b/TeslaSolarCharger/Shared/Contracts/IBaseConfigurationService.cs similarity index 86% rename from TeslaSolarCharger/Server/Contracts/IBaseConfigurationService.cs rename to TeslaSolarCharger/Shared/Contracts/IBaseConfigurationService.cs index be99cb743..64b57fb9d 100644 --- a/TeslaSolarCharger/Server/Contracts/IBaseConfigurationService.cs +++ b/TeslaSolarCharger/Shared/Contracts/IBaseConfigurationService.cs @@ -1,6 +1,6 @@ using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; -namespace TeslaSolarCharger.Server.Contracts; +namespace TeslaSolarCharger.Shared.Contracts; public interface IBaseConfigurationService { diff --git a/TeslaSolarCharger/Server/Services/BaseConfigurationService.cs b/TeslaSolarCharger/Shared/Services/BaseConfigurationService.cs similarity index 97% rename from TeslaSolarCharger/Server/Services/BaseConfigurationService.cs rename to TeslaSolarCharger/Shared/Services/BaseConfigurationService.cs index 1e3ec36eb..95f650b05 100644 --- a/TeslaSolarCharger/Server/Services/BaseConfigurationService.cs +++ b/TeslaSolarCharger/Shared/Services/BaseConfigurationService.cs @@ -1,10 +1,10 @@ using System.Runtime.Caching; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using TeslaSolarCharger.Server.Contracts; using TeslaSolarCharger.Shared.Contracts; using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; -namespace TeslaSolarCharger.Server.Services; +namespace TeslaSolarCharger.Shared.Services; public class BaseConfigurationService : IBaseConfigurationService { diff --git a/TeslaSolarCharger/Shared/TeslaSolarCharger.Shared.csproj b/TeslaSolarCharger/Shared/TeslaSolarCharger.Shared.csproj index 987f14931..95783f8df 100644 --- a/TeslaSolarCharger/Shared/TeslaSolarCharger.Shared.csproj +++ b/TeslaSolarCharger/Shared/TeslaSolarCharger.Shared.csproj @@ -19,5 +19,6 @@ + From d1763c61a330cdde513304b6aa1d70b9a83cc278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Sun, 17 Jul 2022 14:23:45 +0200 Subject: [PATCH 15/30] Revert "refactor(ConfigurationWrapper): rename class" This reverts commit ffca3ec8fdfe6f8caaa4aca72429eb07653cb406. --- .../Wrappers/ConfigurationWrapper.cs | 14 +++++++------- TeslaSolarCharger/Server/Program.cs | 2 +- ...igurationWrapper.cs => ConfigurationWrapper.cs} | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) rename TeslaSolarCharger/Shared/Wrappers/{EnvironmentVariableConfigurationWrapper.cs => ConfigurationWrapper.cs} (97%) diff --git a/TeslaSolarCharger.Tests/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger.Tests/Wrappers/ConfigurationWrapper.cs index 7b77c2ace..093438bc0 100644 --- a/TeslaSolarCharger.Tests/Wrappers/ConfigurationWrapper.cs +++ b/TeslaSolarCharger.Tests/Wrappers/ConfigurationWrapper.cs @@ -15,7 +15,7 @@ public ConfigurationWrapper(ITestOutputHelper outputHelper) [Fact] public void Get_Not_Nullable_String() { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var existingConfigValue = "TeslaMateApiBaseUrl"; var teslaMateApiBaseUrl = @@ -29,7 +29,7 @@ public void Get_Not_Nullable_String() [InlineData("notExisiting")] public void Throw_Exception_On_Null_String(string notExisitingConfigValue) { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); Assert.Throws( () => configurationWrapper.GetNotNullableConfigurationValue(notExisitingConfigValue)); } @@ -39,7 +39,7 @@ public void Throw_Exception_On_Null_String(string notExisitingConfigValue) [InlineData("notExisiting")] public void Returns_Null_On_Non_Exisiting_Values(string notExisitingConfigValue) { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var value = configurationWrapper.GetNullableConfigurationValue(notExisitingConfigValue); Assert.Null(value); @@ -52,7 +52,7 @@ public void Returns_Null_On_Non_Exisiting_Values(string notExisitingConfigValue) [InlineData("notExisiting")] public void Get_TimeSpan_From_Minutes(string configName) { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var timespan = configurationWrapper.GetMinutesConfigurationValueIfGreaterThanMinumum(configName, TimeSpan.FromMinutes(1)); @@ -82,7 +82,7 @@ public void Get_TimeSpan_From_Minutes(string configName) [InlineData("notExisiting")] public void Get_TimeSpan_From_Seconds(string configName) { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var minimum = TimeSpan.FromSeconds(1); var timespan = configurationWrapper.GetSecondsConfigurationValueIfGreaterThanMinumum(configName, minimum); @@ -109,7 +109,7 @@ public void Get_TimeSpan_From_Seconds(string configName) [Fact] public void GetConfigurationFileDirectory() { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var value = configurationWrapper.ConfigFileDirectory(); Assert.Equal("configs", value); @@ -118,7 +118,7 @@ public void GetConfigurationFileDirectory() [Fact] public void GetCarConfigurationFileFullName() { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var value = configurationWrapper.CarConfigFileFullName(); var pathSeparator = Path.DirectorySeparatorChar; var linuxPathSeparator = '/'; diff --git a/TeslaSolarCharger/Server/Program.cs b/TeslaSolarCharger/Server/Program.cs index c1a487c70..692b237b6 100644 --- a/TeslaSolarCharger/Server/Program.cs +++ b/TeslaSolarCharger/Server/Program.cs @@ -52,7 +52,7 @@ .AddTransient() .AddSingleton() .AddSingleton() - .AddSingleton() + .AddSingleton() .AddSingleton(mqttClient) .AddTransient() .AddTransient() diff --git a/TeslaSolarCharger/Shared/Wrappers/EnvironmentVariableConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs similarity index 97% rename from TeslaSolarCharger/Shared/Wrappers/EnvironmentVariableConfigurationWrapper.cs rename to TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs index f96e3f00e..7046b6a8d 100644 --- a/TeslaSolarCharger/Shared/Wrappers/EnvironmentVariableConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs @@ -7,12 +7,12 @@ [assembly: InternalsVisibleTo("TeslaSolarCharger.Tests")] namespace TeslaSolarCharger.Shared.Wrappers; -public class EnvironmentVariableConfigurationWrapper : IConfigurationWrapper +public class ConfigurationWrapper : IConfigurationWrapper { - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly IConfiguration _configuration; - public EnvironmentVariableConfigurationWrapper(ILogger logger, IConfiguration configuration) + public ConfigurationWrapper(ILogger logger, IConfiguration configuration) { _logger = logger; _configuration = configuration; From 30df154acd30b9958e523e4b3219bcab162a5a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Mon, 18 Jul 2022 14:27:23 +0200 Subject: [PATCH 16/30] refactor(ConfigurationWrapper): use baseConfiguration.json --- .../Wrappers/ConfigurationWrapper.cs | 25 ++- .../BaseConfigurationBase.cs | 18 +- .../Shared/Wrappers/ConfigurationWrapper.cs | 161 +++++------------- 3 files changed, 65 insertions(+), 139 deletions(-) diff --git a/TeslaSolarCharger.Tests/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger.Tests/Wrappers/ConfigurationWrapper.cs index 093438bc0..d6c301354 100644 --- a/TeslaSolarCharger.Tests/Wrappers/ConfigurationWrapper.cs +++ b/TeslaSolarCharger.Tests/Wrappers/ConfigurationWrapper.cs @@ -15,7 +15,7 @@ public ConfigurationWrapper(ITestOutputHelper outputHelper) [Fact] public void Get_Not_Nullable_String() { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var existingConfigValue = "TeslaMateApiBaseUrl"; var teslaMateApiBaseUrl = @@ -29,7 +29,7 @@ public void Get_Not_Nullable_String() [InlineData("notExisiting")] public void Throw_Exception_On_Null_String(string notExisitingConfigValue) { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); Assert.Throws( () => configurationWrapper.GetNotNullableConfigurationValue(notExisitingConfigValue)); } @@ -39,7 +39,7 @@ public void Throw_Exception_On_Null_String(string notExisitingConfigValue) [InlineData("notExisiting")] public void Returns_Null_On_Non_Exisiting_Values(string notExisitingConfigValue) { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var value = configurationWrapper.GetNullableConfigurationValue(notExisitingConfigValue); Assert.Null(value); @@ -52,7 +52,7 @@ public void Returns_Null_On_Non_Exisiting_Values(string notExisitingConfigValue) [InlineData("notExisiting")] public void Get_TimeSpan_From_Minutes(string configName) { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var timespan = configurationWrapper.GetMinutesConfigurationValueIfGreaterThanMinumum(configName, TimeSpan.FromMinutes(1)); @@ -82,7 +82,7 @@ public void Get_TimeSpan_From_Minutes(string configName) [InlineData("notExisiting")] public void Get_TimeSpan_From_Seconds(string configName) { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var minimum = TimeSpan.FromSeconds(1); var timespan = configurationWrapper.GetSecondsConfigurationValueIfGreaterThanMinumum(configName, minimum); @@ -109,21 +109,18 @@ public void Get_TimeSpan_From_Seconds(string configName) [Fact] public void GetConfigurationFileDirectory() { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var value = configurationWrapper.ConfigFileDirectory(); - - Assert.Equal("configs", value); + var dirInfo = new DirectoryInfo(value); + Assert.Equal("configs", dirInfo.Name); } [Fact] public void GetCarConfigurationFileFullName() { - var configurationWrapper = Mock.Create(); + var configurationWrapper = Mock.Create(); var value = configurationWrapper.CarConfigFileFullName(); - var pathSeparator = Path.DirectorySeparatorChar; - var linuxPathSeparator = '/'; - var windowsPathSeparator = '\\'; - Assert.True(pathSeparator.Equals(linuxPathSeparator) || pathSeparator.Equals(windowsPathSeparator)); - Assert.Equal($"configs{pathSeparator}carConfig.json", value); + var fileInfo = new FileInfo(value); + Assert.Equal("carConfig.json", fileInfo.Name); } } \ No newline at end of file diff --git a/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationBase.cs b/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationBase.cs index ad581577f..ee59636a5 100644 --- a/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationBase.cs +++ b/TeslaSolarCharger/Shared/Dtos/BaseConfiguration/BaseConfigurationBase.cs @@ -6,28 +6,28 @@ namespace TeslaSolarCharger.Shared.Dtos.BaseConfiguration; public class BaseConfigurationBase { [Required] - public string? CurrentPowerToGridUrl { get; set; } + public string CurrentPowerToGridUrl { get; set; } = "http://192.168.1.50:5007/api/GridPower"; public string? CurrentInverterPowerUrl { get; set; } [Required] - public string? TeslaMateApiBaseUrl { get; set; } + public string TeslaMateApiBaseUrl { get; set; } = "http://teslamateapi:8080"; [Required] [Range(30, int.MaxValue)] - public int? UpdateIntervalSeconds { get; set; } = 30; + public int UpdateIntervalSeconds { get; set; } = 30; [Required] [Range(1, int.MaxValue)] public int? PvValueUpdateIntervalSeconds { get; set; } = 1; [Required] - public string? CarPriorities { get; set; } - [Required] - public string? GeoFence { get; set; } + public string CarPriorities { get; set; } = "1"; + [Required] + public string GeoFence { get; set; } = "Home"; [Required] [Range(1, int.MaxValue)] - public int? MinutesUntilSwitchOn { get; set; } = 5; + public int MinutesUntilSwitchOn { get; set; } = 5; [Required] [Range(1, int.MaxValue)] - public int? MinutesUntilSwitchOff { get; set; } = 5; + public int MinutesUntilSwitchOff { get; set; } = 5; [Required] - public int? PowerBuffer { get; set; } = 0; + public int PowerBuffer { get; set; } = 0; public string? CurrentPowerToGridJsonPattern { get; set; } [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)] public bool CurrentPowerToGridInvertValue { get; set; } diff --git a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs index 7046b6a8d..810ca1419 100644 --- a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using TeslaSolarCharger.Shared.Contracts; +using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; [assembly: InternalsVisibleTo("TeslaSolarCharger.Tests")] namespace TeslaSolarCharger.Shared.Wrappers; @@ -11,11 +12,13 @@ public class ConfigurationWrapper : IConfigurationWrapper { private readonly ILogger _logger; private readonly IConfiguration _configuration; + private readonly IBaseConfigurationService _baseConfigurationService; - public ConfigurationWrapper(ILogger logger, IConfiguration configuration) + public ConfigurationWrapper(ILogger logger, IConfiguration configuration, IBaseConfigurationService baseConfigurationService) { _logger = logger; _configuration = configuration; + _baseConfigurationService = baseConfigurationService; } public string CarConfigFileFullName() @@ -48,19 +51,18 @@ internal string ConfigFileDirectory() public TimeSpan ChargingValueJobUpdateIntervall() { - var environmentVariableName = "UpdateIntervalSeconds"; var minimum = TimeSpan.FromSeconds(20); - var value = GetSecondsConfigurationValueIfGreaterThanMinumum(environmentVariableName, minimum); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); + var updateIntervalSeconds = GetBaseConfiguration().UpdateIntervalSeconds; + var value = GetValueIfGreaterThanMinimum(TimeSpan.FromSeconds(updateIntervalSeconds), minimum); return value; } public TimeSpan PvValueJobUpdateIntervall() { - var environmentVariableName = "PvValueUpdateIntervalSeconds"; var maximum = ChargingValueJobUpdateIntervall(); var minimum = TimeSpan.FromSeconds(1); - var value = TimeSpan.FromSeconds(_configuration.GetValue(environmentVariableName)); + var updateIntervalSeconds = GetBaseConfiguration().PvValueUpdateIntervalSeconds; + var value = TimeSpan.FromSeconds(updateIntervalSeconds ?? ChargingValueJobUpdateIntervall().TotalSeconds); if (value > maximum) { @@ -70,235 +72,157 @@ public TimeSpan PvValueJobUpdateIntervall() { value = minimum; } - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); return value; } public string MqqtClientId() { - var environmentVariableName = "MqqtClientId"; - var value = GetNotNullableConfigurationValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().MqqtClientId; } public string MosquitoServer() { - var environmentVariableName = "MosquitoServer"; - var value = GetNotNullableConfigurationValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().MosquitoServer; } public string TeslaMateDbServer() { - var environmentVariableName = "TeslaMateDbServer"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().TeslaMateDbServer; } public int TeslaMateDbPort() { - var environmentVariableName = "TeslaMateDbPort"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().TeslaMateDbPort; } public string TeslaMateDbDatabaseName() { - var environmentVariableName = "TeslaMateDbDatabaseName"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().TeslaMateDbDatabaseName; } public string TeslaMateDbUser() { - var environmentVariableName = "TeslaMateDbUser"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().TeslaMateDbUser; } public string TeslaMateDbPassword() { - var environmentVariableName = "TeslaMateDbPassword"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().TeslaMateDbPassword; } public string CurrentPowerToGridUrl() { - var environmentVariableName = "CurrentPowerToGridUrl"; - var value = GetNotNullableConfigurationValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().CurrentPowerToGridUrl; } public string? CurrentInverterPowerUrl() { - var environmentVariableName = "CurrentInverterPowerUrl"; - var value = GetNullableConfigurationValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().CurrentInverterPowerUrl; } public string? CurrentPowerToGridJsonPattern() { - var environmentVariableName = "CurrentPowerToGridJsonPattern"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().CurrentPowerToGridJsonPattern; } public string? CurrentPowerToGridXmlPattern() { - var environmentVariableName = "CurrentPowerToGridXmlPattern"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().CurrentPowerToGridXmlPattern; } public string? CurrentPowerToGridXmlAttributeHeaderName() { - var environmentVariableName = "CurrentPowerToGridXmlAttributeHeaderName"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().CurrentPowerToGridXmlAttributeHeaderName; } public string? CurrentPowerToGridXmlAttributeHeaderValue() { - var environmentVariableName = "CurrentPowerToGridXmlAttributeHeaderValue"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().CurrentPowerToGridXmlAttributeHeaderValue; } public string? CurrentPowerToGridXmlAttributeValueName() { - var environmentVariableName = "CurrentPowerToGridXmlAttributeValueName"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().CurrentPowerToGridXmlAttributeValueName; } public string? CurrentInverterPowerJsonPattern() { - var environmentVariableName = "CurrentInverterPowerJsonPattern"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().CurrentInverterPowerJsonPattern; } public string? CurrentInverterPowerXmlPattern() { - var environmentVariableName = "CurrentInverterPowerXmlPattern"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().CurrentInverterPowerXmlPattern; } public string? CurrentInverterPowerXmlAttributeHeaderName() { - var environmentVariableName = "CurrentInverterPowerXmlAttributeHeaderName"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().CurrentInverterPowerXmlAttributeHeaderName; } public string? CurrentInverterPowerXmlAttributeHeaderValue() { - var environmentVariableName = "CurrentInverterPowerXmlAttributeHeaderValue"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().CurrentInverterPowerXmlAttributeHeaderValue; } public string? CurrentInverterPowerXmlAttributeValueName() { - var environmentVariableName = "CurrentInverterPowerXmlAttributeValueName"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().CurrentInverterPowerXmlAttributeValueName; } public bool CurrentPowerToGridInvertValue() { - var environmentVariableName = "CurrentPowerToGridInvertValue"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().CurrentPowerToGridInvertValue; } public string TeslaMateApiBaseUrl() { - var environmentVariableName = "TeslaMateApiBaseUrl"; - var value = GetNotNullableConfigurationValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().TeslaMateApiBaseUrl; } public List CarPriorities() { - var environmentVariableName = "CarPriorities"; - var rawValue = GetNotNullableConfigurationValue(environmentVariableName); + var rawValue = GetBaseConfiguration().CarPriorities; var value = rawValue.Split("|").Select(id => Convert.ToInt32(id)).ToList(); - _logger.LogDebug("Config value extracted: [{key}]: {@value}", environmentVariableName, value); return value; } public string GeoFence() { - var environmentVariableName = "GeoFence"; - var value = GetNotNullableConfigurationValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().GeoFence; } public TimeSpan TimeUntilSwitchOn() { - var environmentVariableName = "MinutesUntilSwitchOn"; + var rawValue = GetBaseConfiguration().MinutesUntilSwitchOn; + var timeSpan = TimeSpan.FromMinutes(rawValue); var minimum = TimeSpan.FromMinutes(1); - var value = GetMinutesConfigurationValueIfGreaterThanMinumum(environmentVariableName, minimum); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); + var value = GetValueIfGreaterThanMinimum(timeSpan, minimum); return value; } public TimeSpan TimespanUntilSwitchOff() { - var environmentVariableName = "MinutesUntilSwitchOff"; + var rawValue = GetBaseConfiguration().MinutesUntilSwitchOff; + var timeSpan = TimeSpan.FromMinutes(rawValue); var minimum = TimeSpan.FromMinutes(1); - var value = GetMinutesConfigurationValueIfGreaterThanMinumum(environmentVariableName, minimum); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); + var value = GetValueIfGreaterThanMinimum(timeSpan, minimum); return value; } public int PowerBuffer() { - var environmentVariableName = "PowerBuffer"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().PowerBuffer; } public string? TelegramBotKey() { - var environmentVariableName = "TelegramBotKey"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().TelegramBotKey; } public string? TelegramChannelId() { - var environmentVariableName = "TelegramChannelId"; - var value = _configuration.GetValue(environmentVariableName); - _logger.LogDebug("Config value extracted: [{key}]: {value}", environmentVariableName, value); - return value; + return GetBaseConfiguration().TelegramChannelId; } internal T GetNotNullableConfigurationValue(string environmentVariableName) @@ -344,4 +268,9 @@ private TimeSpan GetValueIfGreaterThanMinimum(TimeSpan value, TimeSpan minimum) return value; } } + + private DtoBaseConfiguration GetBaseConfiguration() + { + return _baseConfigurationService.GetBaseConfiguration().GetAwaiter().GetResult(); + } } \ No newline at end of file From fb28c35e6c0332b64e871b161e98844ce57bb91e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Mon, 18 Jul 2022 14:54:22 +0200 Subject: [PATCH 17/30] fix(ConfigurationWrapper): resolve circular reference --- .../BaseConfigurationController.cs | 8 +- .../Helper/EnvironmentVariableConverter.cs | 10 +- TeslaSolarCharger/Server/Program.cs | 2 - .../Contracts/IBaseConfigurationService.cs | 10 -- .../Shared/Contracts/IConfigurationWrapper.cs | 8 +- .../Services/BaseConfigurationService.cs | 94 ------------------- .../Shared/Wrappers/ConfigurationWrapper.cs | 84 ++++++++++++++++- 7 files changed, 96 insertions(+), 120 deletions(-) delete mode 100644 TeslaSolarCharger/Shared/Contracts/IBaseConfigurationService.cs delete mode 100644 TeslaSolarCharger/Shared/Services/BaseConfigurationService.cs diff --git a/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs b/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs index f791821c5..8a3d4052c 100644 --- a/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs +++ b/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs @@ -9,14 +9,14 @@ namespace TeslaSolarCharger.Server.Controllers [ApiController] public class BaseConfigurationController : ControllerBase { - private readonly IBaseConfigurationService _service; + private readonly IConfigurationWrapper _configurationWrapper; - public BaseConfigurationController(IBaseConfigurationService service) + public BaseConfigurationController(IConfigurationWrapper configurationWrapper) { - _service = service; + _configurationWrapper = configurationWrapper; } [HttpGet] - public Task GetBaseConfiguration() => _service.GetBaseConfiguration(); + public Task GetBaseConfiguration() => _configurationWrapper.GetBaseConfigurationAsync(); } } diff --git a/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs index 1e5d2b786..a71ebdf5a 100644 --- a/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs +++ b/TeslaSolarCharger/Server/Helper/EnvironmentVariableConverter.cs @@ -8,20 +8,20 @@ public class EnvironmentVariableConverter : IEnvironmentVariableConverter { private readonly ILogger _logger; private readonly IConfiguration _configuration; - private readonly IBaseConfigurationService _baseConfigurationService; + private readonly IConfigurationWrapper _configurationWrapper; public EnvironmentVariableConverter(ILogger logger, IConfiguration configuration, - IBaseConfigurationService baseConfigurationService) + IConfigurationWrapper configurationWrapper) { _logger = logger; _configuration = configuration; - _baseConfigurationService = baseConfigurationService; + _configurationWrapper = configurationWrapper; } public async Task ConvertAllValues() { _logger.LogTrace("{method}()", nameof(ConvertAllValues)); - if (await _baseConfigurationService.IsBaseConfigurationJsonRelevant()) + if (await _configurationWrapper.IsBaseConfigurationJsonRelevant()) { _logger.LogInformation("Do not convert environment variables to json file as json file has been edited."); return; @@ -60,6 +60,6 @@ public async Task ConvertAllValues() CurrentInverterPowerXmlAttributeValueName = _configuration.GetValue("CurrentInverterPowerAttributeValueName"), }; - await _baseConfigurationService.SaveBaseConfiguration(dtoBaseConfiguration); + await _configurationWrapper.SaveBaseConfiguration(dtoBaseConfiguration); } } \ No newline at end of file diff --git a/TeslaSolarCharger/Server/Program.cs b/TeslaSolarCharger/Server/Program.cs index 692b237b6..9a32284bc 100644 --- a/TeslaSolarCharger/Server/Program.cs +++ b/TeslaSolarCharger/Server/Program.cs @@ -14,7 +14,6 @@ using TeslaSolarCharger.Shared.Dtos; using TeslaSolarCharger.Shared.Dtos.Contracts; using TeslaSolarCharger.Shared.Dtos.Settings; -using TeslaSolarCharger.Shared.Services; using TeslaSolarCharger.Shared.TimeProviding; using TeslaSolarCharger.Shared.Wrappers; @@ -65,7 +64,6 @@ options.EnableDetailedErrors(); }, ServiceLifetime.Transient, ServiceLifetime.Transient) .AddTransient() - .AddTransient() .AddTransient() ; diff --git a/TeslaSolarCharger/Shared/Contracts/IBaseConfigurationService.cs b/TeslaSolarCharger/Shared/Contracts/IBaseConfigurationService.cs deleted file mode 100644 index 64b57fb9d..000000000 --- a/TeslaSolarCharger/Shared/Contracts/IBaseConfigurationService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; - -namespace TeslaSolarCharger.Shared.Contracts; - -public interface IBaseConfigurationService -{ - Task GetBaseConfiguration(); - Task SaveBaseConfiguration(DtoBaseConfiguration baseConfiguration); - Task IsBaseConfigurationJsonRelevant(); -} \ No newline at end of file diff --git a/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs index 00c64aa15..8c8372853 100644 --- a/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs @@ -1,4 +1,6 @@ -namespace TeslaSolarCharger.Shared.Contracts; +using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; + +namespace TeslaSolarCharger.Shared.Contracts; public interface IConfigurationWrapper { @@ -34,4 +36,8 @@ public interface IConfigurationWrapper string TeslaMateDbUser(); string TeslaMateDbPassword(); string BaseConfigFileFullName(); + + Task GetBaseConfigurationAsync(); + Task SaveBaseConfiguration(DtoBaseConfiguration baseConfiguration); + Task IsBaseConfigurationJsonRelevant(); } \ No newline at end of file diff --git a/TeslaSolarCharger/Shared/Services/BaseConfigurationService.cs b/TeslaSolarCharger/Shared/Services/BaseConfigurationService.cs deleted file mode 100644 index 95f650b05..000000000 --- a/TeslaSolarCharger/Shared/Services/BaseConfigurationService.cs +++ /dev/null @@ -1,94 +0,0 @@ -using System.Runtime.Caching; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; -using TeslaSolarCharger.Shared.Contracts; -using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; - -namespace TeslaSolarCharger.Shared.Services; - -public class BaseConfigurationService : IBaseConfigurationService -{ - private readonly ILogger _logger; - private readonly IConfigurationWrapper _configurationWrapper; - private readonly string _baseConfigurationMemoryCacheName = "baseConfiguration"; - - public BaseConfigurationService(ILogger logger, IConfigurationWrapper configurationWrapper) - { - _logger = logger; - _configurationWrapper = configurationWrapper; - } - - public async Task GetBaseConfiguration() - { - _logger.LogTrace("{method}()", nameof(GetBaseConfiguration)); - var jsonFileContent = await BaseConfigurationJsonFileContent(); - - var dtoBaseConfiguration = JsonConvert.DeserializeObject(jsonFileContent); - - if (dtoBaseConfiguration == null) - { - throw new ArgumentException($"Could not deserialize {jsonFileContent} to {nameof(DtoBaseConfiguration)}"); - } - - return dtoBaseConfiguration; - } - - private async Task BaseConfigurationJsonFileContent() - { - var cache = MemoryCache.Default; - var jsonFileContent = cache[_baseConfigurationMemoryCacheName] as string; - if (jsonFileContent == null) - { - var filePath = _configurationWrapper.BaseConfigFileFullName(); - var cacheItemPolicy = new CacheItemPolicy(); - var filePathList = new List() - { - filePath, - }; - - cacheItemPolicy.ChangeMonitors.Add(new HostFileChangeMonitor(filePathList)); - - if (File.Exists(filePath)) - { - jsonFileContent = await File.ReadAllTextAsync(filePath).ConfigureAwait(false); - - cache.Set(_baseConfigurationMemoryCacheName, jsonFileContent, cacheItemPolicy); - } - } - - return jsonFileContent; - } - - public async Task SaveBaseConfiguration(DtoBaseConfiguration baseConfiguration) - { - var baseConfigurationBase = (BaseConfigurationBase)baseConfiguration; - var baseConfigurationJson = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(baseConfigurationBase)); - //if (false) - //{ - // baseConfigurationJson.LastEditDateTime = DateTime.UtcNow; - //} - var jsonFileContent = JsonConvert.SerializeObject(baseConfigurationJson); - - var configFileLocation = _configurationWrapper.BaseConfigFileFullName(); - var fileInfo = new FileInfo(configFileLocation); - var configDirectoryFullName = fileInfo.Directory?.FullName; - if (!Directory.Exists(configDirectoryFullName)) - { - _logger.LogDebug("Config directory {directoryname} does not exist.", configDirectoryFullName); - Directory.CreateDirectory(configDirectoryFullName ?? throw new InvalidOperationException()); - } - - await File.WriteAllTextAsync(configFileLocation, jsonFileContent); - } - - public async Task IsBaseConfigurationJsonRelevant() - { - var jsonContent = await BaseConfigurationJsonFileContent().ConfigureAwait(false); - if (jsonContent == null) - { - return false; - } - var baseConfigurationJson = JsonConvert.DeserializeObject(jsonContent); - return baseConfigurationJson?.LastEditDateTime != null; - } -} \ No newline at end of file diff --git a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs index 810ca1419..d40143056 100644 --- a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs @@ -1,7 +1,9 @@ using System.Reflection; +using System.Runtime.Caching; using System.Runtime.CompilerServices; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; +using Newtonsoft.Json; using TeslaSolarCharger.Shared.Contracts; using TeslaSolarCharger.Shared.Dtos.BaseConfiguration; @@ -12,13 +14,12 @@ public class ConfigurationWrapper : IConfigurationWrapper { private readonly ILogger _logger; private readonly IConfiguration _configuration; - private readonly IBaseConfigurationService _baseConfigurationService; + private readonly string _baseConfigurationMemoryCacheName = "baseConfiguration"; - public ConfigurationWrapper(ILogger logger, IConfiguration configuration, IBaseConfigurationService baseConfigurationService) + public ConfigurationWrapper(ILogger logger, IConfiguration configuration) { _logger = logger; _configuration = configuration; - _baseConfigurationService = baseConfigurationService; } public string CarConfigFileFullName() @@ -271,6 +272,81 @@ private TimeSpan GetValueIfGreaterThanMinimum(TimeSpan value, TimeSpan minimum) private DtoBaseConfiguration GetBaseConfiguration() { - return _baseConfigurationService.GetBaseConfiguration().GetAwaiter().GetResult(); + return GetBaseConfigurationAsync().GetAwaiter().GetResult(); + } + + + public async Task GetBaseConfigurationAsync() + { + _logger.LogTrace("{method}()", nameof(GetBaseConfiguration)); + var jsonFileContent = await BaseConfigurationJsonFileContent(); + + var dtoBaseConfiguration = JsonConvert.DeserializeObject(jsonFileContent); + + if (dtoBaseConfiguration == null) + { + throw new ArgumentException($"Could not deserialize {jsonFileContent} to {nameof(DtoBaseConfiguration)}"); + } + + return dtoBaseConfiguration; + } + + private async Task BaseConfigurationJsonFileContent() + { + var cache = MemoryCache.Default; + var jsonFileContent = cache[_baseConfigurationMemoryCacheName] as string; + if (jsonFileContent == null) + { + var filePath = BaseConfigFileFullName(); + var cacheItemPolicy = new CacheItemPolicy(); + var filePathList = new List() + { + filePath, + }; + + cacheItemPolicy.ChangeMonitors.Add(new HostFileChangeMonitor(filePathList)); + + if (File.Exists(filePath)) + { + jsonFileContent = await File.ReadAllTextAsync(filePath).ConfigureAwait(false); + + cache.Set(_baseConfigurationMemoryCacheName, jsonFileContent, cacheItemPolicy); + } + } + + return jsonFileContent; + } + + public async Task SaveBaseConfiguration(DtoBaseConfiguration baseConfiguration) + { + var baseConfigurationBase = (BaseConfigurationBase)baseConfiguration; + var baseConfigurationJson = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(baseConfigurationBase)); + //if (false) + //{ + // baseConfigurationJson.LastEditDateTime = DateTime.UtcNow; + //} + var jsonFileContent = JsonConvert.SerializeObject(baseConfigurationJson); + + var configFileLocation = BaseConfigFileFullName(); + var fileInfo = new FileInfo(configFileLocation); + var configDirectoryFullName = fileInfo.Directory?.FullName; + if (!Directory.Exists(configDirectoryFullName)) + { + _logger.LogDebug("Config directory {directoryname} does not exist.", configDirectoryFullName); + Directory.CreateDirectory(configDirectoryFullName ?? throw new InvalidOperationException()); + } + + await File.WriteAllTextAsync(configFileLocation, jsonFileContent); + } + + public async Task IsBaseConfigurationJsonRelevant() + { + var jsonContent = await BaseConfigurationJsonFileContent().ConfigureAwait(false); + if (jsonContent == null) + { + return false; + } + var baseConfigurationJson = JsonConvert.DeserializeObject(jsonContent); + return baseConfigurationJson?.LastEditDateTime != null; } } \ No newline at end of file From 0f9a5e92f795a42d05993336e56578a86ad53114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Mon, 18 Jul 2022 22:48:37 +0200 Subject: [PATCH 18/30] fix(Program): Convert config values before accessing configuration --- TeslaSolarCharger/Server/Program.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TeslaSolarCharger/Server/Program.cs b/TeslaSolarCharger/Server/Program.cs index 9a32284bc..b41704ea8 100644 --- a/TeslaSolarCharger/Server/Program.cs +++ b/TeslaSolarCharger/Server/Program.cs @@ -84,6 +84,9 @@ var app = builder.Build(); +var environmentVariableConverter = app.Services.GetRequiredService(); +await environmentVariableConverter.ConvertAllValues(); + var telegramService = app.Services.GetRequiredService(); await telegramService.SendMessage("Application starting up"); @@ -95,9 +98,6 @@ await mqttHelper.ConfigureMqttClient().ConfigureAwait(false); -var environmentVariableConverter = app.Services.GetRequiredService(); -await environmentVariableConverter.ConvertAllValues(); - var jobManager = app.Services.GetRequiredService(); jobManager.StartJobs(); From a5a8908f4b44030c7c4f975cd19b94294b768462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Tue, 19 Jul 2022 00:51:34 +0200 Subject: [PATCH 19/30] fix(ChargingService): Do use actual current for calculating amps to set if not charging --- TeslaSolarCharger/Server/Services/ChargingService.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/TeslaSolarCharger/Server/Services/ChargingService.cs b/TeslaSolarCharger/Server/Services/ChargingService.cs index 91b9c7a43..e88baa919 100644 --- a/TeslaSolarCharger/Server/Services/ChargingService.cs +++ b/TeslaSolarCharger/Server/Services/ChargingService.cs @@ -178,6 +178,12 @@ private async Task ChangeCarAmp(Car car, int ampToChange) _logger.LogDebug("Set amp to change to {ampToChange} as car does not use full request.", ampToChange); } var finalAmpsToSet = (car.CarState.ChargerRequestedCurrent ?? 0) + ampToChange; + + if (car.CarState.ChargerActualCurrent == 0) + { + finalAmpsToSet = (int)(car.CarState.ChargerActualCurrent + ampToChange); + } + _logger.LogDebug("Amps to set: {amps}", finalAmpsToSet); var ampChange = 0; var minAmpPerCar = car.CarConfiguration.MinimumAmpere; From 18905ebb64d386d2dc8fca8cd6fe0cbf77e3569f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Tue, 19 Jul 2022 01:05:57 +0200 Subject: [PATCH 20/30] fix(ConfigJsonService): Set Minimum Ampere to 1 if set lower as 1 --- TeslaSolarCharger/Server/Services/ConfigJsonService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TeslaSolarCharger/Server/Services/ConfigJsonService.cs b/TeslaSolarCharger/Server/Services/ConfigJsonService.cs index 5323b3519..d96009040 100644 --- a/TeslaSolarCharger/Server/Services/ConfigJsonService.cs +++ b/TeslaSolarCharger/Server/Services/ConfigJsonService.cs @@ -164,7 +164,7 @@ public async Task AddCarIdsToSettings() car.CarConfiguration.MaximumAmpere = 16; } - if (car.CarConfiguration.MinimumAmpere < 16) + if (car.CarConfiguration.MinimumAmpere < 1) { car.CarConfiguration.MinimumAmpere = 1; } From 0faec7bd3534afee2901831f0fa94881420600cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Mon, 18 Jul 2022 23:32:43 +0200 Subject: [PATCH 21/30] feat(UI): Add Base Configuration page --- TeslaSolarCharger/Client/Shared/NavMenu.razor | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/TeslaSolarCharger/Client/Shared/NavMenu.razor b/TeslaSolarCharger/Client/Shared/NavMenu.razor index b6bfc3b3e..1e55d2f08 100644 --- a/TeslaSolarCharger/Client/Shared/NavMenu.razor +++ b/TeslaSolarCharger/Client/Shared/NavMenu.razor @@ -19,6 +19,11 @@ Car Settings
+
+ + Base Configuration + +
From 1f82c7d8c1b03a1dbf0d3a885e851df1dc2d7c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Tue, 19 Jul 2022 02:01:05 +0200 Subject: [PATCH 22/30] feat(UI) allow saving baseConfiguration --- .../Client/Pages/BaseConfiguration.razor | 13 +++++++++-- .../BaseConfigurationController.cs | 4 ++++ .../Shared/Contracts/IConfigurationWrapper.cs | 1 + .../Shared/Wrappers/ConfigurationWrapper.cs | 23 +++++++++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor index 9fcc19487..af333e38f 100644 --- a/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor +++ b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor @@ -2,6 +2,7 @@ @using TeslaSolarCharger.Shared.Dtos.BaseConfiguration @using System.Runtime.InteropServices @inject HttpClient HttpClient +@inject IToastService ToastService Base Configuration @@ -152,8 +153,16 @@ else { _dtoBaseConfiguration = await HttpClient.GetFromJsonAsync("/api/BaseConfiguration/GetBaseConfiguration"); } - private void HandleValidSubmit() + private async Task HandleValidSubmit() { - // Process the valid form + var result = await HttpClient.PutAsJsonAsync($"api/BaseConfiguration/UpdateBaseConfiguration", _dtoBaseConfiguration); + if (result.IsSuccessStatusCode) + { + ToastService.ShowSuccess("Car Configuration updated"); + } + else + { + ToastService.ShowError("Error updating car configuration"); + } } } diff --git a/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs b/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs index 8a3d4052c..48ae52828 100644 --- a/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs +++ b/TeslaSolarCharger/Server/Controllers/BaseConfigurationController.cs @@ -18,5 +18,9 @@ public BaseConfigurationController(IConfigurationWrapper configurationWrapper) [HttpGet] public Task GetBaseConfiguration() => _configurationWrapper.GetBaseConfigurationAsync(); + + [HttpPut] + public void UpdateBaseConfiguration([FromBody] DtoBaseConfiguration baseConfiguration) => + _configurationWrapper.UpdateBaseConfigurationAsync(baseConfiguration); } } diff --git a/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs index 8c8372853..21471f7d7 100644 --- a/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs @@ -40,4 +40,5 @@ public interface IConfigurationWrapper Task GetBaseConfigurationAsync(); Task SaveBaseConfiguration(DtoBaseConfiguration baseConfiguration); Task IsBaseConfigurationJsonRelevant(); + Task UpdateBaseConfigurationAsync(DtoBaseConfiguration dtoBaseConfiguration); } \ No newline at end of file diff --git a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs index d40143056..1e1609fda 100644 --- a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs @@ -336,7 +336,14 @@ public async Task SaveBaseConfiguration(DtoBaseConfiguration baseConfiguration) Directory.CreateDirectory(configDirectoryFullName ?? throw new InvalidOperationException()); } + await UpdateJsonFile(configFileLocation, jsonFileContent).ConfigureAwait(false); + } + + private async Task UpdateJsonFile(string configFileLocation, string jsonFileContent) + { await File.WriteAllTextAsync(configFileLocation, jsonFileContent); + var cache = MemoryCache.Default; + cache.Remove(_baseConfigurationMemoryCacheName, CacheEntryRemovedReason.ChangeMonitorChanged); } public async Task IsBaseConfigurationJsonRelevant() @@ -349,4 +356,20 @@ public async Task IsBaseConfigurationJsonRelevant() var baseConfigurationJson = JsonConvert.DeserializeObject(jsonContent); return baseConfigurationJson?.LastEditDateTime != null; } + + public async Task UpdateBaseConfigurationAsync(DtoBaseConfiguration dtoBaseConfiguration) + { + var baseConfigurationBase = (BaseConfigurationBase)dtoBaseConfiguration; + var baseConfigurationJson = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(baseConfigurationBase)); + + if (baseConfigurationJson == null) + { + throw new InvalidOperationException("Could not deserialize dtoBaseConfiguration to baseconfigurationJson"); + } + baseConfigurationJson.LastEditDateTime = DateTime.UtcNow; + + var baseConfigurationJsonString = JsonConvert.SerializeObject(baseConfigurationJson); + + await UpdateJsonFile(BaseConfigFileFullName(), baseConfigurationJsonString).ConfigureAwait(false); + } } \ No newline at end of file From 2fd66abc3458a917f7e08cab858aa98aca8e9daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Tue, 19 Jul 2022 11:55:30 +0200 Subject: [PATCH 23/30] feat(GridService): Handle whitespace as null on patterns --- .../Services/Server/GridService.cs | 13 ++++ .../Server/Services/GridService.cs | 66 ++++++++++++++----- 2 files changed, 61 insertions(+), 18 deletions(-) diff --git a/TeslaSolarCharger.Tests/Services/Server/GridService.cs b/TeslaSolarCharger.Tests/Services/Server/GridService.cs index a916d6d1c..64611286a 100644 --- a/TeslaSolarCharger.Tests/Services/Server/GridService.cs +++ b/TeslaSolarCharger.Tests/Services/Server/GridService.cs @@ -107,4 +107,17 @@ public void Can_Get_Integer_From_Xml_Node_Result(string text) Assert.Equal(384, intValue); } + [Theory] + [InlineData(null, null)] + [InlineData("", null)] + [InlineData(" ", null)] + [InlineData(null, "")] + [InlineData(null, " ")] + public void Decides_Correct_Note_Pattern_Type_None(string jsonPattern, string xmlPattern) + { + var gridService = Mock.Create(); + var nodePatternType = gridService.DecideNotePatternType(jsonPattern, xmlPattern); + + Assert.Equal(NodePatternType.None, nodePatternType); + } } \ No newline at end of file diff --git a/TeslaSolarCharger/Server/Services/GridService.cs b/TeslaSolarCharger/Server/Services/GridService.cs index 2038f23b3..31f6e206b 100644 --- a/TeslaSolarCharger/Server/Services/GridService.cs +++ b/TeslaSolarCharger/Server/Services/GridService.cs @@ -1,6 +1,7 @@ using System.Globalization; using System.Xml; using Newtonsoft.Json.Linq; +using Quartz.Util; using TeslaSolarCharger.Server.Contracts; using TeslaSolarCharger.Server.Enums; using TeslaSolarCharger.Shared.Contracts; @@ -23,18 +24,10 @@ public GridService(ILogger logger, ITelegramService telegramService public async Task GetCurrentOverage() { _logger.LogTrace("{method}()", nameof(GetCurrentOverage)); - using var httpClient = new HttpClient(); - var requestUri = _configurationWrapper.CurrentPowerToGridUrl(); - _logger.LogDebug("Using {uri} to get current overage.", requestUri); - var response = await httpClient.GetAsync( - requestUri) - .ConfigureAwait(false); - if (!response.IsSuccessStatusCode) + var response = await GetCurrentOverageHtmlResponse().ConfigureAwait(false); + if (response == null) { - _logger.LogError("Could not get current overage. {statusCode}, {reasonPhrase}", response.StatusCode, response.ReasonPhrase); - await _telegramService.SendMessage( - $"Getting current grid power did result in statuscode {response.StatusCode} with reason {response.ReasonPhrase}"); return null; } @@ -43,30 +36,67 @@ await _telegramService.SendMessage( var pattern = ""; var jsonPattern = _configurationWrapper.CurrentPowerToGridJsonPattern(); var xmlPattern = _configurationWrapper.CurrentPowerToGridXmlPattern(); + var nodePatternType = DecideNotePatternType(jsonPattern, xmlPattern); + + if (nodePatternType == NodePatternType.Json) + { + pattern = jsonPattern; + } + else if (nodePatternType == NodePatternType.Xml) + { + pattern = xmlPattern; + } + + var overage = GetValueFromResult(pattern, result, nodePatternType, true); + if (_configurationWrapper.CurrentPowerToGridInvertValue()) + { + overage = -overage; + } + + return overage; + } + + internal NodePatternType DecideNotePatternType(string? jsonPattern, string? xmlPattern) + { + _logger.LogTrace("{method}({param1}, {param2})", nameof(DecideNotePatternType), jsonPattern, xmlPattern); NodePatternType nodePatternType; - if (jsonPattern != null) + if (!jsonPattern.IsNullOrWhiteSpace()) { nodePatternType = NodePatternType.Json; - pattern = jsonPattern; } - else if (xmlPattern != null) + else if (!xmlPattern.IsNullOrWhiteSpace()) { nodePatternType = NodePatternType.Xml; - pattern = xmlPattern; } else { nodePatternType = NodePatternType.None; } + _logger.LogDebug("Node pattern type is {nodePatternType}", nodePatternType); + return nodePatternType; + } - var overage = GetValueFromResult(pattern, result, nodePatternType, true); - if (_configurationWrapper.CurrentPowerToGridInvertValue()) + private async Task GetCurrentOverageHtmlResponse() + { + using var httpClient = new HttpClient(); + var requestUri = _configurationWrapper.CurrentPowerToGridUrl(); + _logger.LogDebug("Using {uri} to get current overage.", requestUri); + var response = await httpClient.GetAsync( + requestUri) + .ConfigureAwait(false); + + if (!response.IsSuccessStatusCode) { - overage = -overage; + _logger.LogError("Could not get current overage. {statusCode}, {reasonPhrase}", response.StatusCode, + response.ReasonPhrase); + await _telegramService.SendMessage( + $"Getting current grid power did result in statuscode {response.StatusCode} with reason {response.ReasonPhrase}"); + return null; } - return overage; + return response; } + public async Task GetCurrentInverterPower() { _logger.LogTrace("{method}()", nameof(GetCurrentInverterPower)); From f045273991041efaef64a06b2b0cd93b9a116408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Tue, 19 Jul 2022 11:59:48 +0200 Subject: [PATCH 24/30] feat(tests): add tests to decide for json and yml pattern --- .../Services/Server/GridService.cs | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/TeslaSolarCharger.Tests/Services/Server/GridService.cs b/TeslaSolarCharger.Tests/Services/Server/GridService.cs index 64611286a..ee1a6f027 100644 --- a/TeslaSolarCharger.Tests/Services/Server/GridService.cs +++ b/TeslaSolarCharger.Tests/Services/Server/GridService.cs @@ -120,4 +120,28 @@ public void Decides_Correct_Note_Pattern_Type_None(string jsonPattern, string xm Assert.Equal(NodePatternType.None, nodePatternType); } + + [Theory] + [InlineData("$.data.overage", null)] + [InlineData("$.data.overage", "")] + [InlineData("$.data.overage", " ")] + public void Decides_Correct_Note_Pattern_Type_Json(string jsonPattern, string xmlPattern) + { + var gridService = Mock.Create(); + var nodePatternType = gridService.DecideNotePatternType(jsonPattern, xmlPattern); + + Assert.Equal(NodePatternType.Json, nodePatternType); + } + + [Theory] + [InlineData(null, "Device/Measurements/Measurement")] + [InlineData("", "Device/Measurements/Measurement")] + [InlineData(" ", "Device/Measurements/Measurement")] + public void Decides_Correct_Note_Pattern_Type_Xml(string jsonPattern, string xmlPattern) + { + var gridService = Mock.Create(); + var nodePatternType = gridService.DecideNotePatternType(jsonPattern, xmlPattern); + + Assert.Equal(NodePatternType.Xml, nodePatternType); + } } \ No newline at end of file From ed306262359487f902262085dbd3870291b7ba64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Tue, 19 Jul 2022 12:02:36 +0200 Subject: [PATCH 25/30] feat(GridService): Use NodeDecidePatternType for invertervalues as well --- TeslaSolarCharger/Server/Services/GridService.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/TeslaSolarCharger/Server/Services/GridService.cs b/TeslaSolarCharger/Server/Services/GridService.cs index 31f6e206b..f3f55557a 100644 --- a/TeslaSolarCharger/Server/Services/GridService.cs +++ b/TeslaSolarCharger/Server/Services/GridService.cs @@ -122,21 +122,16 @@ await _telegramService.SendMessage( var pattern = ""; var jsonPattern = _configurationWrapper.CurrentInverterPowerJsonPattern(); var xmlPattern = _configurationWrapper.CurrentInverterPowerXmlPattern(); - NodePatternType nodePatternType; - if (jsonPattern != null) + var nodePatternType = DecideNotePatternType(jsonPattern, xmlPattern); + + if (nodePatternType == NodePatternType.Json) { - nodePatternType = NodePatternType.Json; pattern = jsonPattern; } - else if (xmlPattern != null) + else if (nodePatternType == NodePatternType.Xml) { - nodePatternType = NodePatternType.Xml; pattern = xmlPattern; } - else - { - nodePatternType = NodePatternType.None; - } return GetValueFromResult(pattern, result, nodePatternType, false); } From c078cbe6e2b385c21c378853eb024e3a5325dc69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Tue, 19 Jul 2022 20:34:44 +0200 Subject: [PATCH 26/30] fix(CarState): Use Average of requested and actual current for calculating power --- TeslaSolarCharger/Shared/Dtos/Settings/CarState.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/TeslaSolarCharger/Shared/Dtos/Settings/CarState.cs b/TeslaSolarCharger/Shared/Dtos/Settings/CarState.cs index f30e4831a..f8ea5457b 100644 --- a/TeslaSolarCharger/Shared/Dtos/Settings/CarState.cs +++ b/TeslaSolarCharger/Shared/Dtos/Settings/CarState.cs @@ -29,7 +29,17 @@ public int? ChargingPower { get { - var power = ChargerActualCurrent * ChargerVoltage * ActualPhases; + float? currentToUse; + //Next lines because of wrong actual current on currents below 5A + if (ChargerRequestedCurrent < 5 && ChargerActualCurrent == ChargerRequestedCurrent + 1) + { + currentToUse = (float?)(ChargerActualCurrent + ChargerRequestedCurrent) / 2; + } + else + { + currentToUse = ChargerActualCurrent; + } + var power = (int?)(currentToUse * ChargerVoltage * ActualPhases); return power; } } From 2bb302d10d0b9f40c3d78734b6099d148cfc8411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Tue, 19 Jul 2022 21:03:08 +0200 Subject: [PATCH 27/30] fix(UI): Update toast message on base configuration update --- TeslaSolarCharger/Client/Pages/BaseConfiguration.razor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor index af333e38f..310d37143 100644 --- a/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor +++ b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor @@ -158,11 +158,11 @@ else var result = await HttpClient.PutAsJsonAsync($"api/BaseConfiguration/UpdateBaseConfiguration", _dtoBaseConfiguration); if (result.IsSuccessStatusCode) { - ToastService.ShowSuccess("Car Configuration updated"); + ToastService.ShowSuccess("Base Configuration updated"); } else { - ToastService.ShowError("Error updating car configuration"); + ToastService.ShowError("Error updating base configuration"); } } } From 05cb8fd6f1dff0028f43128e17153fdf88494a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Tue, 19 Jul 2022 21:07:28 +0200 Subject: [PATCH 28/30] fix(Charging Service): charging not starting due to requested amp > actual amp --- TeslaSolarCharger/Server/Services/ChargingService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TeslaSolarCharger/Server/Services/ChargingService.cs b/TeslaSolarCharger/Server/Services/ChargingService.cs index e88baa919..9160ab5d5 100644 --- a/TeslaSolarCharger/Server/Services/ChargingService.cs +++ b/TeslaSolarCharger/Server/Services/ChargingService.cs @@ -172,7 +172,7 @@ private async Task ChangeCarAmp(Car car, int ampToChange) { _logger.LogTrace("{method}({param1}, {param2})", nameof(ChangeCarAmp), car.CarState.Name, ampToChange); //This might happen if only climate is running or car nearly full which means full power is not needed. - if (ampToChange > 0 && car.CarState.ChargerRequestedCurrent > car.CarState.ChargerActualCurrent) + if (ampToChange > 0 && car.CarState.ChargerRequestedCurrent > car.CarState.ChargerActualCurrent && car.CarState.ChargerActualCurrent > 0) { ampToChange = 0; _logger.LogDebug("Set amp to change to {ampToChange} as car does not use full request.", ampToChange); From 4b935fe6c93a49c7a4918b94a04c14e3627ab933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Tue, 19 Jul 2022 23:24:21 +0200 Subject: [PATCH 29/30] fix(ChargingService): Check Switch off and Switch on time span on every cycle --- .../Services/Server/ConfigJsonService.cs | 4 ++-- TeslaSolarCharger/Client/Pages/Index.razor | 4 ++-- .../Server/Services/ChargingService.cs | 24 +++++++++---------- .../Server/Services/ConfigJsonService.cs | 8 +++---- .../Shared/Contracts/IConfigurationWrapper.cs | 2 +- .../Shared/Dtos/Settings/CarState.cs | 4 ++-- .../Shared/Wrappers/ConfigurationWrapper.cs | 2 +- 7 files changed, 23 insertions(+), 25 deletions(-) diff --git a/TeslaSolarCharger.Tests/Services/Server/ConfigJsonService.cs b/TeslaSolarCharger.Tests/Services/Server/ConfigJsonService.cs index 026352add..c61d3b4b3 100644 --- a/TeslaSolarCharger.Tests/Services/Server/ConfigJsonService.cs +++ b/TeslaSolarCharger.Tests/Services/Server/ConfigJsonService.cs @@ -43,8 +43,8 @@ public void Sets_correct_default_values_on_new_cars() Assert.Equal(16, car.CarConfiguration.MaximumAmpere); Assert.Equal(2, car.CarConfiguration.MinimumAmpere); Assert.Equal(75, car.CarConfiguration.UsableEnergy); - Assert.Equal(DateTime.MaxValue, car.CarState.ShouldStartChargingSince); - Assert.Equal(DateTime.MaxValue, car.CarState.ShouldStopChargingSince); + Assert.Null(car.CarState.ShouldStartChargingSince); + Assert.Null(car.CarState.ShouldStopChargingSince); } } diff --git a/TeslaSolarCharger/Client/Pages/Index.razor b/TeslaSolarCharger/Client/Pages/Index.razor index 61cf186ed..9224a520a 100644 --- a/TeslaSolarCharger/Client/Pages/Index.razor +++ b/TeslaSolarCharger/Client/Pages/Index.razor @@ -194,7 +194,7 @@ else - Charge start at + Should start charging since @car.CarState.ShouldStartChargingSince @@ -202,7 +202,7 @@ else - Charge end at + Should stop charging since @car.CarState.ShouldStopChargingSince diff --git a/TeslaSolarCharger/Server/Services/ChargingService.cs b/TeslaSolarCharger/Server/Services/ChargingService.cs index 9160ab5d5..8847f62bc 100644 --- a/TeslaSolarCharger/Server/Services/ChargingService.cs +++ b/TeslaSolarCharger/Server/Services/ChargingService.cs @@ -279,7 +279,7 @@ private async Task ChangeCarAmp(Car car, int ampToChange) if (earliestSwitchOn <= DateTime.Now) { - _logger.LogDebug("Charging should start"); + _logger.LogDebug("Charging is starting"); var startAmp = finalAmpsToSet > maxAmpPerCar ? maxAmpPerCar : finalAmpsToSet; await _teslaService.StartCharging(car.Id, startAmp, car.CarState.State).ConfigureAwait(false); ampChange += startAmp; @@ -354,35 +354,33 @@ private void UpdateEarliestTimesAfterSwitch(int carId) { _logger.LogTrace("{method}({param1})", nameof(UpdateEarliestTimesAfterSwitch), carId); var car = _settings.Cars.First(c => c.Id == carId); - car.CarState.ShouldStopChargingSince = DateTime.MaxValue; - car.CarState.ShouldStartChargingSince = DateTime.MaxValue; + car.CarState.ShouldStopChargingSince = null; + car.CarState.ShouldStartChargingSince = null; } - private DateTime EarliestSwitchOff(int carId) + private DateTime? EarliestSwitchOff(int carId) { _logger.LogTrace("{method}({param1})", nameof(EarliestSwitchOff), carId); - var timeSpanUntilSwitchOff = _configurationWrapper.TimespanUntilSwitchOff(); var car = _settings.Cars.First(c => c.Id == carId); - if (car.CarState.ShouldStopChargingSince == DateTime.MaxValue) + if (car.CarState.ShouldStopChargingSince == null) { - car.CarState.ShouldStopChargingSince = DateTime.Now + timeSpanUntilSwitchOff; + car.CarState.ShouldStopChargingSince = DateTime.Now; } - var earliestSwitchOff = car.CarState.ShouldStopChargingSince; + var earliestSwitchOff = car.CarState.ShouldStopChargingSince + _configurationWrapper.TimespanUntilSwitchOff(); return earliestSwitchOff; } - private DateTime EarliestSwitchOn(int carId) + private DateTime? EarliestSwitchOn(int carId) { _logger.LogTrace("{method}({param1})", nameof(EarliestSwitchOn), carId); - var timeSpanUntilSwitchOn = _configurationWrapper.TimeUntilSwitchOn(); var car = _settings.Cars.First(c => c.Id == carId); - if (car.CarState.ShouldStartChargingSince == DateTime.MaxValue) + if (car.CarState.ShouldStartChargingSince == null) { - car.CarState.ShouldStartChargingSince = DateTime.Now + timeSpanUntilSwitchOn; + car.CarState.ShouldStartChargingSince = DateTime.Now; } - var earliestSwitchOn = car.CarState.ShouldStartChargingSince; + var earliestSwitchOn = car.CarState.ShouldStartChargingSince + _configurationWrapper.TimespanUntilSwitchOn(); return earliestSwitchOn; } } \ No newline at end of file diff --git a/TeslaSolarCharger/Server/Services/ConfigJsonService.cs b/TeslaSolarCharger/Server/Services/ConfigJsonService.cs index d96009040..754de348a 100644 --- a/TeslaSolarCharger/Server/Services/ConfigJsonService.cs +++ b/TeslaSolarCharger/Server/Services/ConfigJsonService.cs @@ -62,8 +62,8 @@ internal List DeserializeCarsFromConfigurationString(string fileContent) var cars = JsonConvert.DeserializeObject>(fileContent) ?? throw new InvalidOperationException("Could not deserialize file content"); foreach (var car in cars) { - car.CarState.ShouldStopChargingSince = DateTime.MaxValue; - car.CarState.ShouldStartChargingSince = DateTime.MaxValue; + car.CarState.ShouldStopChargingSince = null; + car.CarState.ShouldStartChargingSince = null; var minDate = new DateTime(2022, 1, 1); if (car.CarConfiguration.LatestTimeToReachSoC < minDate) @@ -102,8 +102,8 @@ internal void AddNewCars(List newCarIds, List cars) }, CarState = { - ShouldStartChargingSince = DateTime.MaxValue, - ShouldStopChargingSince = DateTime.MaxValue, + ShouldStartChargingSince = null, + ShouldStopChargingSince = null, }, }; cars.Add(car); diff --git a/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs index 21471f7d7..545c23ed2 100644 --- a/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs @@ -16,7 +16,7 @@ public interface IConfigurationWrapper string TeslaMateApiBaseUrl(); List CarPriorities(); string GeoFence(); - TimeSpan TimeUntilSwitchOn(); + TimeSpan TimespanUntilSwitchOn(); TimeSpan TimespanUntilSwitchOff(); int PowerBuffer(); string? TelegramBotKey(); diff --git a/TeslaSolarCharger/Shared/Dtos/Settings/CarState.cs b/TeslaSolarCharger/Shared/Dtos/Settings/CarState.cs index f8ea5457b..3d692d7a5 100644 --- a/TeslaSolarCharger/Shared/Dtos/Settings/CarState.cs +++ b/TeslaSolarCharger/Shared/Dtos/Settings/CarState.cs @@ -5,8 +5,8 @@ namespace TeslaSolarCharger.Shared.Dtos.Settings; public class CarState { public string? Name { get; set; } - public DateTime ShouldStartChargingSince { get; set; } - public DateTime ShouldStopChargingSince { get; set; } + public DateTime? ShouldStartChargingSince { get; set; } + public DateTime? ShouldStopChargingSince { get; set; } public int? SoC { get; set; } public int? SocLimit { get; set; } public string? Geofence { get; set; } diff --git a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs index 1e1609fda..d905a9bf4 100644 --- a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs @@ -193,7 +193,7 @@ public string GeoFence() return GetBaseConfiguration().GeoFence; } - public TimeSpan TimeUntilSwitchOn() + public TimeSpan TimespanUntilSwitchOn() { var rawValue = GetBaseConfiguration().MinutesUntilSwitchOn; var timeSpan = TimeSpan.FromMinutes(rawValue); From b9d6e66bf1efdc60bd996d8b2e2b8a20c050c015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20K=C3=BChnel?= Date: Tue, 19 Jul 2022 23:40:11 +0200 Subject: [PATCH 30/30] feat(ChargingService): Log SwitchOn and off times --- TeslaSolarCharger/Server/Services/ChargingService.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/TeslaSolarCharger/Server/Services/ChargingService.cs b/TeslaSolarCharger/Server/Services/ChargingService.cs index 8847f62bc..658f2f270 100644 --- a/TeslaSolarCharger/Server/Services/ChargingService.cs +++ b/TeslaSolarCharger/Server/Services/ChargingService.cs @@ -367,7 +367,11 @@ private void UpdateEarliestTimesAfterSwitch(int carId) car.CarState.ShouldStopChargingSince = DateTime.Now; } - var earliestSwitchOff = car.CarState.ShouldStopChargingSince + _configurationWrapper.TimespanUntilSwitchOff(); + var timespanUntilSwitchOff = _configurationWrapper.TimespanUntilSwitchOff(); + var earliestSwitchOff = car.CarState.ShouldStopChargingSince + timespanUntilSwitchOff; + _logger.LogDebug("Should start charging since: {shoudStopChargingSince}", car.CarState.ShouldStopChargingSince); + _logger.LogDebug("Timespan until switch on: {timespanUntilSwitchOff}", timespanUntilSwitchOff); + _logger.LogDebug("Earliest switch off: {earliestSwitchOn}", earliestSwitchOff); return earliestSwitchOff; } @@ -380,7 +384,11 @@ private void UpdateEarliestTimesAfterSwitch(int carId) car.CarState.ShouldStartChargingSince = DateTime.Now; } - var earliestSwitchOn = car.CarState.ShouldStartChargingSince + _configurationWrapper.TimespanUntilSwitchOn(); + var timespanUntilSwitchOn = _configurationWrapper.TimespanUntilSwitchOn(); + var earliestSwitchOn = car.CarState.ShouldStartChargingSince + timespanUntilSwitchOn; + _logger.LogDebug("Should start charging since: {shoudStartChargingSince}", car.CarState.ShouldStartChargingSince); + _logger.LogDebug("Timespan until switch on: {timespanUntilSwitchOn}", timespanUntilSwitchOn); + _logger.LogDebug("Earliest switch on: {earliestSwitchOn}", earliestSwitchOn); return earliestSwitchOn; } } \ No newline at end of file