Merge pull request #278 from pkuehnel/develop

Develop

TeslaSolarCharger.Model/Contracts/IDbConnectionStringHelper.cs

@@ -2,5 +2,6 @@
 
 public interface IDbConnectionStringHelper
 {
-    string GetConnectionString();
+    string GetTeslaMateConnectionString();
+    string GetTeslaSolarChargerDbPath();
 }

TeslaSolarCharger.Model/Contracts/ITeslaSolarChargerContext.cs

@@ -0,0 +1,17 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using TeslaSolarCharger.Model.Entities.TeslaSolarCharger;
+
+namespace TeslaSolarCharger.Model.Contracts;
+
+public interface ITeslaSolarChargerContext
+{
+    DbSet<ChargePrice> ChargePrices { get; set; }
+    DbSet<HandledCharge> HandledCharges { get; set; }
+    DbSet<PowerDistribution> PowerDistributions { get; set; }
+    ChangeTracker ChangeTracker { get; }
+    Task<int> SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken());
+    DatabaseFacade Database { get; }
+    void RejectChanges();
+}

TeslaSolarCharger.Model/Contracts/ITeslamateContext.cs

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using TeslaSolarCharger.Model.Entities;
+using TeslaSolarCharger.Model.Entities.TeslaMate;
 
 namespace TeslaSolarCharger.Model.Contracts;
 
@@ -18,4 +18,6 @@ public interface ITeslamateContext
     DbSet<State> States { get; set; }
     DbSet<Token> Tokens { get; set; }
     DbSet<Update> Updates { get; set; }
-}
+
+    Task<int> SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken());
+}

TeslaSolarCharger.Model/Entities/Address.cs → TeslaSolarCharger.Model/Entities/TeslaMate/Address.cs

@@ -1,4 +1,4 @@
-namespace TeslaSolarCharger.Model.Entities
+namespace TeslaSolarCharger.Model.Entities.TeslaMate
 {
     public class Address
     {

TeslaSolarCharger.Model/Entities/Car.cs → TeslaSolarCharger.Model/Entities/TeslaMate/Car.cs

@@ -1,4 +1,4 @@
-namespace TeslaSolarCharger.Model.Entities
+namespace TeslaSolarCharger.Model.Entities.TeslaMate
 {
     public class Car
     {

TeslaSolarCharger.Model/Entities/CarSetting.cs → TeslaSolarCharger.Model/Entities/TeslaMate/CarSetting.cs

@@ -1,4 +1,4 @@
-namespace TeslaSolarCharger.Model.Entities
+namespace TeslaSolarCharger.Model.Entities.TeslaMate
 {
     public class CarSetting
     {

TeslaSolarCharger.Model/Entities/Charge.cs → TeslaSolarCharger.Model/Entities/TeslaMate/Charge.cs

@@ -1,4 +1,4 @@
-namespace TeslaSolarCharger.Model.Entities
+namespace TeslaSolarCharger.Model.Entities.TeslaMate
 {
     public class Charge
     {

TeslaSolarCharger.Model/Entities/ChargingProcess.cs → TeslaSolarCharger.Model/Entities/TeslaMate/ChargingProcess.cs

@@ -1,4 +1,4 @@
-namespace TeslaSolarCharger.Model.Entities
+namespace TeslaSolarCharger.Model.Entities.TeslaMate
 {
     public class ChargingProcess
     {

TeslaSolarCharger.Model/Entities/Drive.cs → TeslaSolarCharger.Model/Entities/TeslaMate/Drive.cs

@@ -1,4 +1,4 @@
-namespace TeslaSolarCharger.Model.Entities
+namespace TeslaSolarCharger.Model.Entities.TeslaMate
 {
     public class Drive
     {

TeslaSolarCharger.Model/Entities/Geofence.cs → TeslaSolarCharger.Model/Entities/TeslaMate/Geofence.cs

@@ -1,4 +1,4 @@
-namespace TeslaSolarCharger.Model.Entities
+namespace TeslaSolarCharger.Model.Entities.TeslaMate
 {
     public class Geofence
     {

TeslaSolarCharger.Model/Entities/Position.cs → TeslaSolarCharger.Model/Entities/TeslaMate/Position.cs

@@ -1,4 +1,4 @@
-namespace TeslaSolarCharger.Model.Entities
+namespace TeslaSolarCharger.Model.Entities.TeslaMate
 {
     public class Position
     {

TeslaSolarCharger.Model/Entities/SchemaMigration.cs → TeslaSolarCharger.Model/Entities/TeslaMate/SchemaMigration.cs

@@ -1,4 +1,4 @@
-namespace TeslaSolarCharger.Model.Entities
+namespace TeslaSolarCharger.Model.Entities.TeslaMate
 {
     public class SchemaMigration
     {

TeslaSolarCharger.Model/Entities/Setting.cs → TeslaSolarCharger.Model/Entities/TeslaMate/Setting.cs

@@ -1,4 +1,4 @@
-namespace TeslaSolarCharger.Model.Entities
+namespace TeslaSolarCharger.Model.Entities.TeslaMate
 {
     public class Setting
     {

TeslaSolarCharger.Model/Entities/State.cs → TeslaSolarCharger.Model/Entities/TeslaMate/State.cs

@@ -1,4 +1,4 @@
-namespace TeslaSolarCharger.Model.Entities
+namespace TeslaSolarCharger.Model.Entities.TeslaMate
 {
     public class State
     {

TeslaSolarCharger.Model/Entities/Token.cs → TeslaSolarCharger.Model/Entities/TeslaMate/Token.cs

@@ -1,4 +1,4 @@
-namespace TeslaSolarCharger.Model.Entities
+namespace TeslaSolarCharger.Model.Entities.TeslaMate
 {
     public class Token
     {

TeslaSolarCharger.Model/Entities/Update.cs → TeslaSolarCharger.Model/Entities/TeslaMate/Update.cs

@@ -1,4 +1,4 @@
-namespace TeslaSolarCharger.Model.Entities
+namespace TeslaSolarCharger.Model.Entities.TeslaMate
 {
     public class Update
     {

TeslaSolarCharger.Model/Entities/TeslaSolarCharger/ChargePrice.cs

@@ -0,0 +1,11 @@
+namespace TeslaSolarCharger.Model.Entities.TeslaSolarCharger;
+
+public class ChargePrice
+{
+    public int Id { get; set; }
+    public DateTime ValidSince { get; set; }
+    public decimal SolarPrice { get; set; }
+    public decimal GridPrice { get; set; }
+
+    public List<HandledCharge> HandledCharges { get; set; }
+}

TeslaSolarCharger.Model/Entities/TeslaSolarCharger/HandledCharge.cs

@@ -0,0 +1,16 @@
+namespace TeslaSolarCharger.Model.Entities.TeslaSolarCharger;
+
+public class HandledCharge
+{
+    public int Id { get; set; }
+    public int ChargingProcessId { get; set; }
+    public int CarId { get; set; }
+    public decimal? UsedGridEnergy { get; set; }
+    public decimal? UsedSolarEnergy { get; set; }
+    public decimal? CalculatedPrice { get; set; }
+    public List<PowerDistribution> PowerDistributions { get; set; } = new();
+
+
+    public int ChargePriceId { get; set; }
+    public ChargePrice ChargePrice { get; set; }
+}

TeslaSolarCharger.Model/Entities/TeslaSolarCharger/PowerDistribution.cs

@@ -0,0 +1,13 @@
+namespace TeslaSolarCharger.Model.Entities.TeslaSolarCharger;
+
+public class PowerDistribution
+{
+    public int Id { get; set; }
+    public DateTime TimeStamp { get; set; }
+    public int ChargingPower { get; set; }
+    public int PowerFromGrid { get; set; }
+    public float GridProportion { get; set; }
+
+    public int HandledChargeId { get; set; }
+    public HandledCharge HandledCharge { get; set; }
+}

TeslaSolarCharger.Model/EntityFramework/DbConnectionStringHelper.cs

@@ -15,9 +15,9 @@ public DbConnectionStringHelper(ILogger<DbConnectionStringHelper> logger, IConfi
         _configurationWrapper = configurationWrapper;
     }
 
-    public string GetConnectionString()
+    public string GetTeslaMateConnectionString()
     {
-        _logger.LogTrace("{method}()", nameof(GetConnectionString));
+        _logger.LogTrace("{method}()", nameof(GetTeslaMateConnectionString));
         var server = _configurationWrapper.TeslaMateDbServer();
         var port = _configurationWrapper.TeslaMateDbPort();
         var databaseName = _configurationWrapper.TeslaMateDbDatabaseName();
@@ -27,4 +27,11 @@ public string GetConnectionString()
         _logger.LogTrace("ConnectionString: {connectionString}", connectionString);
         return connectionString;
     }
-}
+
+    public string GetTeslaSolarChargerDbPath()
+    {
+        _logger.LogTrace("{method}()", nameof(GetTeslaSolarChargerDbPath));
+        var connectionString = $"Data Source={_configurationWrapper.SqliteFileFullName()}";
+        return connectionString;
+    }
+}

TeslaSolarCharger.Model/EntityFramework/TeslaSolarChargerContext.cs

@@ -0,0 +1,42 @@
+using Microsoft.EntityFrameworkCore;
+using TeslaSolarCharger.Model.Contracts;
+using TeslaSolarCharger.Model.Entities.TeslaSolarCharger;
+
+namespace TeslaSolarCharger.Model.EntityFramework;
+
+public class TeslaSolarChargerContext : DbContext, ITeslaSolarChargerContext
+{
+    public DbSet<ChargePrice> ChargePrices { get; set; } = null!;
+    public DbSet<HandledCharge> HandledCharges { get; set; } = null!;
+    public DbSet<PowerDistribution> PowerDistributions { get; set; } = null!;
+
+    public string DbPath { get; }
+
+    public void RejectChanges()
+    {
+        foreach (var entry in ChangeTracker.Entries())
+        {
+            switch (entry.State)
+            {
+                case EntityState.Modified:
+                case EntityState.Deleted:
+                    entry.State = EntityState.Modified; //Revert changes made to deleted entity.
+                    entry.State = EntityState.Unchanged;
+                    break;
+                case EntityState.Added:
+                    entry.State = EntityState.Detached;
+                    break;
+            }
+        }
+    }
+
+
+    public TeslaSolarChargerContext()
+    {
+    }
+
+    public TeslaSolarChargerContext(DbContextOptions<TeslaSolarChargerContext> options)
+        : base(options)
+    {
+    }
+}

TeslaSolarCharger.Model/EntityFramework/TeslamateContext.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using TeslaSolarCharger.Model.Contracts;
-using TeslaSolarCharger.Model.Entities;
+using TeslaSolarCharger.Model.Entities.TeslaMate;
 
 namespace TeslaSolarCharger.Model.EntityFramework
 {