Merge pull request #1568 from pkuehnel/develop

Develop
pkuehnel · Oct 26, 2024 · 87db477 · 87db477
2 parents 30f9386 + 5f44a70
commit 87db477
Show file tree

Hide file tree

Showing 46 changed files with 5,293 additions and 19 deletions.
diff --git a/Plugins.Modbus/Plugins.Modbus.csproj b/Plugins.Modbus/Plugins.Modbus.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="FluentModbus" Version="5.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />

diff --git a/Plugins.SmaEnergymeter/Plugins.SmaEnergymeter.csproj b/Plugins.SmaEnergymeter/Plugins.SmaEnergymeter.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" />
     <PackageReference Include="Quartz" Version="3.13.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
   </ItemGroup>

diff --git a/Plugins.SolarEdge/Plugins.SolarEdge.csproj b/Plugins.SolarEdge/Plugins.SolarEdge.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />

diff --git a/Plugins.Solax/Plugins.Solax.csproj b/Plugins.Solax/Plugins.Solax.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />

diff --git a/TeslaSolarCharger.Model/Contracts/ITeslaSolarChargerContext.cs b/TeslaSolarCharger.Model/Contracts/ITeslaSolarChargerContext.cs
@@ -29,5 +29,6 @@ public interface ITeslaSolarChargerContext
     DbSet<MqttResultConfiguration> MqttResultConfigurations { get; set; }
     DbSet<BackendNotification> BackendNotifications { get; set; }
     DbSet<LoggedError> LoggedErrors { get; set; }
+    DbSet<CarValueLog> CarValueLogs { get; set; }
     void RejectChanges();
 }
diff --git a/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/Car.cs b/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/Car.cs
@@ -49,6 +49,7 @@ public class Car
     public bool UseBleForWakeUp { get; set; }
     public int ApiRefreshIntervalSeconds { get; set; }
     public string? BleApiBaseUrl { get; set; }
+    public bool UseFleetTelemetry { get; set; }
 
     public string? WakeUpCalls { get; set; }
     public string? VehicleDataCalls { get; set; }
@@ -59,4 +60,5 @@ public class Car
     public string? OtherCommandCalls { get; set; }
 
     public List<ChargingProcess> ChargingProcesses { get; set; } = new List<ChargingProcess>();
+    public List<CarValueLog> CarValueLogs { get; set; } = new List<CarValueLog>();
 }
diff --git a/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/CarValueLog.cs b/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/CarValueLog.cs
@@ -0,0 +1,20 @@
+using TeslaSolarCharger.Shared.Enums;
+
+namespace TeslaSolarCharger.Model.Entities.TeslaSolarCharger;
+
+public class CarValueLog
+{
+    public int Id { get; set; }
+    public DateTime Timestamp { get; set; }
+    public CarValueType Type { get; set; }
+    public CarValueSource Source { get; set; }
+    public double? DoubleValue { get; set; }
+    public int? IntValue { get; set; }
+    public string? StringValue { get; set; }
+    public string? UnknownValue { get; set; }
+    public bool? BooleanValue { get; set; }
+    public bool? InvalidValue { get; set; }
+
+    public int CarId { get; set; }
+    public Car Car { get; set; }
+}
diff --git a/TeslaSolarCharger.Model/EntityFramework/TeslaSolarChargerContext.cs b/TeslaSolarCharger.Model/EntityFramework/TeslaSolarChargerContext.cs
@@ -30,6 +30,7 @@ public class TeslaSolarChargerContext : DbContext, ITeslaSolarChargerContext
     public DbSet<MqttResultConfiguration> MqttResultConfigurations { get; set; } = null!;
     public DbSet<BackendNotification> BackendNotifications { get; set; } = null!;
     public DbSet<LoggedError> LoggedErrors { get; set; } = null!;
+    public DbSet<CarValueLog> CarValueLogs { get; set; } = null!;
     // ReSharper disable once UnassignedGetOnlyAutoProperty
     public string DbPath { get; }