feat(chore): decide if to use beta endpoints based on version number

pkuehnel · Feb 8, 2025 · 7f2148e · 7f2148e
1 parent d580010
commit 7f2148e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/TeslaSolarCharger/Server/Program.cs b/TeslaSolarCharger/Server/Program.cs
@@ -163,12 +163,14 @@ async Task DoStartupStuff(WebApplication webApplication, ILogger<Program> logger
             }
         }
 
-
-
         var tscConfigurationService = webApplication.Services.GetRequiredService<ITscConfigurationService>();
         var installationId = await tscConfigurationService.GetInstallationId().ConfigureAwait(false);
         var backendApiService = webApplication.Services.GetRequiredService<IBackendApiService>();
         var version = await backendApiService.GetCurrentVersion().ConfigureAwait(false);
+        if (version != default && version.Contains('-'))
+        {
+            settings.IsPreRelease = true;
+        }
         LogContext.PushProperty("InstallationId", installationId);
         LogContext.PushProperty("Version", version);
 

diff --git a/TeslaSolarCharger/Server/appsettings.Development.json b/TeslaSolarCharger/Server/appsettings.Development.json
@@ -5,7 +5,6 @@
   "ShouldUseFakeSolarValues": true,
   "IgnoreSslErrors": true,
   "BleBaseUrl": "http://raspible:7210/",
-  "UseBetaEndpoints": true,
   "GridPriceProvider": {
     "EnergyProvider": "Tibber",
     "Octopus": {

diff --git a/TeslaSolarCharger/Server/appsettings.json b/TeslaSolarCharger/Server/appsettings.json
@@ -40,7 +40,6 @@
   "FleetTelemetryApiUrl": "wss://api.fleet-telemetry.solar4car.com/ws?",
   "BetaFleetTelemetryApiUrl": "wss://beta.api.fleet-telemetry.solar4car.com/ws?",
   "BackendPasswordDefaultLength": 25,
-  "UseBetaEndpoints": false,
   "GridPriceProvider": {
     "EnergyProvider": "FixedPrice",
     "Octopus": {

diff --git a/TeslaSolarCharger/Shared/Dtos/Contracts/ISettings.cs b/TeslaSolarCharger/Shared/Dtos/Contracts/ISettings.cs
@@ -25,4 +25,5 @@ public interface ISettings
     string? ChargePricesUpdateText { get; set; }
     DateTime StartupTime { get; set; }
     int LastPvDemoCase { get; set; }
+    bool IsPreRelease { get; set; }
 }
diff --git a/TeslaSolarCharger/Shared/Dtos/Settings/Settings.cs b/TeslaSolarCharger/Shared/Dtos/Settings/Settings.cs
@@ -34,4 +34,6 @@ public class Settings : ISettings
 
     public string? ChargePricesUpdateText { get; set; }
     public int LastPvDemoCase { get; set; }
+
+    public bool IsPreRelease { get; set; }
 }
diff --git a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs
@@ -4,6 +4,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using System.Configuration;
 using TeslaSolarCharger.Shared.Contracts;
 using TeslaSolarCharger.Shared.Dtos.BaseConfiguration;
 using TeslaSolarCharger.Shared.Dtos.Contracts;
@@ -209,9 +210,9 @@ public bool SendTeslaApiStatsToBackend()
     public string BackendApiBaseUrl()
     {
         var environmentVariableName = "BackendApiBaseUrl";
-        var useBetaEndpoints = configuration.GetValue<bool>("UseBetaEndpoints");
-        if (useBetaEndpoints)
+        if (settings.IsPreRelease)
         {
+            logger.LogInformation("Use beta endpoints as is prerelease");
             environmentVariableName = "Beta" + environmentVariableName;
         }
         var value = configuration.GetValue<string>(environmentVariableName);
@@ -221,9 +222,9 @@ public string BackendApiBaseUrl()
     public string FleetTelemetryApiUrl()
     {
         var environmentVariableName = "FleetTelemetryApiUrl";
-        var useBetaEndpoints = configuration.GetValue<bool>("UseBetaEndpoints");
-        if (useBetaEndpoints)
+        if (settings.IsPreRelease)
         {
+            logger.LogInformation("Use beta endpoints as is prerelease");
             environmentVariableName = "Beta" + environmentVariableName;
         }
         var value = configuration.GetValue<string>(environmentVariableName);