diff --git a/TeslaSolarCharger.Model/Contracts/ITeslaSolarChargerContext.cs b/TeslaSolarCharger.Model/Contracts/ITeslaSolarChargerContext.cs index a4cb94817..2b5847e30 100644 --- a/TeslaSolarCharger.Model/Contracts/ITeslaSolarChargerContext.cs +++ b/TeslaSolarCharger.Model/Contracts/ITeslaSolarChargerContext.cs @@ -15,7 +15,7 @@ public interface ITeslaSolarChargerContext Task SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken()); DatabaseFacade Database { get; } DbSet SpotPrices { get; set; } - DbSet TeslaTokens { get; set; } + DbSet BackendTokens { get; set; } DbSet TscConfigurations { get; set; } DbSet Cars { get; set; } DbSet RestValueConfigurations { get; set; } diff --git a/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/BackendToken.cs b/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/BackendToken.cs new file mode 100644 index 000000000..08d003500 --- /dev/null +++ b/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/BackendToken.cs @@ -0,0 +1,9 @@ +namespace TeslaSolarCharger.Model.Entities.TeslaSolarCharger; + +public class BackendToken(string accessToken, string refreshToken) +{ + public int Id { get; set; } + public string AccessToken { get; set; } = accessToken; + public string RefreshToken { get; set; } = refreshToken; + public DateTimeOffset ExpiresAtUtc { get; set; } +} diff --git a/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/Car.cs b/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/Car.cs index bd5ec6f18..7a3833203 100644 --- a/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/Car.cs +++ b/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/Car.cs @@ -9,6 +9,7 @@ public class Car public string? Name { get; set; } public string? Vin { get; set; } public TeslaCarFleetApiState? TeslaFleetApiState { get; set; } + public bool IsFleetTelemetryHardwareIncompatible { get; set; } public ChargeMode ChargeMode { get; set; } public int MinimumSoc { get; set; } public DateTime LatestTimeToReachSoC { get; set; } @@ -40,24 +41,19 @@ public class Car public CarStateEnum? State { get; set; } public bool VehicleCommandProtocolRequired { get; set; } - public DateTime? VehicleRateLimitedUntil { get; set; } - public DateTime? VehicleDataRateLimitedUntil { get; set; } - public DateTime? CommandsRateLimitedUntil { get; set; } - public DateTime? WakeUpRateLimitedUntil { get; set; } - public DateTime? ChargingCommandsRateLimitedUntil { get; set; } public bool UseBle { get; set; } public string? BleApiBaseUrl { get; set; } public bool UseFleetTelemetry { get; set; } - public bool UseFleetTelemetryForLocationData { get; set; } + public bool IncludeTrackingRelevantFields { get; set; } public bool IsAvailableInTeslaAccount { get; set; } - public string? WakeUpCalls { get; set; } - public string? VehicleDataCalls { get; set; } - public string? VehicleCalls { get; set; } - public string? ChargeStartCalls { get; set; } - public string? ChargeStopCalls { get; set; } - public string? SetChargingAmpsCall { get; set; } - public string? OtherCommandCalls { get; set; } + public List WakeUpCalls { get; set; } = new(); + public List VehicleDataCalls { get; set; } = new(); + public List VehicleCalls { get; set; } = new(); + public List ChargeStartCalls { get; set; } = new(); + public List ChargeStopCalls { get; set; } = new(); + public List SetChargingAmpsCall { get; set; } = new(); + public List OtherCommandCalls { get; set; } = new(); public List ChargingProcesses { get; set; } = new List(); public List CarValueLogs { get; set; } = new List(); diff --git a/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/TeslaToken.cs b/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/TeslaToken.cs deleted file mode 100644 index 4a61b6153..000000000 --- a/TeslaSolarCharger.Model/Entities/TeslaSolarCharger/TeslaToken.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Microsoft.Extensions.Primitives; -using TeslaSolarCharger.Model.Enums; - -namespace TeslaSolarCharger.Model.Entities.TeslaSolarCharger; - -public class TeslaToken -{ - public int Id { get; set; } - public string AccessToken { get; set; } - public string RefreshToken { get; set; } - public string IdToken { get; set; } - public int UnauthorizedCounter { get; set; } - public DateTime ExpiresAtUtc { get; set; } - public TeslaFleetApiRegion Region { get; set; } -} diff --git a/TeslaSolarCharger.Model/EntityFramework/TeslaSolarChargerContext.cs b/TeslaSolarCharger.Model/EntityFramework/TeslaSolarChargerContext.cs index b0333c1bb..08f517fa3 100644 --- a/TeslaSolarCharger.Model/EntityFramework/TeslaSolarChargerContext.cs +++ b/TeslaSolarCharger.Model/EntityFramework/TeslaSolarChargerContext.cs @@ -16,7 +16,7 @@ public class TeslaSolarChargerContext : DbContext, ITeslaSolarChargerContext public DbSet HandledCharges { get; set; } = null!; public DbSet PowerDistributions { get; set; } = null!; public DbSet SpotPrices { get; set; } = null!; - public DbSet TeslaTokens { get; set; } = null!; + public DbSet BackendTokens { get; set; } = null!; public DbSet TscConfigurations { get; set; } = null!; public DbSet Cars { get; set; } = null!; public DbSet RestValueConfigurations { get; set; } = null!; @@ -124,6 +124,41 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) .HasConversion(timeListToString) .Metadata.SetValueComparer(valueComparer); + modelBuilder.Entity() + .Property(e => e.WakeUpCalls) + .HasConversion(timeListToString) + .Metadata.SetValueComparer(valueComparer); + + modelBuilder.Entity() + .Property(e => e.VehicleDataCalls) + .HasConversion(timeListToString) + .Metadata.SetValueComparer(valueComparer); + + modelBuilder.Entity() + .Property(e => e.VehicleCalls) + .HasConversion(timeListToString) + .Metadata.SetValueComparer(valueComparer); + + modelBuilder.Entity() + .Property(e => e.ChargeStartCalls) + .HasConversion(timeListToString) + .Metadata.SetValueComparer(valueComparer); + + modelBuilder.Entity() + .Property(e => e.ChargeStopCalls) + .HasConversion(timeListToString) + .Metadata.SetValueComparer(valueComparer); + + modelBuilder.Entity() + .Property(e => e.SetChargingAmpsCall) + .HasConversion(timeListToString) + .Metadata.SetValueComparer(valueComparer); + + modelBuilder.Entity() + .Property(e => e.OtherCommandCalls) + .HasConversion(timeListToString) + .Metadata.SetValueComparer(valueComparer); + } #pragma warning disable CS8618 diff --git a/TeslaSolarCharger.Model/Migrations/20241227093212_ReplaceTeslaTokensWithBackendTokens.Designer.cs b/TeslaSolarCharger.Model/Migrations/20241227093212_ReplaceTeslaTokensWithBackendTokens.Designer.cs new file mode 100644 index 000000000..91767f9c7 --- /dev/null +++ b/TeslaSolarCharger.Model/Migrations/20241227093212_ReplaceTeslaTokensWithBackendTokens.Designer.cs @@ -0,0 +1,916 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using TeslaSolarCharger.Model.EntityFramework; + +#nullable disable + +namespace TeslaSolarCharger.Model.Migrations +{ + [DbContext(typeof(TeslaSolarChargerContext))] + [Migration("20241227093212_ReplaceTeslaTokensWithBackendTokens")] + partial class ReplaceTeslaTokensWithBackendTokens + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "8.0.10"); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.BackendNotification", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BackendIssueId") + .HasColumnType("INTEGER"); + + b.Property("DetailText") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Headline") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("IsConfirmed") + .HasColumnType("INTEGER"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.Property("ValidFromDate") + .HasColumnType("TEXT"); + + b.Property("ValidFromVersion") + .HasColumnType("TEXT"); + + b.Property("ValidToDate") + .HasColumnType("TEXT"); + + b.Property("ValidToVersion") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("BackendNotifications"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.BackendToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessToken") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ExpiresAtUtc") + .HasColumnType("TEXT"); + + b.Property("RefreshToken") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("BackendTokens"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CachedCarState", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("CarStateJson") + .HasColumnType("TEXT"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("LastUpdated") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("CachedCarStates"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BleApiBaseUrl") + .HasColumnType("TEXT"); + + b.Property("ChargeMode") + .HasColumnType("INTEGER"); + + b.Property("ChargeStartCalls") + .HasColumnType("TEXT"); + + b.Property("ChargeStopCalls") + .HasColumnType("TEXT"); + + b.Property("ChargerActualCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerPhases") + .HasColumnType("INTEGER"); + + b.Property("ChargerPilotCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerRequestedCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerVoltage") + .HasColumnType("INTEGER"); + + b.Property("ChargingCommandsRateLimitedUntil") + .HasColumnType("TEXT"); + + b.Property("ChargingPriority") + .HasColumnType("INTEGER"); + + b.Property("ClimateOn") + .HasColumnType("INTEGER"); + + b.Property("CommandsRateLimitedUntil") + .HasColumnType("TEXT"); + + b.Property("IgnoreLatestTimeToReachSocDate") + .HasColumnType("INTEGER"); + + b.Property("IgnoreLatestTimeToReachSocDateOnWeekend") + .HasColumnType("INTEGER"); + + b.Property("IsAvailableInTeslaAccount") + .HasColumnType("INTEGER"); + + b.Property("LatestTimeToReachSoC") + .HasColumnType("TEXT"); + + b.Property("Latitude") + .HasColumnType("REAL"); + + b.Property("Longitude") + .HasColumnType("REAL"); + + b.Property("MaximumAmpere") + .HasColumnType("INTEGER"); + + b.Property("MinimumAmpere") + .HasColumnType("INTEGER"); + + b.Property("MinimumSoc") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("OtherCommandCalls") + .HasColumnType("TEXT"); + + b.Property("PluggedIn") + .HasColumnType("INTEGER"); + + b.Property("SetChargingAmpsCall") + .HasColumnType("TEXT"); + + b.Property("ShouldBeManaged") + .HasColumnType("INTEGER"); + + b.Property("SoC") + .HasColumnType("INTEGER"); + + b.Property("SocLimit") + .HasColumnType("INTEGER"); + + b.Property("State") + .HasColumnType("INTEGER"); + + b.Property("TeslaFleetApiState") + .HasColumnType("INTEGER"); + + b.Property("TeslaMateCarId") + .HasColumnType("INTEGER"); + + b.Property("UsableEnergy") + .HasColumnType("INTEGER"); + + b.Property("UseBle") + .HasColumnType("INTEGER"); + + b.Property("UseFleetTelemetry") + .HasColumnType("INTEGER"); + + b.Property("UseFleetTelemetryForLocationData") + .HasColumnType("INTEGER"); + + b.Property("VehicleCalls") + .HasColumnType("TEXT"); + + b.Property("VehicleCommandProtocolRequired") + .HasColumnType("INTEGER"); + + b.Property("VehicleDataCalls") + .HasColumnType("TEXT"); + + b.Property("VehicleDataRateLimitedUntil") + .HasColumnType("TEXT"); + + b.Property("VehicleRateLimitedUntil") + .HasColumnType("TEXT"); + + b.Property("Vin") + .HasColumnType("TEXT"); + + b.Property("WakeUpCalls") + .HasColumnType("TEXT"); + + b.Property("WakeUpRateLimitedUntil") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("TeslaMateCarId") + .IsUnique(); + + b.HasIndex("Vin") + .IsUnique(); + + b.ToTable("Cars"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CarValueLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BooleanValue") + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("DoubleValue") + .HasColumnType("REAL"); + + b.Property("IntValue") + .HasColumnType("INTEGER"); + + b.Property("InvalidValue") + .HasColumnType("INTEGER"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("StringValue") + .HasColumnType("TEXT"); + + b.Property("Timestamp") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.Property("UnknownValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.ToTable("CarValueLogs"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargePrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AddSpotPriceToGridPrice") + .HasColumnType("INTEGER"); + + b.Property("EnergyProvider") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(6); + + b.Property("EnergyProviderConfiguration") + .HasColumnType("TEXT"); + + b.Property("GridPrice") + .HasColumnType("TEXT"); + + b.Property("SolarPrice") + .HasColumnType("TEXT"); + + b.Property("SpotPriceCorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("ValidSince") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ChargePrices"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingDetail", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChargerVoltage") + .HasColumnType("INTEGER"); + + b.Property("ChargingProcessId") + .HasColumnType("INTEGER"); + + b.Property("GridPower") + .HasColumnType("INTEGER"); + + b.Property("HomeBatteryPower") + .HasColumnType("INTEGER"); + + b.Property("SolarPower") + .HasColumnType("INTEGER"); + + b.Property("TimeStamp") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChargingProcessId"); + + b.ToTable("ChargingDetails"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("Cost") + .HasColumnType("TEXT"); + + b.Property("EndDate") + .HasColumnType("TEXT"); + + b.Property("OldHandledChargeId") + .HasColumnType("INTEGER"); + + b.Property("StartDate") + .HasColumnType("TEXT"); + + b.Property("UsedGridEnergyKwh") + .HasColumnType("TEXT"); + + b.Property("UsedHomeBatteryEnergyKwh") + .HasColumnType("TEXT"); + + b.Property("UsedSolarEnergyKwh") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.ToTable("ChargingProcesses"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AverageSpotPrice") + .HasColumnType("TEXT"); + + b.Property("CalculatedPrice") + .HasColumnType("TEXT"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("ChargingProcessId") + .HasColumnType("INTEGER"); + + b.Property("UsedGridEnergy") + .HasColumnType("TEXT"); + + b.Property("UsedSolarEnergy") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("HandledCharges"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.LoggedError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DismissedAt") + .HasColumnType("TEXT"); + + b.Property("EndTimeStamp") + .HasColumnType("TEXT"); + + b.Property("FurtherOccurrences") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Headline") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("IssueKey") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Message") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("MethodName") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Source") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("StackTrace") + .HasColumnType("TEXT"); + + b.Property("StartTimeStamp") + .HasColumnType("TEXT"); + + b.Property("TelegramNotificationSent") + .HasColumnType("INTEGER"); + + b.Property("TelegramResolvedMessageSent") + .HasColumnType("INTEGER"); + + b.Property("Vin") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("LoggedErrors"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConnectDelayMilliseconds") + .HasColumnType("INTEGER"); + + b.Property("Endianess") + .HasColumnType("INTEGER"); + + b.Property("Host") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Port") + .HasColumnType("INTEGER"); + + b.Property("ReadTimeoutMilliseconds") + .HasColumnType("INTEGER"); + + b.Property("UnitIdentifier") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ModbusConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Address") + .HasColumnType("INTEGER"); + + b.Property("BitStartIndex") + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("InvertedByModbusResultConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Length") + .HasColumnType("INTEGER"); + + b.Property("ModbusConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("RegisterType") + .HasColumnType("INTEGER"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("ValueType") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("InvertedByModbusResultConfigurationId"); + + b.HasIndex("ModbusConfigurationId"); + + b.ToTable("ModbusResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Host") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Password") + .HasColumnType("TEXT"); + + b.Property("Port") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MqttConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("MqttConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("NodePattern") + .HasColumnType("TEXT"); + + b.Property("NodePatternType") + .HasColumnType("INTEGER"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("Topic") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("XmlAttributeHeaderName") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeHeaderValue") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeValueName") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MqttConfigurationId"); + + b.ToTable("MqttResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.PowerDistribution", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChargingPower") + .HasColumnType("INTEGER"); + + b.Property("GridProportion") + .HasColumnType("REAL"); + + b.Property("HandledChargeId") + .HasColumnType("INTEGER"); + + b.Property("PowerFromGrid") + .HasColumnType("INTEGER"); + + b.Property("TimeStamp") + .HasColumnType("TEXT"); + + b.Property("UsedWattHours") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("HandledChargeId"); + + b.ToTable("PowerDistributions"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("HttpMethod") + .HasColumnType("INTEGER"); + + b.Property("NodePatternType") + .HasColumnType("INTEGER"); + + b.Property("Url") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("RestValueConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfigurationHeader", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("RestValueConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Value") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("RestValueConfigurationId", "Key") + .IsUnique(); + + b.ToTable("RestValueConfigurationHeaders"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("NodePattern") + .HasColumnType("TEXT"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("RestValueConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("XmlAttributeHeaderName") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeHeaderValue") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeValueName") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("RestValueConfigurationId"); + + b.ToTable("RestValueResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.SpotPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("EndDate") + .HasColumnType("TEXT"); + + b.Property("Price") + .HasColumnType("TEXT"); + + b.Property("StartDate") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SpotPrices"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.TscConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Key") + .IsUnique(); + + b.ToTable("TscConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CarValueLog", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", "Car") + .WithMany("CarValueLogs") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingDetail", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", "ChargingProcess") + .WithMany("ChargingDetails") + .HasForeignKey("ChargingProcessId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ChargingProcess"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", "Car") + .WithMany("ChargingProcesses") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", "InvertedByModbusResultConfiguration") + .WithMany() + .HasForeignKey("InvertedByModbusResultConfigurationId"); + + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", "ModbusConfiguration") + .WithMany("ModbusResultConfigurations") + .HasForeignKey("ModbusConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("InvertedByModbusResultConfiguration"); + + b.Navigation("ModbusConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", "MqttConfiguration") + .WithMany("MqttResultConfigurations") + .HasForeignKey("MqttConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MqttConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.PowerDistribution", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", "HandledCharge") + .WithMany("PowerDistributions") + .HasForeignKey("HandledChargeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("HandledCharge"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfigurationHeader", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", "RestValueConfiguration") + .WithMany("Headers") + .HasForeignKey("RestValueConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("RestValueConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", "RestValueConfiguration") + .WithMany("RestValueResultConfigurations") + .HasForeignKey("RestValueConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("RestValueConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", b => + { + b.Navigation("CarValueLogs"); + + b.Navigation("ChargingProcesses"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.Navigation("ChargingDetails"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", b => + { + b.Navigation("PowerDistributions"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", b => + { + b.Navigation("ModbusResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", b => + { + b.Navigation("MqttResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", b => + { + b.Navigation("Headers"); + + b.Navigation("RestValueResultConfigurations"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/TeslaSolarCharger.Model/Migrations/20241227093212_ReplaceTeslaTokensWithBackendTokens.cs b/TeslaSolarCharger.Model/Migrations/20241227093212_ReplaceTeslaTokensWithBackendTokens.cs new file mode 100644 index 000000000..70a11fe25 --- /dev/null +++ b/TeslaSolarCharger.Model/Migrations/20241227093212_ReplaceTeslaTokensWithBackendTokens.cs @@ -0,0 +1,58 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace TeslaSolarCharger.Model.Migrations +{ + /// + public partial class ReplaceTeslaTokensWithBackendTokens : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "TeslaTokens"); + + migrationBuilder.CreateTable( + name: "BackendTokens", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + AccessToken = table.Column(type: "TEXT", nullable: false), + RefreshToken = table.Column(type: "TEXT", nullable: false), + ExpiresAtUtc = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_BackendTokens", x => x.Id); + }); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "BackendTokens"); + + migrationBuilder.CreateTable( + name: "TeslaTokens", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + AccessToken = table.Column(type: "TEXT", nullable: false), + ExpiresAtUtc = table.Column(type: "TEXT", nullable: false), + IdToken = table.Column(type: "TEXT", nullable: false), + RefreshToken = table.Column(type: "TEXT", nullable: false), + Region = table.Column(type: "INTEGER", nullable: false), + UnauthorizedCounter = table.Column(type: "INTEGER", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_TeslaTokens", x => x.Id); + }); + } + } +} diff --git a/TeslaSolarCharger.Model/Migrations/20241230094540_RemoveCarRateLimits.Designer.cs b/TeslaSolarCharger.Model/Migrations/20241230094540_RemoveCarRateLimits.Designer.cs new file mode 100644 index 000000000..b19e82170 --- /dev/null +++ b/TeslaSolarCharger.Model/Migrations/20241230094540_RemoveCarRateLimits.Designer.cs @@ -0,0 +1,901 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using TeslaSolarCharger.Model.EntityFramework; + +#nullable disable + +namespace TeslaSolarCharger.Model.Migrations +{ + [DbContext(typeof(TeslaSolarChargerContext))] + [Migration("20241230094540_RemoveCarRateLimits")] + partial class RemoveCarRateLimits + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "8.0.10"); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.BackendNotification", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BackendIssueId") + .HasColumnType("INTEGER"); + + b.Property("DetailText") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Headline") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("IsConfirmed") + .HasColumnType("INTEGER"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.Property("ValidFromDate") + .HasColumnType("TEXT"); + + b.Property("ValidFromVersion") + .HasColumnType("TEXT"); + + b.Property("ValidToDate") + .HasColumnType("TEXT"); + + b.Property("ValidToVersion") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("BackendNotifications"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.BackendToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessToken") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ExpiresAtUtc") + .HasColumnType("TEXT"); + + b.Property("RefreshToken") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("BackendTokens"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CachedCarState", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("CarStateJson") + .HasColumnType("TEXT"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("LastUpdated") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("CachedCarStates"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BleApiBaseUrl") + .HasColumnType("TEXT"); + + b.Property("ChargeMode") + .HasColumnType("INTEGER"); + + b.Property("ChargeStartCalls") + .HasColumnType("TEXT"); + + b.Property("ChargeStopCalls") + .HasColumnType("TEXT"); + + b.Property("ChargerActualCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerPhases") + .HasColumnType("INTEGER"); + + b.Property("ChargerPilotCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerRequestedCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerVoltage") + .HasColumnType("INTEGER"); + + b.Property("ChargingPriority") + .HasColumnType("INTEGER"); + + b.Property("ClimateOn") + .HasColumnType("INTEGER"); + + b.Property("IgnoreLatestTimeToReachSocDate") + .HasColumnType("INTEGER"); + + b.Property("IgnoreLatestTimeToReachSocDateOnWeekend") + .HasColumnType("INTEGER"); + + b.Property("IsAvailableInTeslaAccount") + .HasColumnType("INTEGER"); + + b.Property("LatestTimeToReachSoC") + .HasColumnType("TEXT"); + + b.Property("Latitude") + .HasColumnType("REAL"); + + b.Property("Longitude") + .HasColumnType("REAL"); + + b.Property("MaximumAmpere") + .HasColumnType("INTEGER"); + + b.Property("MinimumAmpere") + .HasColumnType("INTEGER"); + + b.Property("MinimumSoc") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("OtherCommandCalls") + .HasColumnType("TEXT"); + + b.Property("PluggedIn") + .HasColumnType("INTEGER"); + + b.Property("SetChargingAmpsCall") + .HasColumnType("TEXT"); + + b.Property("ShouldBeManaged") + .HasColumnType("INTEGER"); + + b.Property("SoC") + .HasColumnType("INTEGER"); + + b.Property("SocLimit") + .HasColumnType("INTEGER"); + + b.Property("State") + .HasColumnType("INTEGER"); + + b.Property("TeslaFleetApiState") + .HasColumnType("INTEGER"); + + b.Property("TeslaMateCarId") + .HasColumnType("INTEGER"); + + b.Property("UsableEnergy") + .HasColumnType("INTEGER"); + + b.Property("UseBle") + .HasColumnType("INTEGER"); + + b.Property("UseFleetTelemetry") + .HasColumnType("INTEGER"); + + b.Property("UseFleetTelemetryForLocationData") + .HasColumnType("INTEGER"); + + b.Property("VehicleCalls") + .HasColumnType("TEXT"); + + b.Property("VehicleCommandProtocolRequired") + .HasColumnType("INTEGER"); + + b.Property("VehicleDataCalls") + .HasColumnType("TEXT"); + + b.Property("Vin") + .HasColumnType("TEXT"); + + b.Property("WakeUpCalls") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("TeslaMateCarId") + .IsUnique(); + + b.HasIndex("Vin") + .IsUnique(); + + b.ToTable("Cars"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CarValueLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BooleanValue") + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("DoubleValue") + .HasColumnType("REAL"); + + b.Property("IntValue") + .HasColumnType("INTEGER"); + + b.Property("InvalidValue") + .HasColumnType("INTEGER"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("StringValue") + .HasColumnType("TEXT"); + + b.Property("Timestamp") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.Property("UnknownValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.ToTable("CarValueLogs"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargePrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AddSpotPriceToGridPrice") + .HasColumnType("INTEGER"); + + b.Property("EnergyProvider") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(6); + + b.Property("EnergyProviderConfiguration") + .HasColumnType("TEXT"); + + b.Property("GridPrice") + .HasColumnType("TEXT"); + + b.Property("SolarPrice") + .HasColumnType("TEXT"); + + b.Property("SpotPriceCorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("ValidSince") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ChargePrices"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingDetail", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChargerVoltage") + .HasColumnType("INTEGER"); + + b.Property("ChargingProcessId") + .HasColumnType("INTEGER"); + + b.Property("GridPower") + .HasColumnType("INTEGER"); + + b.Property("HomeBatteryPower") + .HasColumnType("INTEGER"); + + b.Property("SolarPower") + .HasColumnType("INTEGER"); + + b.Property("TimeStamp") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChargingProcessId"); + + b.ToTable("ChargingDetails"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("Cost") + .HasColumnType("TEXT"); + + b.Property("EndDate") + .HasColumnType("TEXT"); + + b.Property("OldHandledChargeId") + .HasColumnType("INTEGER"); + + b.Property("StartDate") + .HasColumnType("TEXT"); + + b.Property("UsedGridEnergyKwh") + .HasColumnType("TEXT"); + + b.Property("UsedHomeBatteryEnergyKwh") + .HasColumnType("TEXT"); + + b.Property("UsedSolarEnergyKwh") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.ToTable("ChargingProcesses"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AverageSpotPrice") + .HasColumnType("TEXT"); + + b.Property("CalculatedPrice") + .HasColumnType("TEXT"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("ChargingProcessId") + .HasColumnType("INTEGER"); + + b.Property("UsedGridEnergy") + .HasColumnType("TEXT"); + + b.Property("UsedSolarEnergy") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("HandledCharges"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.LoggedError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DismissedAt") + .HasColumnType("TEXT"); + + b.Property("EndTimeStamp") + .HasColumnType("TEXT"); + + b.Property("FurtherOccurrences") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Headline") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("IssueKey") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Message") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("MethodName") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Source") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("StackTrace") + .HasColumnType("TEXT"); + + b.Property("StartTimeStamp") + .HasColumnType("TEXT"); + + b.Property("TelegramNotificationSent") + .HasColumnType("INTEGER"); + + b.Property("TelegramResolvedMessageSent") + .HasColumnType("INTEGER"); + + b.Property("Vin") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("LoggedErrors"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConnectDelayMilliseconds") + .HasColumnType("INTEGER"); + + b.Property("Endianess") + .HasColumnType("INTEGER"); + + b.Property("Host") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Port") + .HasColumnType("INTEGER"); + + b.Property("ReadTimeoutMilliseconds") + .HasColumnType("INTEGER"); + + b.Property("UnitIdentifier") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ModbusConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Address") + .HasColumnType("INTEGER"); + + b.Property("BitStartIndex") + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("InvertedByModbusResultConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Length") + .HasColumnType("INTEGER"); + + b.Property("ModbusConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("RegisterType") + .HasColumnType("INTEGER"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("ValueType") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("InvertedByModbusResultConfigurationId"); + + b.HasIndex("ModbusConfigurationId"); + + b.ToTable("ModbusResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Host") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Password") + .HasColumnType("TEXT"); + + b.Property("Port") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MqttConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("MqttConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("NodePattern") + .HasColumnType("TEXT"); + + b.Property("NodePatternType") + .HasColumnType("INTEGER"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("Topic") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("XmlAttributeHeaderName") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeHeaderValue") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeValueName") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MqttConfigurationId"); + + b.ToTable("MqttResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.PowerDistribution", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChargingPower") + .HasColumnType("INTEGER"); + + b.Property("GridProportion") + .HasColumnType("REAL"); + + b.Property("HandledChargeId") + .HasColumnType("INTEGER"); + + b.Property("PowerFromGrid") + .HasColumnType("INTEGER"); + + b.Property("TimeStamp") + .HasColumnType("TEXT"); + + b.Property("UsedWattHours") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("HandledChargeId"); + + b.ToTable("PowerDistributions"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("HttpMethod") + .HasColumnType("INTEGER"); + + b.Property("NodePatternType") + .HasColumnType("INTEGER"); + + b.Property("Url") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("RestValueConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfigurationHeader", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("RestValueConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Value") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("RestValueConfigurationId", "Key") + .IsUnique(); + + b.ToTable("RestValueConfigurationHeaders"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("NodePattern") + .HasColumnType("TEXT"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("RestValueConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("XmlAttributeHeaderName") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeHeaderValue") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeValueName") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("RestValueConfigurationId"); + + b.ToTable("RestValueResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.SpotPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("EndDate") + .HasColumnType("TEXT"); + + b.Property("Price") + .HasColumnType("TEXT"); + + b.Property("StartDate") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SpotPrices"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.TscConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Key") + .IsUnique(); + + b.ToTable("TscConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CarValueLog", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", "Car") + .WithMany("CarValueLogs") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingDetail", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", "ChargingProcess") + .WithMany("ChargingDetails") + .HasForeignKey("ChargingProcessId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ChargingProcess"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", "Car") + .WithMany("ChargingProcesses") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", "InvertedByModbusResultConfiguration") + .WithMany() + .HasForeignKey("InvertedByModbusResultConfigurationId"); + + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", "ModbusConfiguration") + .WithMany("ModbusResultConfigurations") + .HasForeignKey("ModbusConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("InvertedByModbusResultConfiguration"); + + b.Navigation("ModbusConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", "MqttConfiguration") + .WithMany("MqttResultConfigurations") + .HasForeignKey("MqttConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MqttConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.PowerDistribution", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", "HandledCharge") + .WithMany("PowerDistributions") + .HasForeignKey("HandledChargeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("HandledCharge"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfigurationHeader", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", "RestValueConfiguration") + .WithMany("Headers") + .HasForeignKey("RestValueConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("RestValueConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", "RestValueConfiguration") + .WithMany("RestValueResultConfigurations") + .HasForeignKey("RestValueConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("RestValueConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", b => + { + b.Navigation("CarValueLogs"); + + b.Navigation("ChargingProcesses"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.Navigation("ChargingDetails"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", b => + { + b.Navigation("PowerDistributions"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", b => + { + b.Navigation("ModbusResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", b => + { + b.Navigation("MqttResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", b => + { + b.Navigation("Headers"); + + b.Navigation("RestValueResultConfigurations"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/TeslaSolarCharger.Model/Migrations/20241230094540_RemoveCarRateLimits.cs b/TeslaSolarCharger.Model/Migrations/20241230094540_RemoveCarRateLimits.cs new file mode 100644 index 000000000..6e0e09b42 --- /dev/null +++ b/TeslaSolarCharger.Model/Migrations/20241230094540_RemoveCarRateLimits.cs @@ -0,0 +1,69 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace TeslaSolarCharger.Model.Migrations +{ + /// + public partial class RemoveCarRateLimits : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "ChargingCommandsRateLimitedUntil", + table: "Cars"); + + migrationBuilder.DropColumn( + name: "CommandsRateLimitedUntil", + table: "Cars"); + + migrationBuilder.DropColumn( + name: "VehicleDataRateLimitedUntil", + table: "Cars"); + + migrationBuilder.DropColumn( + name: "VehicleRateLimitedUntil", + table: "Cars"); + + migrationBuilder.DropColumn( + name: "WakeUpRateLimitedUntil", + table: "Cars"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "ChargingCommandsRateLimitedUntil", + table: "Cars", + type: "TEXT", + nullable: true); + + migrationBuilder.AddColumn( + name: "CommandsRateLimitedUntil", + table: "Cars", + type: "TEXT", + nullable: true); + + migrationBuilder.AddColumn( + name: "VehicleDataRateLimitedUntil", + table: "Cars", + type: "TEXT", + nullable: true); + + migrationBuilder.AddColumn( + name: "VehicleRateLimitedUntil", + table: "Cars", + type: "TEXT", + nullable: true); + + migrationBuilder.AddColumn( + name: "WakeUpRateLimitedUntil", + table: "Cars", + type: "TEXT", + nullable: true); + } + } +} diff --git a/TeslaSolarCharger.Model/Migrations/20250113011813_AddIsFleetTelemetryHardwareIncompatibleToCars.Designer.cs b/TeslaSolarCharger.Model/Migrations/20250113011813_AddIsFleetTelemetryHardwareIncompatibleToCars.Designer.cs new file mode 100644 index 000000000..cb0e0b1b6 --- /dev/null +++ b/TeslaSolarCharger.Model/Migrations/20250113011813_AddIsFleetTelemetryHardwareIncompatibleToCars.Designer.cs @@ -0,0 +1,904 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using TeslaSolarCharger.Model.EntityFramework; + +#nullable disable + +namespace TeslaSolarCharger.Model.Migrations +{ + [DbContext(typeof(TeslaSolarChargerContext))] + [Migration("20250113011813_AddIsFleetTelemetryHardwareIncompatibleToCars")] + partial class AddIsFleetTelemetryHardwareIncompatibleToCars + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "8.0.10"); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.BackendNotification", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BackendIssueId") + .HasColumnType("INTEGER"); + + b.Property("DetailText") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Headline") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("IsConfirmed") + .HasColumnType("INTEGER"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.Property("ValidFromDate") + .HasColumnType("TEXT"); + + b.Property("ValidFromVersion") + .HasColumnType("TEXT"); + + b.Property("ValidToDate") + .HasColumnType("TEXT"); + + b.Property("ValidToVersion") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("BackendNotifications"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.BackendToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessToken") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ExpiresAtUtc") + .HasColumnType("TEXT"); + + b.Property("RefreshToken") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("BackendTokens"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CachedCarState", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("CarStateJson") + .HasColumnType("TEXT"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("LastUpdated") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("CachedCarStates"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BleApiBaseUrl") + .HasColumnType("TEXT"); + + b.Property("ChargeMode") + .HasColumnType("INTEGER"); + + b.Property("ChargeStartCalls") + .HasColumnType("TEXT"); + + b.Property("ChargeStopCalls") + .HasColumnType("TEXT"); + + b.Property("ChargerActualCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerPhases") + .HasColumnType("INTEGER"); + + b.Property("ChargerPilotCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerRequestedCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerVoltage") + .HasColumnType("INTEGER"); + + b.Property("ChargingPriority") + .HasColumnType("INTEGER"); + + b.Property("ClimateOn") + .HasColumnType("INTEGER"); + + b.Property("IgnoreLatestTimeToReachSocDate") + .HasColumnType("INTEGER"); + + b.Property("IgnoreLatestTimeToReachSocDateOnWeekend") + .HasColumnType("INTEGER"); + + b.Property("IsAvailableInTeslaAccount") + .HasColumnType("INTEGER"); + + b.Property("IsFleetTelemetryHardwareIncompatible") + .HasColumnType("INTEGER"); + + b.Property("LatestTimeToReachSoC") + .HasColumnType("TEXT"); + + b.Property("Latitude") + .HasColumnType("REAL"); + + b.Property("Longitude") + .HasColumnType("REAL"); + + b.Property("MaximumAmpere") + .HasColumnType("INTEGER"); + + b.Property("MinimumAmpere") + .HasColumnType("INTEGER"); + + b.Property("MinimumSoc") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("OtherCommandCalls") + .HasColumnType("TEXT"); + + b.Property("PluggedIn") + .HasColumnType("INTEGER"); + + b.Property("SetChargingAmpsCall") + .HasColumnType("TEXT"); + + b.Property("ShouldBeManaged") + .HasColumnType("INTEGER"); + + b.Property("SoC") + .HasColumnType("INTEGER"); + + b.Property("SocLimit") + .HasColumnType("INTEGER"); + + b.Property("State") + .HasColumnType("INTEGER"); + + b.Property("TeslaFleetApiState") + .HasColumnType("INTEGER"); + + b.Property("TeslaMateCarId") + .HasColumnType("INTEGER"); + + b.Property("UsableEnergy") + .HasColumnType("INTEGER"); + + b.Property("UseBle") + .HasColumnType("INTEGER"); + + b.Property("UseFleetTelemetry") + .HasColumnType("INTEGER"); + + b.Property("UseFleetTelemetryForLocationData") + .HasColumnType("INTEGER"); + + b.Property("VehicleCalls") + .HasColumnType("TEXT"); + + b.Property("VehicleCommandProtocolRequired") + .HasColumnType("INTEGER"); + + b.Property("VehicleDataCalls") + .HasColumnType("TEXT"); + + b.Property("Vin") + .HasColumnType("TEXT"); + + b.Property("WakeUpCalls") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("TeslaMateCarId") + .IsUnique(); + + b.HasIndex("Vin") + .IsUnique(); + + b.ToTable("Cars"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CarValueLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BooleanValue") + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("DoubleValue") + .HasColumnType("REAL"); + + b.Property("IntValue") + .HasColumnType("INTEGER"); + + b.Property("InvalidValue") + .HasColumnType("INTEGER"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("StringValue") + .HasColumnType("TEXT"); + + b.Property("Timestamp") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.Property("UnknownValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.ToTable("CarValueLogs"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargePrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AddSpotPriceToGridPrice") + .HasColumnType("INTEGER"); + + b.Property("EnergyProvider") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(6); + + b.Property("EnergyProviderConfiguration") + .HasColumnType("TEXT"); + + b.Property("GridPrice") + .HasColumnType("TEXT"); + + b.Property("SolarPrice") + .HasColumnType("TEXT"); + + b.Property("SpotPriceCorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("ValidSince") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ChargePrices"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingDetail", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChargerVoltage") + .HasColumnType("INTEGER"); + + b.Property("ChargingProcessId") + .HasColumnType("INTEGER"); + + b.Property("GridPower") + .HasColumnType("INTEGER"); + + b.Property("HomeBatteryPower") + .HasColumnType("INTEGER"); + + b.Property("SolarPower") + .HasColumnType("INTEGER"); + + b.Property("TimeStamp") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChargingProcessId"); + + b.ToTable("ChargingDetails"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("Cost") + .HasColumnType("TEXT"); + + b.Property("EndDate") + .HasColumnType("TEXT"); + + b.Property("OldHandledChargeId") + .HasColumnType("INTEGER"); + + b.Property("StartDate") + .HasColumnType("TEXT"); + + b.Property("UsedGridEnergyKwh") + .HasColumnType("TEXT"); + + b.Property("UsedHomeBatteryEnergyKwh") + .HasColumnType("TEXT"); + + b.Property("UsedSolarEnergyKwh") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.ToTable("ChargingProcesses"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AverageSpotPrice") + .HasColumnType("TEXT"); + + b.Property("CalculatedPrice") + .HasColumnType("TEXT"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("ChargingProcessId") + .HasColumnType("INTEGER"); + + b.Property("UsedGridEnergy") + .HasColumnType("TEXT"); + + b.Property("UsedSolarEnergy") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("HandledCharges"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.LoggedError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DismissedAt") + .HasColumnType("TEXT"); + + b.Property("EndTimeStamp") + .HasColumnType("TEXT"); + + b.Property("FurtherOccurrences") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Headline") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("IssueKey") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Message") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("MethodName") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Source") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("StackTrace") + .HasColumnType("TEXT"); + + b.Property("StartTimeStamp") + .HasColumnType("TEXT"); + + b.Property("TelegramNotificationSent") + .HasColumnType("INTEGER"); + + b.Property("TelegramResolvedMessageSent") + .HasColumnType("INTEGER"); + + b.Property("Vin") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("LoggedErrors"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConnectDelayMilliseconds") + .HasColumnType("INTEGER"); + + b.Property("Endianess") + .HasColumnType("INTEGER"); + + b.Property("Host") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Port") + .HasColumnType("INTEGER"); + + b.Property("ReadTimeoutMilliseconds") + .HasColumnType("INTEGER"); + + b.Property("UnitIdentifier") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ModbusConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Address") + .HasColumnType("INTEGER"); + + b.Property("BitStartIndex") + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("InvertedByModbusResultConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Length") + .HasColumnType("INTEGER"); + + b.Property("ModbusConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("RegisterType") + .HasColumnType("INTEGER"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("ValueType") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("InvertedByModbusResultConfigurationId"); + + b.HasIndex("ModbusConfigurationId"); + + b.ToTable("ModbusResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Host") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Password") + .HasColumnType("TEXT"); + + b.Property("Port") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MqttConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("MqttConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("NodePattern") + .HasColumnType("TEXT"); + + b.Property("NodePatternType") + .HasColumnType("INTEGER"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("Topic") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("XmlAttributeHeaderName") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeHeaderValue") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeValueName") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MqttConfigurationId"); + + b.ToTable("MqttResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.PowerDistribution", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChargingPower") + .HasColumnType("INTEGER"); + + b.Property("GridProportion") + .HasColumnType("REAL"); + + b.Property("HandledChargeId") + .HasColumnType("INTEGER"); + + b.Property("PowerFromGrid") + .HasColumnType("INTEGER"); + + b.Property("TimeStamp") + .HasColumnType("TEXT"); + + b.Property("UsedWattHours") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("HandledChargeId"); + + b.ToTable("PowerDistributions"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("HttpMethod") + .HasColumnType("INTEGER"); + + b.Property("NodePatternType") + .HasColumnType("INTEGER"); + + b.Property("Url") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("RestValueConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfigurationHeader", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("RestValueConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Value") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("RestValueConfigurationId", "Key") + .IsUnique(); + + b.ToTable("RestValueConfigurationHeaders"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("NodePattern") + .HasColumnType("TEXT"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("RestValueConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("XmlAttributeHeaderName") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeHeaderValue") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeValueName") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("RestValueConfigurationId"); + + b.ToTable("RestValueResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.SpotPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("EndDate") + .HasColumnType("TEXT"); + + b.Property("Price") + .HasColumnType("TEXT"); + + b.Property("StartDate") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SpotPrices"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.TscConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Key") + .IsUnique(); + + b.ToTable("TscConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CarValueLog", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", "Car") + .WithMany("CarValueLogs") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingDetail", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", "ChargingProcess") + .WithMany("ChargingDetails") + .HasForeignKey("ChargingProcessId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ChargingProcess"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", "Car") + .WithMany("ChargingProcesses") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", "InvertedByModbusResultConfiguration") + .WithMany() + .HasForeignKey("InvertedByModbusResultConfigurationId"); + + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", "ModbusConfiguration") + .WithMany("ModbusResultConfigurations") + .HasForeignKey("ModbusConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("InvertedByModbusResultConfiguration"); + + b.Navigation("ModbusConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", "MqttConfiguration") + .WithMany("MqttResultConfigurations") + .HasForeignKey("MqttConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MqttConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.PowerDistribution", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", "HandledCharge") + .WithMany("PowerDistributions") + .HasForeignKey("HandledChargeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("HandledCharge"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfigurationHeader", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", "RestValueConfiguration") + .WithMany("Headers") + .HasForeignKey("RestValueConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("RestValueConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", "RestValueConfiguration") + .WithMany("RestValueResultConfigurations") + .HasForeignKey("RestValueConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("RestValueConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", b => + { + b.Navigation("CarValueLogs"); + + b.Navigation("ChargingProcesses"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.Navigation("ChargingDetails"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", b => + { + b.Navigation("PowerDistributions"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", b => + { + b.Navigation("ModbusResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", b => + { + b.Navigation("MqttResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", b => + { + b.Navigation("Headers"); + + b.Navigation("RestValueResultConfigurations"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/TeslaSolarCharger.Model/Migrations/20250113011813_AddIsFleetTelemetryHardwareIncompatibleToCars.cs b/TeslaSolarCharger.Model/Migrations/20250113011813_AddIsFleetTelemetryHardwareIncompatibleToCars.cs new file mode 100644 index 000000000..225f931f5 --- /dev/null +++ b/TeslaSolarCharger.Model/Migrations/20250113011813_AddIsFleetTelemetryHardwareIncompatibleToCars.cs @@ -0,0 +1,29 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace TeslaSolarCharger.Model.Migrations +{ + /// + public partial class AddIsFleetTelemetryHardwareIncompatibleToCars : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "IsFleetTelemetryHardwareIncompatible", + table: "Cars", + type: "INTEGER", + nullable: false, + defaultValue: false); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "IsFleetTelemetryHardwareIncompatible", + table: "Cars"); + } + } +} diff --git a/TeslaSolarCharger.Model/Migrations/20250113013705_RenameIncludeAdditionalFleetTelemtryFields.Designer.cs b/TeslaSolarCharger.Model/Migrations/20250113013705_RenameIncludeAdditionalFleetTelemtryFields.Designer.cs new file mode 100644 index 000000000..ae50a3815 --- /dev/null +++ b/TeslaSolarCharger.Model/Migrations/20250113013705_RenameIncludeAdditionalFleetTelemtryFields.Designer.cs @@ -0,0 +1,904 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using TeslaSolarCharger.Model.EntityFramework; + +#nullable disable + +namespace TeslaSolarCharger.Model.Migrations +{ + [DbContext(typeof(TeslaSolarChargerContext))] + [Migration("20250113013705_RenameIncludeAdditionalFleetTelemtryFields")] + partial class RenameIncludeAdditionalFleetTelemtryFields + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "8.0.10"); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.BackendNotification", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BackendIssueId") + .HasColumnType("INTEGER"); + + b.Property("DetailText") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Headline") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("IsConfirmed") + .HasColumnType("INTEGER"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.Property("ValidFromDate") + .HasColumnType("TEXT"); + + b.Property("ValidFromVersion") + .HasColumnType("TEXT"); + + b.Property("ValidToDate") + .HasColumnType("TEXT"); + + b.Property("ValidToVersion") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("BackendNotifications"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.BackendToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessToken") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ExpiresAtUtc") + .HasColumnType("TEXT"); + + b.Property("RefreshToken") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("BackendTokens"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CachedCarState", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("CarStateJson") + .HasColumnType("TEXT"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("LastUpdated") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("CachedCarStates"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BleApiBaseUrl") + .HasColumnType("TEXT"); + + b.Property("ChargeMode") + .HasColumnType("INTEGER"); + + b.Property("ChargeStartCalls") + .HasColumnType("TEXT"); + + b.Property("ChargeStopCalls") + .HasColumnType("TEXT"); + + b.Property("ChargerActualCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerPhases") + .HasColumnType("INTEGER"); + + b.Property("ChargerPilotCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerRequestedCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerVoltage") + .HasColumnType("INTEGER"); + + b.Property("ChargingPriority") + .HasColumnType("INTEGER"); + + b.Property("ClimateOn") + .HasColumnType("INTEGER"); + + b.Property("IgnoreLatestTimeToReachSocDate") + .HasColumnType("INTEGER"); + + b.Property("IgnoreLatestTimeToReachSocDateOnWeekend") + .HasColumnType("INTEGER"); + + b.Property("IncludeTrackingRelevantFields") + .HasColumnType("INTEGER"); + + b.Property("IsAvailableInTeslaAccount") + .HasColumnType("INTEGER"); + + b.Property("IsFleetTelemetryHardwareIncompatible") + .HasColumnType("INTEGER"); + + b.Property("LatestTimeToReachSoC") + .HasColumnType("TEXT"); + + b.Property("Latitude") + .HasColumnType("REAL"); + + b.Property("Longitude") + .HasColumnType("REAL"); + + b.Property("MaximumAmpere") + .HasColumnType("INTEGER"); + + b.Property("MinimumAmpere") + .HasColumnType("INTEGER"); + + b.Property("MinimumSoc") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("OtherCommandCalls") + .HasColumnType("TEXT"); + + b.Property("PluggedIn") + .HasColumnType("INTEGER"); + + b.Property("SetChargingAmpsCall") + .HasColumnType("TEXT"); + + b.Property("ShouldBeManaged") + .HasColumnType("INTEGER"); + + b.Property("SoC") + .HasColumnType("INTEGER"); + + b.Property("SocLimit") + .HasColumnType("INTEGER"); + + b.Property("State") + .HasColumnType("INTEGER"); + + b.Property("TeslaFleetApiState") + .HasColumnType("INTEGER"); + + b.Property("TeslaMateCarId") + .HasColumnType("INTEGER"); + + b.Property("UsableEnergy") + .HasColumnType("INTEGER"); + + b.Property("UseBle") + .HasColumnType("INTEGER"); + + b.Property("UseFleetTelemetry") + .HasColumnType("INTEGER"); + + b.Property("VehicleCalls") + .HasColumnType("TEXT"); + + b.Property("VehicleCommandProtocolRequired") + .HasColumnType("INTEGER"); + + b.Property("VehicleDataCalls") + .HasColumnType("TEXT"); + + b.Property("Vin") + .HasColumnType("TEXT"); + + b.Property("WakeUpCalls") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("TeslaMateCarId") + .IsUnique(); + + b.HasIndex("Vin") + .IsUnique(); + + b.ToTable("Cars"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CarValueLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BooleanValue") + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("DoubleValue") + .HasColumnType("REAL"); + + b.Property("IntValue") + .HasColumnType("INTEGER"); + + b.Property("InvalidValue") + .HasColumnType("INTEGER"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("StringValue") + .HasColumnType("TEXT"); + + b.Property("Timestamp") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.Property("UnknownValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.ToTable("CarValueLogs"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargePrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AddSpotPriceToGridPrice") + .HasColumnType("INTEGER"); + + b.Property("EnergyProvider") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(6); + + b.Property("EnergyProviderConfiguration") + .HasColumnType("TEXT"); + + b.Property("GridPrice") + .HasColumnType("TEXT"); + + b.Property("SolarPrice") + .HasColumnType("TEXT"); + + b.Property("SpotPriceCorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("ValidSince") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ChargePrices"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingDetail", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChargerVoltage") + .HasColumnType("INTEGER"); + + b.Property("ChargingProcessId") + .HasColumnType("INTEGER"); + + b.Property("GridPower") + .HasColumnType("INTEGER"); + + b.Property("HomeBatteryPower") + .HasColumnType("INTEGER"); + + b.Property("SolarPower") + .HasColumnType("INTEGER"); + + b.Property("TimeStamp") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChargingProcessId"); + + b.ToTable("ChargingDetails"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("Cost") + .HasColumnType("TEXT"); + + b.Property("EndDate") + .HasColumnType("TEXT"); + + b.Property("OldHandledChargeId") + .HasColumnType("INTEGER"); + + b.Property("StartDate") + .HasColumnType("TEXT"); + + b.Property("UsedGridEnergyKwh") + .HasColumnType("TEXT"); + + b.Property("UsedHomeBatteryEnergyKwh") + .HasColumnType("TEXT"); + + b.Property("UsedSolarEnergyKwh") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.ToTable("ChargingProcesses"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AverageSpotPrice") + .HasColumnType("TEXT"); + + b.Property("CalculatedPrice") + .HasColumnType("TEXT"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("ChargingProcessId") + .HasColumnType("INTEGER"); + + b.Property("UsedGridEnergy") + .HasColumnType("TEXT"); + + b.Property("UsedSolarEnergy") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("HandledCharges"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.LoggedError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DismissedAt") + .HasColumnType("TEXT"); + + b.Property("EndTimeStamp") + .HasColumnType("TEXT"); + + b.Property("FurtherOccurrences") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Headline") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("IssueKey") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Message") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("MethodName") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Source") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("StackTrace") + .HasColumnType("TEXT"); + + b.Property("StartTimeStamp") + .HasColumnType("TEXT"); + + b.Property("TelegramNotificationSent") + .HasColumnType("INTEGER"); + + b.Property("TelegramResolvedMessageSent") + .HasColumnType("INTEGER"); + + b.Property("Vin") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("LoggedErrors"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConnectDelayMilliseconds") + .HasColumnType("INTEGER"); + + b.Property("Endianess") + .HasColumnType("INTEGER"); + + b.Property("Host") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Port") + .HasColumnType("INTEGER"); + + b.Property("ReadTimeoutMilliseconds") + .HasColumnType("INTEGER"); + + b.Property("UnitIdentifier") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ModbusConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Address") + .HasColumnType("INTEGER"); + + b.Property("BitStartIndex") + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("InvertedByModbusResultConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Length") + .HasColumnType("INTEGER"); + + b.Property("ModbusConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("RegisterType") + .HasColumnType("INTEGER"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("ValueType") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("InvertedByModbusResultConfigurationId"); + + b.HasIndex("ModbusConfigurationId"); + + b.ToTable("ModbusResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Host") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Password") + .HasColumnType("TEXT"); + + b.Property("Port") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MqttConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("MqttConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("NodePattern") + .HasColumnType("TEXT"); + + b.Property("NodePatternType") + .HasColumnType("INTEGER"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("Topic") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("XmlAttributeHeaderName") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeHeaderValue") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeValueName") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MqttConfigurationId"); + + b.ToTable("MqttResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.PowerDistribution", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChargingPower") + .HasColumnType("INTEGER"); + + b.Property("GridProportion") + .HasColumnType("REAL"); + + b.Property("HandledChargeId") + .HasColumnType("INTEGER"); + + b.Property("PowerFromGrid") + .HasColumnType("INTEGER"); + + b.Property("TimeStamp") + .HasColumnType("TEXT"); + + b.Property("UsedWattHours") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("HandledChargeId"); + + b.ToTable("PowerDistributions"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("HttpMethod") + .HasColumnType("INTEGER"); + + b.Property("NodePatternType") + .HasColumnType("INTEGER"); + + b.Property("Url") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("RestValueConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfigurationHeader", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("RestValueConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Value") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("RestValueConfigurationId", "Key") + .IsUnique(); + + b.ToTable("RestValueConfigurationHeaders"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("NodePattern") + .HasColumnType("TEXT"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("RestValueConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("XmlAttributeHeaderName") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeHeaderValue") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeValueName") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("RestValueConfigurationId"); + + b.ToTable("RestValueResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.SpotPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("EndDate") + .HasColumnType("TEXT"); + + b.Property("Price") + .HasColumnType("TEXT"); + + b.Property("StartDate") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SpotPrices"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.TscConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Key") + .IsUnique(); + + b.ToTable("TscConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CarValueLog", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", "Car") + .WithMany("CarValueLogs") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingDetail", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", "ChargingProcess") + .WithMany("ChargingDetails") + .HasForeignKey("ChargingProcessId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ChargingProcess"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", "Car") + .WithMany("ChargingProcesses") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", "InvertedByModbusResultConfiguration") + .WithMany() + .HasForeignKey("InvertedByModbusResultConfigurationId"); + + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", "ModbusConfiguration") + .WithMany("ModbusResultConfigurations") + .HasForeignKey("ModbusConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("InvertedByModbusResultConfiguration"); + + b.Navigation("ModbusConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", "MqttConfiguration") + .WithMany("MqttResultConfigurations") + .HasForeignKey("MqttConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MqttConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.PowerDistribution", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", "HandledCharge") + .WithMany("PowerDistributions") + .HasForeignKey("HandledChargeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("HandledCharge"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfigurationHeader", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", "RestValueConfiguration") + .WithMany("Headers") + .HasForeignKey("RestValueConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("RestValueConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", "RestValueConfiguration") + .WithMany("RestValueResultConfigurations") + .HasForeignKey("RestValueConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("RestValueConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", b => + { + b.Navigation("CarValueLogs"); + + b.Navigation("ChargingProcesses"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.Navigation("ChargingDetails"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", b => + { + b.Navigation("PowerDistributions"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", b => + { + b.Navigation("ModbusResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", b => + { + b.Navigation("MqttResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", b => + { + b.Navigation("Headers"); + + b.Navigation("RestValueResultConfigurations"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/TeslaSolarCharger.Model/Migrations/20250113013705_RenameIncludeAdditionalFleetTelemtryFields.cs b/TeslaSolarCharger.Model/Migrations/20250113013705_RenameIncludeAdditionalFleetTelemtryFields.cs new file mode 100644 index 000000000..8c2c46c0e --- /dev/null +++ b/TeslaSolarCharger.Model/Migrations/20250113013705_RenameIncludeAdditionalFleetTelemtryFields.cs @@ -0,0 +1,28 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace TeslaSolarCharger.Model.Migrations +{ + /// + public partial class RenameIncludeAdditionalFleetTelemtryFields : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.RenameColumn( + name: "UseFleetTelemetryForLocationData", + table: "Cars", + newName: "IncludeTrackingRelevantFields"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.RenameColumn( + name: "IncludeTrackingRelevantFields", + table: "Cars", + newName: "UseFleetTelemetryForLocationData"); + } + } +} diff --git a/TeslaSolarCharger.Model/Migrations/20250113103656_UseCalueConverterForDateLists.Designer.cs b/TeslaSolarCharger.Model/Migrations/20250113103656_UseCalueConverterForDateLists.Designer.cs new file mode 100644 index 000000000..5e028fa29 --- /dev/null +++ b/TeslaSolarCharger.Model/Migrations/20250113103656_UseCalueConverterForDateLists.Designer.cs @@ -0,0 +1,911 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using TeslaSolarCharger.Model.EntityFramework; + +#nullable disable + +namespace TeslaSolarCharger.Model.Migrations +{ + [DbContext(typeof(TeslaSolarChargerContext))] + [Migration("20250113103656_UseCalueConverterForDateLists")] + partial class UseCalueConverterForDateLists + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "8.0.10"); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.BackendNotification", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BackendIssueId") + .HasColumnType("INTEGER"); + + b.Property("DetailText") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Headline") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("IsConfirmed") + .HasColumnType("INTEGER"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.Property("ValidFromDate") + .HasColumnType("TEXT"); + + b.Property("ValidFromVersion") + .HasColumnType("TEXT"); + + b.Property("ValidToDate") + .HasColumnType("TEXT"); + + b.Property("ValidToVersion") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("BackendNotifications"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.BackendToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessToken") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ExpiresAtUtc") + .HasColumnType("TEXT"); + + b.Property("RefreshToken") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("BackendTokens"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CachedCarState", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("CarStateJson") + .HasColumnType("TEXT"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("LastUpdated") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("CachedCarStates"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BleApiBaseUrl") + .HasColumnType("TEXT"); + + b.Property("ChargeMode") + .HasColumnType("INTEGER"); + + b.Property("ChargeStartCalls") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ChargeStopCalls") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ChargerActualCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerPhases") + .HasColumnType("INTEGER"); + + b.Property("ChargerPilotCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerRequestedCurrent") + .HasColumnType("INTEGER"); + + b.Property("ChargerVoltage") + .HasColumnType("INTEGER"); + + b.Property("ChargingPriority") + .HasColumnType("INTEGER"); + + b.Property("ClimateOn") + .HasColumnType("INTEGER"); + + b.Property("IgnoreLatestTimeToReachSocDate") + .HasColumnType("INTEGER"); + + b.Property("IgnoreLatestTimeToReachSocDateOnWeekend") + .HasColumnType("INTEGER"); + + b.Property("IncludeTrackingRelevantFields") + .HasColumnType("INTEGER"); + + b.Property("IsAvailableInTeslaAccount") + .HasColumnType("INTEGER"); + + b.Property("IsFleetTelemetryHardwareIncompatible") + .HasColumnType("INTEGER"); + + b.Property("LatestTimeToReachSoC") + .HasColumnType("TEXT"); + + b.Property("Latitude") + .HasColumnType("REAL"); + + b.Property("Longitude") + .HasColumnType("REAL"); + + b.Property("MaximumAmpere") + .HasColumnType("INTEGER"); + + b.Property("MinimumAmpere") + .HasColumnType("INTEGER"); + + b.Property("MinimumSoc") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("OtherCommandCalls") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PluggedIn") + .HasColumnType("INTEGER"); + + b.Property("SetChargingAmpsCall") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ShouldBeManaged") + .HasColumnType("INTEGER"); + + b.Property("SoC") + .HasColumnType("INTEGER"); + + b.Property("SocLimit") + .HasColumnType("INTEGER"); + + b.Property("State") + .HasColumnType("INTEGER"); + + b.Property("TeslaFleetApiState") + .HasColumnType("INTEGER"); + + b.Property("TeslaMateCarId") + .HasColumnType("INTEGER"); + + b.Property("UsableEnergy") + .HasColumnType("INTEGER"); + + b.Property("UseBle") + .HasColumnType("INTEGER"); + + b.Property("UseFleetTelemetry") + .HasColumnType("INTEGER"); + + b.Property("VehicleCalls") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("VehicleCommandProtocolRequired") + .HasColumnType("INTEGER"); + + b.Property("VehicleDataCalls") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Vin") + .HasColumnType("TEXT"); + + b.Property("WakeUpCalls") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("TeslaMateCarId") + .IsUnique(); + + b.HasIndex("Vin") + .IsUnique(); + + b.ToTable("Cars"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CarValueLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("BooleanValue") + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("DoubleValue") + .HasColumnType("REAL"); + + b.Property("IntValue") + .HasColumnType("INTEGER"); + + b.Property("InvalidValue") + .HasColumnType("INTEGER"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("StringValue") + .HasColumnType("TEXT"); + + b.Property("Timestamp") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.Property("UnknownValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.ToTable("CarValueLogs"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargePrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AddSpotPriceToGridPrice") + .HasColumnType("INTEGER"); + + b.Property("EnergyProvider") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(6); + + b.Property("EnergyProviderConfiguration") + .HasColumnType("TEXT"); + + b.Property("GridPrice") + .HasColumnType("TEXT"); + + b.Property("SolarPrice") + .HasColumnType("TEXT"); + + b.Property("SpotPriceCorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("ValidSince") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ChargePrices"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingDetail", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChargerVoltage") + .HasColumnType("INTEGER"); + + b.Property("ChargingProcessId") + .HasColumnType("INTEGER"); + + b.Property("GridPower") + .HasColumnType("INTEGER"); + + b.Property("HomeBatteryPower") + .HasColumnType("INTEGER"); + + b.Property("SolarPower") + .HasColumnType("INTEGER"); + + b.Property("TimeStamp") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChargingProcessId"); + + b.ToTable("ChargingDetails"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("Cost") + .HasColumnType("TEXT"); + + b.Property("EndDate") + .HasColumnType("TEXT"); + + b.Property("OldHandledChargeId") + .HasColumnType("INTEGER"); + + b.Property("StartDate") + .HasColumnType("TEXT"); + + b.Property("UsedGridEnergyKwh") + .HasColumnType("TEXT"); + + b.Property("UsedHomeBatteryEnergyKwh") + .HasColumnType("TEXT"); + + b.Property("UsedSolarEnergyKwh") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.ToTable("ChargingProcesses"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AverageSpotPrice") + .HasColumnType("TEXT"); + + b.Property("CalculatedPrice") + .HasColumnType("TEXT"); + + b.Property("CarId") + .HasColumnType("INTEGER"); + + b.Property("ChargingProcessId") + .HasColumnType("INTEGER"); + + b.Property("UsedGridEnergy") + .HasColumnType("TEXT"); + + b.Property("UsedSolarEnergy") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("HandledCharges"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.LoggedError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DismissedAt") + .HasColumnType("TEXT"); + + b.Property("EndTimeStamp") + .HasColumnType("TEXT"); + + b.Property("FurtherOccurrences") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Headline") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("IssueKey") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Message") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("MethodName") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Source") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("StackTrace") + .HasColumnType("TEXT"); + + b.Property("StartTimeStamp") + .HasColumnType("TEXT"); + + b.Property("TelegramNotificationSent") + .HasColumnType("INTEGER"); + + b.Property("TelegramResolvedMessageSent") + .HasColumnType("INTEGER"); + + b.Property("Vin") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("LoggedErrors"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConnectDelayMilliseconds") + .HasColumnType("INTEGER"); + + b.Property("Endianess") + .HasColumnType("INTEGER"); + + b.Property("Host") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Port") + .HasColumnType("INTEGER"); + + b.Property("ReadTimeoutMilliseconds") + .HasColumnType("INTEGER"); + + b.Property("UnitIdentifier") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ModbusConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Address") + .HasColumnType("INTEGER"); + + b.Property("BitStartIndex") + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("InvertedByModbusResultConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Length") + .HasColumnType("INTEGER"); + + b.Property("ModbusConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("RegisterType") + .HasColumnType("INTEGER"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("ValueType") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("InvertedByModbusResultConfigurationId"); + + b.HasIndex("ModbusConfigurationId"); + + b.ToTable("ModbusResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Host") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Password") + .HasColumnType("TEXT"); + + b.Property("Port") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MqttConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("MqttConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("NodePattern") + .HasColumnType("TEXT"); + + b.Property("NodePatternType") + .HasColumnType("INTEGER"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("Topic") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("XmlAttributeHeaderName") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeHeaderValue") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeValueName") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MqttConfigurationId"); + + b.ToTable("MqttResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.PowerDistribution", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChargingPower") + .HasColumnType("INTEGER"); + + b.Property("GridProportion") + .HasColumnType("REAL"); + + b.Property("HandledChargeId") + .HasColumnType("INTEGER"); + + b.Property("PowerFromGrid") + .HasColumnType("INTEGER"); + + b.Property("TimeStamp") + .HasColumnType("TEXT"); + + b.Property("UsedWattHours") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("HandledChargeId"); + + b.ToTable("PowerDistributions"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("HttpMethod") + .HasColumnType("INTEGER"); + + b.Property("NodePatternType") + .HasColumnType("INTEGER"); + + b.Property("Url") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("RestValueConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfigurationHeader", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("RestValueConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("Value") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("RestValueConfigurationId", "Key") + .IsUnique(); + + b.ToTable("RestValueConfigurationHeaders"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueResultConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CorrectionFactor") + .HasColumnType("TEXT"); + + b.Property("NodePattern") + .HasColumnType("TEXT"); + + b.Property("Operator") + .HasColumnType("INTEGER"); + + b.Property("RestValueConfigurationId") + .HasColumnType("INTEGER"); + + b.Property("UsedFor") + .HasColumnType("INTEGER"); + + b.Property("XmlAttributeHeaderName") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeHeaderValue") + .HasColumnType("TEXT"); + + b.Property("XmlAttributeValueName") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("RestValueConfigurationId"); + + b.ToTable("RestValueResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.SpotPrice", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("EndDate") + .HasColumnType("TEXT"); + + b.Property("Price") + .HasColumnType("TEXT"); + + b.Property("StartDate") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SpotPrices"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.TscConfiguration", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Key") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Key") + .IsUnique(); + + b.ToTable("TscConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CarValueLog", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", "Car") + .WithMany("CarValueLogs") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingDetail", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", "ChargingProcess") + .WithMany("ChargingDetails") + .HasForeignKey("ChargingProcessId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ChargingProcess"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", "Car") + .WithMany("ChargingProcesses") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusResultConfiguration", "InvertedByModbusResultConfiguration") + .WithMany() + .HasForeignKey("InvertedByModbusResultConfigurationId"); + + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", "ModbusConfiguration") + .WithMany("ModbusResultConfigurations") + .HasForeignKey("ModbusConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("InvertedByModbusResultConfiguration"); + + b.Navigation("ModbusConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", "MqttConfiguration") + .WithMany("MqttResultConfigurations") + .HasForeignKey("MqttConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MqttConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.PowerDistribution", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", "HandledCharge") + .WithMany("PowerDistributions") + .HasForeignKey("HandledChargeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("HandledCharge"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfigurationHeader", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", "RestValueConfiguration") + .WithMany("Headers") + .HasForeignKey("RestValueConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("RestValueConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueResultConfiguration", b => + { + b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", "RestValueConfiguration") + .WithMany("RestValueResultConfigurations") + .HasForeignKey("RestValueConfigurationId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("RestValueConfiguration"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.Car", b => + { + b.Navigation("CarValueLogs"); + + b.Navigation("ChargingProcesses"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ChargingProcess", b => + { + b.Navigation("ChargingDetails"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", b => + { + b.Navigation("PowerDistributions"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.ModbusConfiguration", b => + { + b.Navigation("ModbusResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.MqttConfiguration", b => + { + b.Navigation("MqttResultConfigurations"); + }); + + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.RestValueConfiguration", b => + { + b.Navigation("Headers"); + + b.Navigation("RestValueResultConfigurations"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/TeslaSolarCharger.Model/Migrations/20250113103656_UseCalueConverterForDateLists.cs b/TeslaSolarCharger.Model/Migrations/20250113103656_UseCalueConverterForDateLists.cs new file mode 100644 index 000000000..7b287cb89 --- /dev/null +++ b/TeslaSolarCharger.Model/Migrations/20250113103656_UseCalueConverterForDateLists.cs @@ -0,0 +1,144 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace TeslaSolarCharger.Model.Migrations +{ + /// + public partial class UseCalueConverterForDateLists : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AlterColumn( + name: "WakeUpCalls", + table: "Cars", + type: "TEXT", + nullable: false, + defaultValue: "[]", + oldClrType: typeof(string), + oldType: "TEXT", + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "VehicleDataCalls", + table: "Cars", + type: "TEXT", + nullable: false, + defaultValue: "[]", + oldClrType: typeof(string), + oldType: "TEXT", + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "VehicleCalls", + table: "Cars", + type: "TEXT", + nullable: false, + defaultValue: "[]", + oldClrType: typeof(string), + oldType: "TEXT", + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "SetChargingAmpsCall", + table: "Cars", + type: "TEXT", + nullable: false, + defaultValue: "[]", + oldClrType: typeof(string), + oldType: "TEXT", + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "OtherCommandCalls", + table: "Cars", + type: "TEXT", + nullable: false, + defaultValue: "[]", + oldClrType: typeof(string), + oldType: "TEXT", + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "ChargeStopCalls", + table: "Cars", + type: "TEXT", + nullable: false, + defaultValue: "[]", + oldClrType: typeof(string), + oldType: "TEXT", + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "ChargeStartCalls", + table: "Cars", + type: "TEXT", + nullable: false, + defaultValue: "[]", + oldClrType: typeof(string), + oldType: "TEXT", + oldNullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.AlterColumn( + name: "WakeUpCalls", + table: "Cars", + type: "TEXT", + nullable: true, + oldClrType: typeof(string), + oldType: "TEXT"); + + migrationBuilder.AlterColumn( + name: "VehicleDataCalls", + table: "Cars", + type: "TEXT", + nullable: true, + oldClrType: typeof(string), + oldType: "TEXT"); + + migrationBuilder.AlterColumn( + name: "VehicleCalls", + table: "Cars", + type: "TEXT", + nullable: true, + oldClrType: typeof(string), + oldType: "TEXT"); + + migrationBuilder.AlterColumn( + name: "SetChargingAmpsCall", + table: "Cars", + type: "TEXT", + nullable: true, + oldClrType: typeof(string), + oldType: "TEXT"); + + migrationBuilder.AlterColumn( + name: "OtherCommandCalls", + table: "Cars", + type: "TEXT", + nullable: true, + oldClrType: typeof(string), + oldType: "TEXT"); + + migrationBuilder.AlterColumn( + name: "ChargeStopCalls", + table: "Cars", + type: "TEXT", + nullable: true, + oldClrType: typeof(string), + oldType: "TEXT"); + + migrationBuilder.AlterColumn( + name: "ChargeStartCalls", + table: "Cars", + type: "TEXT", + nullable: true, + oldClrType: typeof(string), + oldType: "TEXT"); + } + } +} diff --git a/TeslaSolarCharger.Model/Migrations/TeslaSolarChargerContextModelSnapshot.cs b/TeslaSolarCharger.Model/Migrations/TeslaSolarChargerContextModelSnapshot.cs index e4f729503..08fee2e39 100644 --- a/TeslaSolarCharger.Model/Migrations/TeslaSolarChargerContextModelSnapshot.cs +++ b/TeslaSolarCharger.Model/Migrations/TeslaSolarChargerContextModelSnapshot.cs @@ -57,6 +57,28 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("BackendNotifications"); }); + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.BackendToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessToken") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ExpiresAtUtc") + .HasColumnType("TEXT"); + + b.Property("RefreshToken") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("BackendTokens"); + }); + modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.CachedCarState", b => { b.Property("Id") @@ -94,9 +116,11 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("INTEGER"); b.Property("ChargeStartCalls") + .IsRequired() .HasColumnType("TEXT"); b.Property("ChargeStopCalls") + .IsRequired() .HasColumnType("TEXT"); b.Property("ChargerActualCurrent") @@ -114,27 +138,27 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("ChargerVoltage") .HasColumnType("INTEGER"); - b.Property("ChargingCommandsRateLimitedUntil") - .HasColumnType("TEXT"); - b.Property("ChargingPriority") .HasColumnType("INTEGER"); b.Property("ClimateOn") .HasColumnType("INTEGER"); - b.Property("CommandsRateLimitedUntil") - .HasColumnType("TEXT"); - b.Property("IgnoreLatestTimeToReachSocDate") .HasColumnType("INTEGER"); b.Property("IgnoreLatestTimeToReachSocDateOnWeekend") .HasColumnType("INTEGER"); + b.Property("IncludeTrackingRelevantFields") + .HasColumnType("INTEGER"); + b.Property("IsAvailableInTeslaAccount") .HasColumnType("INTEGER"); + b.Property("IsFleetTelemetryHardwareIncompatible") + .HasColumnType("INTEGER"); + b.Property("LatestTimeToReachSoC") .HasColumnType("TEXT"); @@ -157,12 +181,14 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("TEXT"); b.Property("OtherCommandCalls") + .IsRequired() .HasColumnType("TEXT"); b.Property("PluggedIn") .HasColumnType("INTEGER"); b.Property("SetChargingAmpsCall") + .IsRequired() .HasColumnType("TEXT"); b.Property("ShouldBeManaged") @@ -192,31 +218,22 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("UseFleetTelemetry") .HasColumnType("INTEGER"); - b.Property("UseFleetTelemetryForLocationData") - .HasColumnType("INTEGER"); - b.Property("VehicleCalls") + .IsRequired() .HasColumnType("TEXT"); b.Property("VehicleCommandProtocolRequired") .HasColumnType("INTEGER"); b.Property("VehicleDataCalls") - .HasColumnType("TEXT"); - - b.Property("VehicleDataRateLimitedUntil") - .HasColumnType("TEXT"); - - b.Property("VehicleRateLimitedUntil") + .IsRequired() .HasColumnType("TEXT"); b.Property("Vin") .HasColumnType("TEXT"); b.Property("WakeUpCalls") - .HasColumnType("TEXT"); - - b.Property("WakeUpRateLimitedUntil") + .IsRequired() .HasColumnType("TEXT"); b.HasKey("Id"); @@ -737,38 +754,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("SpotPrices"); }); - modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.TeslaToken", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("INTEGER"); - - b.Property("AccessToken") - .IsRequired() - .HasColumnType("TEXT"); - - b.Property("ExpiresAtUtc") - .HasColumnType("TEXT"); - - b.Property("IdToken") - .IsRequired() - .HasColumnType("TEXT"); - - b.Property("RefreshToken") - .IsRequired() - .HasColumnType("TEXT"); - - b.Property("Region") - .HasColumnType("INTEGER"); - - b.Property("UnauthorizedCounter") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.ToTable("TeslaTokens"); - }); - modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.TscConfiguration", b => { b.Property("Id") diff --git a/TeslaSolarCharger.Services/Services/Modbus/ModbusValueConfigurationService.cs b/TeslaSolarCharger.Services/Services/Modbus/ModbusValueConfigurationService.cs index 85d118496..d5a7b0614 100644 --- a/TeslaSolarCharger.Services/Services/Modbus/ModbusValueConfigurationService.cs +++ b/TeslaSolarCharger.Services/Services/Modbus/ModbusValueConfigurationService.cs @@ -6,27 +6,29 @@ using TeslaSolarCharger.Model.Entities.TeslaSolarCharger; using TeslaSolarCharger.Services.Services.Modbus.Contracts; using TeslaSolarCharger.Shared.Dtos.ModbusConfiguration; -using TeslaSolarCharger.SharedBackend.MappingExtensions; namespace TeslaSolarCharger.Services.Services.Modbus; public class ModbusValueConfigurationService ( ILogger logger, ITeslaSolarChargerContext context, - IMapperConfigurationFactory mapperConfigurationFactory, IModbusClientHandlingService modbusClientHandlingService) : IModbusValueConfigurationService { public async Task> GetModbusConfigurationByPredicate(Expression> predicate) { logger.LogTrace("{method}({predicate})", nameof(GetModbusConfigurationByPredicate), predicate); - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - ; - }); var resultConfigurations = await context.ModbusConfigurations .Where(predicate) - .ProjectTo(mapper) + .Select(c => new DtoModbusConfiguration() + { + Id = c.Id, + UnitIdentifier = c.UnitIdentifier, + Host = c.Host, + Port = c.Port, + Endianess = c.Endianess, + ConnectDelayMilliseconds = c.ConnectDelayMilliseconds, + ReadTimeoutMilliseconds = c.ReadTimeoutMilliseconds + }) .ToListAsync().ConfigureAwait(false); return resultConfigurations; } @@ -42,14 +44,21 @@ public async Task> GetModbusResultConfig Expression> predicate) { logger.LogTrace("{method}({predicate})", nameof(GetModbusResultConfigurationsByPredicate), predicate); - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - ; - }); var resultConfigurations = await context.ModbusResultConfigurations .Where(predicate) - .ProjectTo(mapper) + .Select(e => new DtoModbusValueResultConfiguration() + { + Id = e.Id, + CorrectionFactor = e.CorrectionFactor, + UsedFor = e.UsedFor, + Operator = e.Operator, + RegisterType = e.RegisterType, + ValueType = e.ValueType, + Address = e.Address, + Length = e.Length, + BitStartIndex = e.BitStartIndex, + InvertedByModbusResultConfigurationId = e.InvertedByModbusResultConfigurationId, + }) .ToListAsync().ConfigureAwait(false); return resultConfigurations; } @@ -64,14 +73,20 @@ public async Task> GetResultConfiguratio public async Task SaveModbusResultConfiguration(int parentId, DtoModbusValueResultConfiguration dtoData) { logger.LogTrace("{method}({parentId}, {@dtoData})", nameof(SaveModbusResultConfiguration), parentId, dtoData); - var mapperConfiguration = mapperConfigurationFactory.Create(cfg => + var dbData = new ModbusResultConfiguration() { - cfg.CreateMap() - ; - }); - - var mapper = mapperConfiguration.CreateMapper(); - var dbData = mapper.Map(dtoData); + Id = dtoData.Id, + CorrectionFactor = dtoData.CorrectionFactor, + UsedFor = dtoData.UsedFor, + Operator = dtoData.Operator, + RegisterType = dtoData.RegisterType, + ValueType = dtoData.ValueType, + Address = dtoData.Address, + Length = dtoData.Length, + BitStartIndex = dtoData.BitStartIndex, + ModbusConfigurationId = parentId, + InvertedByModbusResultConfigurationId = dtoData.InvertedByModbusResultConfigurationId, + }; dbData.ModbusConfigurationId = parentId; var trackedData = context.ChangeTracker.Entries() .FirstOrDefault(e => e.Entity.Id == dbData.Id); @@ -116,11 +131,6 @@ public async Task DeleteResultConfiguration(int id) public async Task SaveModbusConfiguration(DtoModbusConfiguration dtoData) { logger.LogTrace("{method}({@dtoData})", nameof(SaveModbusConfiguration), dtoData); - var mapperConfiguration = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - ; - }); if (dtoData.Id != default) { modbusClientHandlingService.RemoveClient(dtoData.Host, dtoData.Port); @@ -130,8 +140,16 @@ public async Task SaveModbusConfiguration(DtoModbusConfiguration dtoData) modbusClientHandlingService.RemoveClient(hostPortCombination.Host, hostPortCombination.Port); } - var mapper = mapperConfiguration.CreateMapper(); - var dbData = mapper.Map(dtoData); + var dbData = new ModbusConfiguration() + { + Id = dtoData.Id, + UnitIdentifier = dtoData.UnitIdentifier ?? 0, + Host = dtoData.Host, + Port = dtoData.Port, + Endianess = dtoData.Endianess, + ConnectDelayMilliseconds = dtoData.ConnectDelayMilliseconds, + ReadTimeoutMilliseconds = dtoData.ReadTimeoutMilliseconds + }; if (dbData.Id == default) { context.ModbusConfigurations.Add(dbData); diff --git a/TeslaSolarCharger.Services/Services/Mqtt/MqttConfigurationService.cs b/TeslaSolarCharger.Services/Services/Mqtt/MqttConfigurationService.cs index 7a84640bc..fb15d3efe 100644 --- a/TeslaSolarCharger.Services/Services/Mqtt/MqttConfigurationService.cs +++ b/TeslaSolarCharger.Services/Services/Mqtt/MqttConfigurationService.cs @@ -9,26 +9,26 @@ using TeslaSolarCharger.Services.Services.Mqtt.Contracts; using TeslaSolarCharger.Shared.Dtos.ModbusConfiguration; using TeslaSolarCharger.Shared.Dtos.MqttConfiguration; -using TeslaSolarCharger.SharedBackend.MappingExtensions; namespace TeslaSolarCharger.Services.Services.Mqtt; public class MqttConfigurationService(ILogger logger, ITeslaSolarChargerContext context, - IMapperConfigurationFactory mapperConfigurationFactory, IMqttClientHandlingService mqttClientHandlingService) : IMqttConfigurationService { public async Task> GetMqttConfigurationsByPredicate(Expression> predicate) { logger.LogTrace("{method}({predicate})", nameof(GetMqttConfigurationsByPredicate), predicate); - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - ; - }); var resultConfigurations = await context.MqttConfigurations .Where(predicate) - .ProjectTo(mapper) + .Select(e => new DtoMqttConfiguration() + { + Id = e.Id, + Host = e.Host, + Port = e.Port, + Username = e.Username, + Password = e.Password, + }) .ToListAsync().ConfigureAwait(false); return resultConfigurations; } @@ -43,19 +43,20 @@ public async Task GetConfigurationById(int id) public async Task SaveConfiguration(DtoMqttConfiguration dtoData) { logger.LogTrace("{method}({@dtoData})", nameof(SaveConfiguration), dtoData); - var mapperConfiguration = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - ; - }); if (dtoData.Id != default) { mqttClientHandlingService.RemoveClient(dtoData.Host, dtoData.Port, dtoData.Username); RemoveMqttClientsByConfigurationId(dtoData.Id); } - var mapper = mapperConfiguration.CreateMapper(); - var dbData = mapper.Map(dtoData); + var dbData = new MqttConfiguration() + { + Id = dtoData.Id, + Host = dtoData.Host, + Port = dtoData.Port, + Username = dtoData.Username, + Password = dtoData.Password, + }; if (dbData.Id == default) { context.MqttConfigurations.Add(dbData); @@ -85,14 +86,21 @@ public async Task DeleteConfiguration(int id) public async Task> GetMqttResultConfigurationsByPredicate(Expression> predicate) { logger.LogTrace("{method}({predicate})", nameof(GetMqttResultConfigurationsByPredicate), predicate); - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - ; - }); var resultConfigurations = await context.MqttResultConfigurations .Where(predicate) - .ProjectTo(mapper) + .Select(e => new DtoMqttResultConfiguration() + { + Id = e.Id, + CorrectionFactor = e.CorrectionFactor, + UsedFor = e.UsedFor, + Operator = e.Operator, + NodePattern = e.NodePattern, + XmlAttributeHeaderName = e.XmlAttributeHeaderName, + XmlAttributeHeaderValue = e.XmlAttributeHeaderValue, + XmlAttributeValueName = e.XmlAttributeValueName, + Topic = e.Topic, + NodePatternType = e.NodePatternType, + }) .ToListAsync().ConfigureAwait(false); return resultConfigurations; } @@ -107,14 +115,20 @@ public async Task> GetResultConfigurationsByPar public async Task SaveResultConfiguration(int parentId, DtoMqttResultConfiguration dtoData) { logger.LogTrace("{method}({@dtoData})", nameof(SaveResultConfiguration), dtoData); - var mapperConfiguration = mapperConfigurationFactory.Create(cfg => + var dbData = new MqttResultConfiguration { - cfg.CreateMap() - ; - }); - var mapper = mapperConfiguration.CreateMapper(); - var dbData = mapper.Map(dtoData); - dbData.MqttConfigurationId = parentId; + Id = dtoData.Id, + CorrectionFactor = dtoData.CorrectionFactor, + UsedFor = dtoData.UsedFor, + Operator = dtoData.Operator, + NodePattern = dtoData.NodePattern, + XmlAttributeHeaderName = dtoData.XmlAttributeHeaderName, + XmlAttributeHeaderValue = dtoData.XmlAttributeHeaderValue, + XmlAttributeValueName = dtoData.XmlAttributeValueName, + Topic = dtoData.Topic, + NodePatternType = dtoData.NodePatternType, + MqttConfigurationId = parentId, + }; if (dbData.Id == default) { context.MqttResultConfigurations.Add(dbData); diff --git a/TeslaSolarCharger.Services/Services/Rest/RestValueConfigurationService.cs b/TeslaSolarCharger.Services/Services/Rest/RestValueConfigurationService.cs index bd82b2cf8..487297161 100644 --- a/TeslaSolarCharger.Services/Services/Rest/RestValueConfigurationService.cs +++ b/TeslaSolarCharger.Services/Services/Rest/RestValueConfigurationService.cs @@ -6,26 +6,24 @@ using TeslaSolarCharger.Model.Entities.TeslaSolarCharger; using TeslaSolarCharger.Services.Services.Rest.Contracts; using TeslaSolarCharger.Shared.Dtos.RestValueConfiguration; -using TeslaSolarCharger.SharedBackend.MappingExtensions; namespace TeslaSolarCharger.Services.Services.Rest; public class RestValueConfigurationService( ILogger logger, - ITeslaSolarChargerContext context, - IMapperConfigurationFactory mapperConfigurationFactory) : IRestValueConfigurationService + ITeslaSolarChargerContext context) : IRestValueConfigurationService { public async Task> GetAllRestValueConfigurations() { logger.LogTrace("{method}()", nameof(GetAllRestValueConfigurations)); - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - ; - }); - var result = await context.RestValueConfigurations - .ProjectTo(mapper) + .Select(e => new DtoRestValueConfiguration() + { + Id = e.Id, + Url = e.Url, + NodePatternType = e.NodePatternType, + HttpMethod = e.HttpMethod, + }) .ToListAsync().ConfigureAwait(false); return result; } @@ -34,16 +32,21 @@ public async Task> GetFullRestValueConfigura Expression> predicate) { logger.LogTrace("{method}({predicate})", nameof(GetFullRestValueConfigurationsByPredicate), predicate); - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap(); - cfg.CreateMap() - .ForMember(d => d.Headers, opt => opt.MapFrom(s => s.Headers)) - ; - }); var restValueConfigurations = await context.RestValueConfigurations .Where(predicate) - .ProjectTo(mapper) + .Select(c => new DtoFullRestValueConfiguration() + { + Id = c.Id, + Url = c.Url, + NodePatternType = c.NodePatternType, + HttpMethod = c.HttpMethod, + Headers = c.Headers.Select(h => new DtoRestValueConfigurationHeader() + { + Id = h.Id, + Key = h.Key, + Value = h.Value, + }).ToList(), + }) .ToListAsync().ConfigureAwait(false); return restValueConfigurations; } @@ -51,15 +54,19 @@ public async Task> GetFullRestValueConfigura public async Task> GetRestResultConfigurationByPredicate( Expression> predicate) { - - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - ; - }); var resultConfigurations = await context.RestValueResultConfigurations .Where(predicate) - .ProjectTo(mapper) + .Select(e => new DtoJsonXmlResultConfiguration() + { + Id = e.Id, + CorrectionFactor = e.CorrectionFactor, + UsedFor = e.UsedFor, + Operator = e.Operator, + NodePattern = e.NodePattern, + XmlAttributeHeaderName = e.XmlAttributeHeaderName, + XmlAttributeHeaderValue = e.XmlAttributeHeaderValue, + XmlAttributeValueName = e.XmlAttributeValueName, + }) .ToListAsync().ConfigureAwait(false); return resultConfigurations; } @@ -67,14 +74,10 @@ public async Task> GetRestResultConfiguratio public async Task SaveRestValueConfiguration(DtoFullRestValueConfiguration dtoData) { logger.LogTrace("{method}({@dtoData})", nameof(SaveRestValueConfiguration), dtoData); - var mapperConfiguration = mapperConfigurationFactory.Create(cfg => + var dbData = new RestValueConfiguration() { - cfg.CreateMap() - ; - }); - - var mapper = mapperConfiguration.CreateMapper(); - var dbData = mapper.Map(dtoData); + Id = dtoData.Id, Url = dtoData.Url, NodePatternType = dtoData.NodePatternType, HttpMethod = dtoData.HttpMethod, + }; if (dbData.Id == default) { context.RestValueConfigurations.Add(dbData); @@ -89,15 +92,9 @@ public async Task SaveRestValueConfiguration(DtoFullRestValueConfiguration context.RestValueConfigurationHeaders.RemoveRange(headersToRemove); context.RestValueConfigurations.Update(dbData); } - var headerMapperConfiguration = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - ; - }); - var headerMapper = headerMapperConfiguration.CreateMapper(); foreach (var dtoHeader in dtoData.Headers) { - var dbHeader = headerMapper.Map(dtoHeader); + var dbHeader = new RestValueConfigurationHeader() { Id = dtoHeader.Id, Key = dtoHeader.Key, Value = dtoHeader.Value, }; if (dbData.Id == default) { dbData.Headers.Add(dbHeader); @@ -122,29 +119,27 @@ public async Task SaveRestValueConfiguration(DtoFullRestValueConfiguration public async Task> GetHeadersByConfigurationId(int parentId) { logger.LogTrace("{method}({parentId})", nameof(GetHeadersByConfigurationId), parentId); - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - ; - }); return await context.RestValueConfigurationHeaders .Where(x => x.RestValueConfigurationId == parentId) - .ProjectTo(mapper) + .Select(e => new DtoRestValueConfigurationHeader() + { + Id = e.Id, + Key = e.Key, + Value = e.Value, + }) .ToListAsync().ConfigureAwait(false); } public async Task SaveHeader(int parentId, DtoRestValueConfigurationHeader dtoData) { logger.LogTrace("{method}({@dtoData})", nameof(SaveHeader), dtoData); - var mapperConfiguration = mapperConfigurationFactory.Create(cfg => + var dbData = new RestValueConfigurationHeader { - cfg.CreateMap() - ; - }); - - var mapper = mapperConfiguration.CreateMapper(); - var dbData = mapper.Map(dtoData); - dbData.RestValueConfigurationId = parentId; + Id = dtoData.Id, + Key = dtoData.Key, + Value = dtoData.Value, + RestValueConfigurationId = parentId, + }; if (dbData.Id == default) { context.RestValueConfigurationHeaders.Add(dbData); @@ -167,29 +162,37 @@ public async Task DeleteHeader(int id) public async Task> GetResultConfigurationsByConfigurationId(int parentId) { logger.LogTrace("{method}({parentId})", nameof(GetResultConfigurationsByConfigurationId), parentId); - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - ; - }); return await context.RestValueResultConfigurations .Where(x => x.RestValueConfigurationId == parentId) - .ProjectTo(mapper) + .Select(e => new DtoJsonXmlResultConfiguration() + { + Id = e.Id, + CorrectionFactor = e.CorrectionFactor, + UsedFor = e.UsedFor, + Operator = e.Operator, + NodePattern = e.NodePattern, + XmlAttributeHeaderName = e.XmlAttributeHeaderName, + XmlAttributeHeaderValue = e.XmlAttributeHeaderValue, + XmlAttributeValueName = e.XmlAttributeValueName, + }) .ToListAsync().ConfigureAwait(false); } public async Task SaveResultConfiguration(int parentId, DtoJsonXmlResultConfiguration dtoData) { logger.LogTrace("{method}({@dtoData})", nameof(SaveResultConfiguration), dtoData); - var mapperConfiguration = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - ; - }); - - var mapper = mapperConfiguration.CreateMapper(); - var dbData = mapper.Map(dtoData); - dbData.RestValueConfigurationId = parentId; + var dbData = new RestValueResultConfiguration + { + Id = dtoData.Id, + CorrectionFactor = dtoData.CorrectionFactor, + UsedFor = dtoData.UsedFor, + Operator = dtoData.Operator, + NodePattern = dtoData.NodePattern, + XmlAttributeHeaderName = dtoData.XmlAttributeHeaderName, + XmlAttributeHeaderValue = dtoData.XmlAttributeHeaderValue, + XmlAttributeValueName = dtoData.XmlAttributeValueName, + RestValueConfigurationId = parentId, + }; if (dbData.Id == default) { context.RestValueResultConfigurations.Add(dbData); diff --git a/TeslaSolarCharger.SharedBackend/MappingExtensions/MapperConfigurationFactory.cs b/TeslaSolarCharger.SharedBackend/MappingExtensions/MapperConfigurationFactory.cs deleted file mode 100644 index 61cadb474..000000000 --- a/TeslaSolarCharger.SharedBackend/MappingExtensions/MapperConfigurationFactory.cs +++ /dev/null @@ -1,29 +0,0 @@ -using AutoMapper; -using AutoMapper.Configuration.Annotations; -using System.Reflection; -using IConfigurationProvider = AutoMapper.IConfigurationProvider; - -namespace TeslaSolarCharger.SharedBackend.MappingExtensions; - -public class MapperConfigurationFactory : IMapperConfigurationFactory -{ - public IConfigurationProvider Create(Action configure) - { - return new MapperConfiguration(config => - { - config.ShouldMapProperty = p => p.GetCustomAttribute() == null; - configure(config); - }); - } - - public IConfigurationProvider CreateMap() - { - return new MapperConfiguration(config => config.CreateMap()); - } -} - -public interface IMapperConfigurationFactory -{ - IConfigurationProvider Create(Action configure); - IConfigurationProvider CreateMap(); -} diff --git a/TeslaSolarCharger.Tests/TestBase.cs b/TeslaSolarCharger.Tests/TestBase.cs index 4a5ca3b2e..03cb4d36a 100644 --- a/TeslaSolarCharger.Tests/TestBase.cs +++ b/TeslaSolarCharger.Tests/TestBase.cs @@ -20,7 +20,6 @@ using TeslaSolarCharger.Shared.Contracts; using TeslaSolarCharger.Shared.Resources.Contracts; using TeslaSolarCharger.Shared.TimeProviding; -using TeslaSolarCharger.SharedBackend.MappingExtensions; using TeslaSolarCharger.Tests.Data; using Xunit.Abstractions; using Constants = TeslaSolarCharger.Shared.Resources.Constants; @@ -67,7 +66,6 @@ protected TestBase( var currentFakeTime = new DateTime(2023, 2, 2, 8, 0, 0); _fake = new AutoFake(); - _fake.Provide(); _fake.Provide(); _fake.Provide(); _fake.Provide(); @@ -79,7 +77,6 @@ protected TestBase( b => { b.Register((_, _) => Context); - b.Register((_, _) => _fake.Resolve()); b.Register((_, _) => _fake.Resolve()); b.Register((_, _) => _fake.Resolve()); b.Register((_, _) => _fake.Resolve()); diff --git a/TeslaSolarCharger/Client/Components/BackendInformationDisplayComponent.razor b/TeslaSolarCharger/Client/Components/BackendInformationDisplayComponent.razor index 2b821fdfd..e4ccb8b52 100644 --- a/TeslaSolarCharger/Client/Components/BackendInformationDisplayComponent.razor +++ b/TeslaSolarCharger/Client/Components/BackendInformationDisplayComponent.razor @@ -1,5 +1,4 @@ @using TeslaSolarCharger.Shared.Dtos -@using TeslaSolarCharger.Shared.Dtos @using TeslaSolarCharger.Shared.Enums @inject HttpClient HttpClient diff --git a/TeslaSolarCharger/Client/Components/EditFormComponent.razor b/TeslaSolarCharger/Client/Components/EditFormComponent.razor index 59db6a23f..1d17a299e 100644 --- a/TeslaSolarCharger/Client/Components/EditFormComponent.razor +++ b/TeslaSolarCharger/Client/Components/EditFormComponent.razor @@ -1,21 +1,35 @@ -@using TeslaSolarCharger.Client.Wrapper +@using Blazored.FluentValidation +@using TeslaSolarCharger.Client.Helper.Contracts +@using TeslaSolarCharger.Client.Wrapper + +@inject IHttpClientHelper HttpClientHelper @typeparam T - - @ChildContent - - @if (!HideSubmitButton) - { - - Save - - } - - - - + + @ChildContent + + @if (!HideSubmitButton) + { + + + @if (IsSubmitting) + { + + Processing + } + else + { + Save + } + + + } + @code { @@ -26,16 +40,67 @@ public RenderFragment ChildContent { get; set; } [Parameter] public bool HideSubmitButton { get; set; } + [Parameter] + public string? SubmitUrl { get; set; } [Parameter] public EventCallback OnValidSubmit { get; set; } + [Parameter] + public EventCallback OnAfterSuccessfullSubmit { get; set; } + + public bool IsDirty => WrappedElement.EditContext.IsModified(); + + private bool IsSubmitting; + + - private void HandleValidSubmit(T wrappedItem) + private async Task HandleValidSubmit(T wrappedItem) { - OnValidSubmit.InvokeAsync(wrappedItem); + IsSubmitting = true; + if (SubmitUrl == default) + { + _ = OnValidSubmit.InvokeAsync(wrappedItem); + IsSubmitting = false; + return; + } + var result = await HttpClientHelper.SendPostRequestAsync(SubmitUrl, wrappedItem); + if (!result.HasError) + { + _ = OnAfterSuccessfullSubmit.InvokeAsync(wrappedItem); + IsSubmitting = false; + return; + } + + if (result.ValidationProblemDetails != null && result.ValidationProblemDetails.Errors.Any()) + { + MapErrorsToEditContext(result.ValidationProblemDetails.Errors); + } + else + { + Console.WriteLine("No validationErrors found in ProblemDetails.Extensions."); + } + IsSubmitting = false; + } + + private void MapErrorsToEditContext(IDictionary errors) + { + // Clear old messages + WrappedElement.MessageStore.Clear(); + + // Add new messages + foreach (var fieldWithErrors in errors) + { + var fieldIdentifier = new FieldIdentifier(WrappedElement.Item, fieldWithErrors.Key); + foreach (var errorMessage in fieldWithErrors.Value) + { + WrappedElement.MessageStore.Add(fieldIdentifier, errorMessage); + } + } + + // Force Blazor to re-render messages + WrappedElement.EditContext.NotifyValidationStateChanged(); } - public bool IsDirty => WrappedElement.EditContext.IsModified(); } diff --git a/TeslaSolarCharger/Client/Components/GenericInput.razor b/TeslaSolarCharger/Client/Components/GenericInput.razor index 918a42ac8..fc2acab5b 100644 --- a/TeslaSolarCharger/Client/Components/GenericInput.razor +++ b/TeslaSolarCharger/Client/Components/GenericInput.razor @@ -2,8 +2,8 @@ @using System.Reflection @using System.ComponentModel.DataAnnotations @using System.ComponentModel -@using Lysando.LabStorageV2.UiHelper.Wrapper.Contracts @using MudExtensions +@using TeslaSolarCharger.Client.Helper.Contracts @using TeslaSolarCharger.Shared.Attributes @using TeslaSolarCharger.Shared.Helper.Contracts @using TeslaSolarCharger.Shared.Resources.Contracts @@ -246,7 +246,6 @@ @bind-Value="Value" For="@(For)" Required="@IsRequired" - HelperText="Leave empty if you want to keep the existing password." InputType="InputType.Password" Label="@LabelName" Disabled="IsDisabled" diff --git a/TeslaSolarCharger/Client/Components/LoggedErrorsComponent.razor b/TeslaSolarCharger/Client/Components/LoggedErrorsComponent.razor index 61599e9f2..cd93f3005 100644 --- a/TeslaSolarCharger/Client/Components/LoggedErrorsComponent.razor +++ b/TeslaSolarCharger/Client/Components/LoggedErrorsComponent.razor @@ -19,7 +19,7 @@ else {
- +
diff --git a/TeslaSolarCharger/Client/Dialogs/AddCarDialog.razor b/TeslaSolarCharger/Client/Dialogs/AddCarDialog.razor index 40887c6f0..6429bfed2 100644 --- a/TeslaSolarCharger/Client/Dialogs/AddCarDialog.razor +++ b/TeslaSolarCharger/Client/Dialogs/AddCarDialog.razor @@ -9,7 +9,7 @@ { } -else if (_fleetApiTokenState != FleetApiTokenState.UpToDate) +else if (_fleetApiTokenState != TokenState.UpToDate) { >("api/FleetApi/FleetApiTokenState").ConfigureAwait(false); + var value = await HttpClient.GetFromJsonAsync>("api/FleetApi/FleetApiTokenState").ConfigureAwait(false); if (value != null) { _fleetApiTokenState = value.Value; diff --git a/TeslaSolarCharger/Client/Dtos/Result.cs b/TeslaSolarCharger/Client/Dtos/Result.cs new file mode 100644 index 000000000..58d2c0587 --- /dev/null +++ b/TeslaSolarCharger/Client/Dtos/Result.cs @@ -0,0 +1,9 @@ +using Microsoft.AspNetCore.Mvc; + +namespace TeslaSolarCharger.Client.Dtos; + +public record Result(T? Data, string? ErrorMessage, ValidationProblemDetails? ValidationProblemDetails) +{ + // Convenience property to check if it's an error + public bool HasError => !string.IsNullOrEmpty(ErrorMessage); +} diff --git a/TeslaSolarCharger/Client/Helper/Contracts/IDialogHelper.cs b/TeslaSolarCharger/Client/Helper/Contracts/IDialogHelper.cs index 62ab7f021..f3c1839b9 100644 --- a/TeslaSolarCharger/Client/Helper/Contracts/IDialogHelper.cs +++ b/TeslaSolarCharger/Client/Helper/Contracts/IDialogHelper.cs @@ -1,4 +1,6 @@ -namespace TeslaSolarCharger.Client.Helper.Contracts; +using MudBlazor; + +namespace TeslaSolarCharger.Client.Helper.Contracts; public interface IDialogHelper { diff --git a/TeslaSolarCharger/Client/Helper/Contracts/IHttpClientHelper.cs b/TeslaSolarCharger/Client/Helper/Contracts/IHttpClientHelper.cs index f7a6fb0c2..ffd112e25 100644 --- a/TeslaSolarCharger/Client/Helper/Contracts/IHttpClientHelper.cs +++ b/TeslaSolarCharger/Client/Helper/Contracts/IHttpClientHelper.cs @@ -1,9 +1,16 @@ -namespace TeslaSolarCharger.Client.Helper.Contracts; +using TeslaSolarCharger.Client.Dtos; +using TeslaSolarCharger.Shared.Dtos; + +namespace TeslaSolarCharger.Client.Helper.Contracts; public interface IHttpClientHelper { Task SendGetRequestWithSnackbarAsync(string url); Task SendGetRequestWithSnackbarAsync(string url); - Task SendPostRequestWithSnackbarAsync(string url, object content); - Task SendPostRequestWithSnackbarAsync(string url, object content); + Task SendPostRequestWithSnackbarAsync(string url, object? content); + Task SendPostRequestWithSnackbarAsync(string url, object? content); + Task> SendGetRequestAsync(string url); + Task> SendGetRequestAsync(string url); + Task> SendPostRequestAsync(string url, object? content); + Task> SendPostRequestAsync(string url, object? content); } diff --git a/TeslaSolarCharger/Client/Helper/Contracts/IJavaScriptWrapper.cs b/TeslaSolarCharger/Client/Helper/Contracts/IJavaScriptWrapper.cs index 047b7632c..b704d771e 100644 --- a/TeslaSolarCharger/Client/Helper/Contracts/IJavaScriptWrapper.cs +++ b/TeslaSolarCharger/Client/Helper/Contracts/IJavaScriptWrapper.cs @@ -1,4 +1,4 @@ -namespace Lysando.LabStorageV2.UiHelper.Wrapper.Contracts; +namespace TeslaSolarCharger.Client.Helper.Contracts; public interface IJavaScriptWrapper { @@ -6,4 +6,4 @@ public interface IJavaScriptWrapper Task RemoveFocusFromElementById(string elementId); Task OpenUrlInNewTab(string url); Task IsIosDevice(); -} \ No newline at end of file +} diff --git a/TeslaSolarCharger/Client/Helper/HttpClientHelper.cs b/TeslaSolarCharger/Client/Helper/HttpClientHelper.cs index ad3faa572..53256a80e 100644 --- a/TeslaSolarCharger/Client/Helper/HttpClientHelper.cs +++ b/TeslaSolarCharger/Client/Helper/HttpClientHelper.cs @@ -2,7 +2,9 @@ using MudBlazor; using Newtonsoft.Json; using System.Net.Http.Json; +using TeslaSolarCharger.Client.Dtos; using TeslaSolarCharger.Client.Helper.Contracts; +using TeslaSolarCharger.Shared.Dtos; namespace TeslaSolarCharger.Client.Helper; @@ -18,24 +20,83 @@ public async Task SendGetRequestWithSnackbarAsync(string url) await SendRequestWithSnackbarInternalAsync(HttpMethod.Get, url, null); } - public async Task SendPostRequestWithSnackbarAsync(string url, object content) + public async Task SendPostRequestWithSnackbarAsync(string url, object? content) { return await SendRequestWithSnackbarInternalAsync(HttpMethod.Post, url, content); } - public async Task SendPostRequestWithSnackbarAsync(string url, object content) + public async Task SendPostRequestWithSnackbarAsync(string url, object? content) { await SendRequestWithSnackbarInternalAsync(HttpMethod.Post, url, content); } + public async Task> SendGetRequestAsync(string url) + { + return await SendRequestCoreAsync(HttpMethod.Get, url, null); + } + + public async Task> SendGetRequestAsync(string url) + { + return await SendRequestCoreAsync(HttpMethod.Get, url, null); + } + + public async Task> SendPostRequestAsync(string url, object? content) + { + return await SendRequestCoreAsync(HttpMethod.Post, url, content); + } + + public async Task> SendPostRequestAsync(string url, object? content) + { + return await SendRequestCoreAsync(HttpMethod.Post, url, content); + } + private async Task SendRequestWithSnackbarInternalAsync( HttpMethod method, string url, object? content) + { + try + { + // Call the same core method + var result = await SendRequestCoreAsync(method, url, content); + + if (result.HasError) + { + // Show error in Snackbar + snackbar.Add(result.ErrorMessage ?? "EmptyErrorMessage", Severity.Error); + return default; + } + + // Return the deserialized data + return result.Data; + } + catch (Exception ex) + { + // If you need special catch logic that includes a Snackbar, do it here. + var message = $"{url}: Unexpected error: {ex.Message}"; + snackbar.Add(message, Severity.Error, config => + { + config.Action = "Details"; + config.ActionColor = Color.Primary; + config.Onclick = snackbar1 => dialogHelper.ShowTextDialog( + "Error Details", + $"Unexpected error while calling {url}: {ex.Message}{Environment.NewLine}{ex.StackTrace}" + ); + }); + + return default; + } + } + + private async Task> SendRequestCoreAsync( + HttpMethod method, + string url, + object? content) { try { HttpResponseMessage response; + if (method == HttpMethod.Get) { response = await httpClient.GetAsync(url); @@ -50,57 +111,64 @@ public async Task SendPostRequestWithSnackbarAsync(string url, object content) } else { - throw new ArgumentException("Unsupported HTTP method", nameof(method)); + return new Result( + default, + $"Unsupported HTTP method: {method}", + null + ); } if (response.IsSuccessStatusCode) { var responseContent = await response.Content.ReadAsStringAsync(); + if (typeof(T) != typeof(object)) { var deserializedObject = JsonConvert.DeserializeObject(responseContent); + if (deserializedObject == null) { - snackbar.Add($"{url}: The string could not be deserialized to the object type.", Severity.Error); + return new Result( + default, + $"{url}: Could not deserialize response to {typeof(T).Name}.", + null + ); } - return deserializedObject; - } - if (string.IsNullOrEmpty(responseContent)) + return new Result(deserializedObject, null, null); + } + else { - return default; + // If T=object, we don't do any deserialization + return new Result( + default, + null, + null + ); } - snackbar.Add($"{url}: The specified object type is not supported", Severity.Error); - return default; - } - else if (response.StatusCode == System.Net.HttpStatusCode.InternalServerError) - { - var problemDetails = await response.Content.ReadFromJsonAsync(); - var message = problemDetails != null ? $"Error: {problemDetails.Detail}" : "An error occurred"; - snackbar.Add(message, Severity.Error); } else { - var message = $"{url}: Unexpected error: {response.StatusCode}"; - snackbar.Add(message, Severity.Error); + var resultString = await response.Content.ReadAsStringAsync(); + var problemDetails = JsonConvert.DeserializeObject(resultString); + var message = problemDetails != null + ? $"Error: {problemDetails.Detail}" + : "An error occurred on the server."; + + return new Result(default, message, problemDetails); } } catch (HttpRequestException ex) { + // Network-level error var message = $"{url}: Network error: {ex.Message}"; - snackbar.Add(message, Severity.Error); + return new Result(default, message, null); } catch (Exception ex) { + // Any other unexpected error var message = $"{url}: Unexpected error: {ex.Message}"; - snackbar.Add(message, Severity.Error, config => - { - config.Action = "Details"; - config.ActionColor = Color.Primary; - config.Onclick = snackbar1 => dialogHelper.ShowTextDialog("Error Details", - $"Unexpected error while calling {url}: {ex.Message}{Environment.NewLine}{ex.StackTrace}"); - }); + return new Result(default, message, null); } - return default; } } diff --git a/TeslaSolarCharger/Client/Helper/JavaScriptWrapper.cs b/TeslaSolarCharger/Client/Helper/JavaScriptWrapper.cs index 2cd6a7539..04cd3a251 100644 --- a/TeslaSolarCharger/Client/Helper/JavaScriptWrapper.cs +++ b/TeslaSolarCharger/Client/Helper/JavaScriptWrapper.cs @@ -1,5 +1,5 @@ -using Lysando.LabStorageV2.UiHelper.Wrapper.Contracts; -using Microsoft.JSInterop; +using Microsoft.JSInterop; +using TeslaSolarCharger.Client.Helper.Contracts; namespace Lysando.LabStorageV2.UiHelper.Wrapper; @@ -51,4 +51,4 @@ public async Task IsIosDevice() return false; } } -} \ No newline at end of file +} diff --git a/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor index 8e19fbd9c..fa4158cce 100644 --- a/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor +++ b/TeslaSolarCharger/Client/Pages/BaseConfiguration.razor @@ -1,14 +1,16 @@ @page "/BaseConfiguration" @using System.Globalization @using TeslaSolarCharger.Client.Helper.Contracts +@using TeslaSolarCharger.Client.Services.Contracts @using TeslaSolarCharger.Shared.Dtos.BaseConfiguration -@using TeslaSolarCharger.Shared @using TeslaSolarCharger.Shared.Enums @using TeslaSolarCharger.Shared.Dtos @inject HttpClient HttpClient @inject NavigationManager NavigationManager @inject ISnackbar Snackbar @inject IHttpClientHelper HttpClientHelper +@inject IBackendApiTokenCheckService BackendApiTokenCheckService +@inject IDialogHelper DialogHelper Base Configuration @@ -24,245 +26,237 @@ else

General:

+ LabelText="Max combined current" + UnitText="A" + HelpText="Set a value if you want to reduce the max combined used current per phase of all cars. E.g. if you have two cars each set to max 16A but your installation can only handle 20A per phase you can set 20A here. So if one car uses 16A per phase the other car can only use 4A per phase. Note: Power is distributed based on the set car priorities.">
- @if (_fleetApiTokenState != FleetApiTokenState.NotNeeded) +

Tesla Fleet API:

+ @switch (_fleetApiTokenState) { -

Tesla Fleet API:

- @switch (_fleetApiTokenState) - { - case FleetApiTokenState.NotRequested: -
- You have to generate a token in order to use the Tesla Fleet API. Important: You have to allow access to all scopes. -
- break; - case FleetApiTokenState.NotReceived: -
- You already have requested a token but did not receive it yet. It can take up to five minutes to receive the token. If the token did not arrive within five minutes please try again: -
- break; - case FleetApiTokenState.TokenRequestExpired: -
- Your token request has expired. Please generate a new token: -
- break; - case FleetApiTokenState.TokenUnauthorized: -
- Your token is unauthorized, Please generate a new token, allow access to all scopes and enable mobile access in your car. -
- break; - case FleetApiTokenState.MissingScopes: -
- Your token has missing scopes. Remove Tesla Solar Charger from your third party apps as you won't get asked again for the scopes. After that generate a new token and allow access to all scopes. -
- break; - case FleetApiTokenState.Expired: -
- Your token has expired. This could happen if you changed your Tesla password or did not use TeslaSolarCharger for too long. Please generate a new token: -
- break; - case FleetApiTokenState.UpToDate: -
- Everything is fine! If you want to generate a new token e.g. to switch to another Tesla Account please click the button below: -
- break; - } -
- -
-
+ case TokenState.MissingPrecondition: +
+ You are not logged in in the Solar4car.com account. When requesting a new Tesla Token there will also be a request to log in to your Solar4car.com account. +
+ break; + case TokenState.NotAvailable: +
+ You did not request a Fleet API Token, yet. Request a new token, allow access to all scopes and enable mobile access in your car. +
+ break; + case TokenState.Unauthorized: +
+ Your token is unauthorized. Request a new token, allow access to all scopes and enable mobile access in your car. +
+ break; + case TokenState.MissingScopes: +
+ Your token has missing scopes. Request a new Token and allow all scopes (only required scopes are requested). +
+ break; + case TokenState.Expired: +
+ Your Fleet API token is expired. Request a new Token and allow all scopes (only required scopes are requested). +
+ break; + case TokenState.UpToDate: +
+ Everything is fine! If you want to generate a new token e.g. to switch to another Tesla Account please click the button below: +
+ break; } +
+ +
+

TeslaMate:

+ For="() => _dtoBaseConfiguration.UseTeslaMateIntegration" + OnValueChanged="_ => InvokeAsync(StateHasChanged)"> @if (_dtoBaseConfiguration.UseTeslaMateIntegration) { + LabelText="TeslaMate Database Host" + UnitText="" + HelpText=""> - + + LabelText="TeslaMate Database Server Port" + UnitText="" + HelpText="You can use the internal port of the TeslaMate database container"> - + + LabelText="TeslaMate Database Username" + UnitText="" + HelpText=""> + LabelText="TeslaMate Database Server Password" + UnitText="" + HelpText=""> + LabelText="Mosquito servername" + UnitText="" + HelpText=""> - + } - - + +

Home Geofence

+ Latitude="_dtoBaseConfiguration.HomeGeofenceLatitude" + Radius="_dtoBaseConfiguration.HomeGeofenceRadius" + LatitudeChanged="@(newLatitude => _dtoBaseConfiguration.HomeGeofenceLatitude = newLatitude)" + LongitudeChanged="@(newLongitude => { _dtoBaseConfiguration.HomeGeofenceLongitude = newLongitude; Snackbar.Add("To update the location, click the save button on the bottom of the page", Severity.Info); })"> Click on the map to select your home geofence. Within that area TSC will regulate the charging power.
+ LabelText="Home Radius" + UnitText="m" + HelpText="Increase or decrease the radius of the home geofence. Note: Values below 50m are note recommended"> + LabelText="Power Buffer" + UnitText="W" + HelpText="Set values higher than 0 to always have some overage (power to grid). Set values lower than 0 to always consume some power from the grid."> - + + LabelText="Home Battery Minimum SoC" + UnitText="%" + HelpText="Set the SoC your home battery should get charged to before cars start to use full power. Leave empty if you do not have a home battery"> + LabelText="Home Battery Goal charging power" + UnitText="W" + HelpText="Set the power your home battery should charge with as long as SoC is below set minimum SoC. Leave empty if you do not have a home battery"> + LabelText="Max Inverter AC Power" + UnitText="W" + HelpText="If you have a hybrid inverter that has more DC than AC power insert the maximum AC Power here. This is a very rare, so in most cases you can leave this field empty."> - + - +

Telegram:

How to set up Telegram
Note: The Telegram bot for now only sends messages if something is not working. E.g. The car does not respond to commands, solar power values can not be refreshed,...
+ For="() => _dtoBaseConfiguration.TelegramBotKey" + OnValueChanged="@(_ => _telegramSettingsChanged = true)"> + For="() => _dtoBaseConfiguration.TelegramChannelId" + OnValueChanged="@(_ => _telegramSettingsChanged = true)"> + IsDisabled="_telegramSettingsChanged" + DisableToolTipText="You need to save the configuration before testing it." + OnButtonClicked="_ => SendTelegramTestMessage()">
- + + LabelText="Car power adjustment interval" + UnitText="s" + HelpText="Note: It is not possible to use values below 25 seconds here, as there is a delay between the car changing its current and the Tesla API getting notified about this change."> - + + LabelText="Solar plant adjustment interval" + UnitText="s" + HelpText=""> - + + LabelText="Time with enough solar power until charging starts" + UnitText="min" + HelpText=""> - + + LabelText="Time without enough solar power until charging stops" + UnitText="min" + HelpText=""> -
+
+ LabelText="Mqqt ClientId" + UnitText="" + HelpText=""> - + -
+
+ LabelText="HomeBatteryPowerInversion Url" + UnitText="" + HelpText="Use this if you have to dynamically invert the home battery power. Note: Only 0 and 1 are allowed as response. As far as I know this is only needed with Sungrow Inverters."> - + @@ -271,17 +265,17 @@ else
+ IsLoading="_submitLoading" + ButtonType="ButtonType.Submit">
- + } @code { private DtoBaseConfiguration? _dtoBaseConfiguration; - private FleetApiTokenState? _fleetApiTokenState; + private TokenState? _fleetApiTokenState; private bool _tokenGenerationButtonDisabled; @@ -291,7 +285,7 @@ else protected override async Task OnInitializedAsync() { _dtoBaseConfiguration = await HttpClient.GetFromJsonAsync("/api/BaseConfiguration/GetBaseConfiguration").ConfigureAwait(false); - var value = await HttpClient.GetFromJsonAsync>("api/FleetApi/FleetApiTokenState").ConfigureAwait(false); + var value = await HttpClient.GetFromJsonAsync>("api/FleetApi/FleetApiTokenState").ConfigureAwait(false); if (value != null) { _fleetApiTokenState = value.Value; @@ -320,6 +314,14 @@ else _tokenGenerationButtonDisabled = true; var locale = CultureInfo.CurrentCulture.ToString(); var baseUrl = NavigationManager.BaseUri; + var backendTokenState = await BackendApiTokenCheckService.GetTokenState(false); + if (backendTokenState != TokenState.UpToDate) + { + Snackbar.Add("You need to be logged in to Solar4Car.com to generate a Fleet API Token", Severity.Error); + NavigationManager.NavigateTo("cloudconnection"); + return; + } + var url = await HttpClient.GetFromJsonAsync>($"api/FleetApi/GetOauthUrl?locale={Uri.EscapeDataString(locale)}&baseUrl={Uri.EscapeDataString(baseUrl)}").ConfigureAwait(false); if (url?.Value != null) { diff --git a/TeslaSolarCharger/Client/Pages/CarSettings.razor b/TeslaSolarCharger/Client/Pages/CarSettings.razor index 9228bcfb6..7ff83fe81 100644 --- a/TeslaSolarCharger/Client/Pages/CarSettings.razor +++ b/TeslaSolarCharger/Client/Pages/CarSettings.razor @@ -11,29 +11,20 @@

Car Settings

- @if (_fleetApiTokenState == FleetApiTokenState.NotReceived) - { - -

Waiting for token

- You already requested a token. TSC is currently waiting for receiving it. This might take up to five minutes. Reload this page to get new information if available. - - } - else if (_fleetApiTokenState != null && _fleetApiTokenState != FleetApiTokenState.UpToDate) + @if (_fleetApiTokenState != null && _fleetApiTokenState != TokenState.UpToDate) { + NoIcon="true" + ContentAlignment="HorizontalAlignment.Left">

Create Token.

Go to Base Configuration, Generate a Tesla Fleet API Token and restart TSC to see cars here. } - @if (_fleetApiTokenState == FleetApiTokenState.UpToDate) + @if (_fleetApiTokenState == TokenState.UpToDate) { + NoIcon="true" + ContentAlignment="HorizontalAlignment.Left">
Restart TSC to add new cars
If you do not see all cars here that are available in your Tesla account, restart TSC. @@ -50,90 +41,104 @@ else @foreach (var carBasicConfiguration in _carBasicConfigurations) {
- - - - - - - - - - + + + - @if(carBasicConfiguration.UseFleetTelemetry) + For="() => carBasicConfiguration.Item.ShouldBeManaged" + OnValueChanged="_ => InvokeAsync(() => StateHasChanged())" /> + @if (carBasicConfiguration.Item.ShouldBeManaged) { - + + + + + + @if (carBasicConfiguration.Item.UseBle) + { + + } + + @if (carBasicConfiguration.Item.UseFleetTelemetry) + { + + } } + -
-

BLE Pairing and test

-
- To come around rate limits TSC can use BLE instead of the Fleet API. This requires setting up a BLE API. -
- @if (_pairingResults.TryGetValue(carBasicConfiguration.Vin, out var result)) + + @if (_vinsToShowBleTest.Contains(carBasicConfiguration.Item.Vin)) { +
+

BLE Pairing and test

+
+ To come around rate limits TSC can use BLE instead of the Fleet API. This requires setting up a BLE API. +
+ @if (_pairingResults.TryGetValue(carBasicConfiguration.Item.Vin, out var result)) + { + + - - @if (DateTime.UtcNow < car.RateLimitedUntil) - { - - } @if (_testingFleetApiCarIds.Any(i => i == car.CarId)) {
@@ -105,7 +93,7 @@ else

Note: For the test the car needs to be awake. If the car was not awake, wake it up and .
- If it still does not work, go to your car and under Controls -> Locks you can check if a key named "www.teslasolarcharger.de" is present. If not try adding the key again by clicking . + If it still does not work, go to your car and under Controls -> Locks you can check if a key named "solar4car.com" is present. If not try adding the key again by clicking .

@@ -605,7 +593,7 @@ else private async Task OpenRegisterPublicKeyPage(int carId) { var response = await HttpClient.PostAsync($"api/Index/UpdateCarFleetApiState?carId={carId}&fleetApiState={TeslaCarFleetApiState.OpenedLinkButNotTested}", null).ConfigureAwait(false); - NavigationManager.NavigateTo("https://tesla.com/_ak/www.teslasolarcharger.de"); + NavigationManager.NavigateTo("https://tesla.com/_ak/solar4car.com"); } private async Task TestFleetApiAccess(int carId) diff --git a/TeslaSolarCharger/Client/Program.cs b/TeslaSolarCharger/Client/Program.cs index 6c2f2bbcb..75bc6dac1 100644 --- a/TeslaSolarCharger/Client/Program.cs +++ b/TeslaSolarCharger/Client/Program.cs @@ -1,5 +1,4 @@ using Lysando.LabStorageV2.UiHelper.Wrapper; -using Lysando.LabStorageV2.UiHelper.Wrapper.Contracts; using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using MudBlazor; @@ -8,6 +7,8 @@ using TeslaSolarCharger.Client; using TeslaSolarCharger.Client.Helper; using TeslaSolarCharger.Client.Helper.Contracts; +using TeslaSolarCharger.Client.Services; +using TeslaSolarCharger.Client.Services.Contracts; using TeslaSolarCharger.Shared; using TeslaSolarCharger.Shared.Contracts; using TeslaSolarCharger.Shared.Helper; @@ -25,6 +26,7 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddSingleton(); builder.Services.AddSharedDependencies(); builder.Services.AddMudServices(config => diff --git a/TeslaSolarCharger/Client/Services/BackendApiTokenCheckService.cs b/TeslaSolarCharger/Client/Services/BackendApiTokenCheckService.cs new file mode 100644 index 000000000..181deaa5c --- /dev/null +++ b/TeslaSolarCharger/Client/Services/BackendApiTokenCheckService.cs @@ -0,0 +1,15 @@ +using TeslaSolarCharger.Client.Helper.Contracts; +using TeslaSolarCharger.Client.Services.Contracts; +using TeslaSolarCharger.Shared.Dtos; +using TeslaSolarCharger.Shared.Enums; + +namespace TeslaSolarCharger.Client.Services; + +public class BackendApiTokenCheckService(ILogger logger, IHttpClientHelper httpClientHelper) : IBackendApiTokenCheckService +{ + public async Task GetTokenState(bool useCache) + { + var response = await httpClientHelper.SendGetRequestWithSnackbarAsync>($"api/BackendApi/GetTokenState?useCache={useCache}"); + return response?.Value ?? TokenState.MissingPrecondition; + } +} diff --git a/TeslaSolarCharger/Client/Services/Contracts/IBackendApiTokenCheckService.cs b/TeslaSolarCharger/Client/Services/Contracts/IBackendApiTokenCheckService.cs new file mode 100644 index 000000000..fa6835615 --- /dev/null +++ b/TeslaSolarCharger/Client/Services/Contracts/IBackendApiTokenCheckService.cs @@ -0,0 +1,8 @@ +using TeslaSolarCharger.Shared.Enums; + +namespace TeslaSolarCharger.Client.Services.Contracts; + +public interface IBackendApiTokenCheckService +{ + Task GetTokenState(bool useCache); +} diff --git a/TeslaSolarCharger/Client/Shared/NavMenu.razor b/TeslaSolarCharger/Client/Shared/NavMenu.razor index 7c9196e15..fc02cbdc9 100644 --- a/TeslaSolarCharger/Client/Shared/NavMenu.razor +++ b/TeslaSolarCharger/Client/Shared/NavMenu.razor @@ -26,6 +26,11 @@ Charge Prices
+
+ + Cloud Connection + +
Base Configuration diff --git a/TeslaSolarCharger/Client/TeslaSolarCharger.Client.csproj b/TeslaSolarCharger/Client/TeslaSolarCharger.Client.csproj index 6bdbad9e9..6b3110467 100644 --- a/TeslaSolarCharger/Client/TeslaSolarCharger.Client.csproj +++ b/TeslaSolarCharger/Client/TeslaSolarCharger.Client.csproj @@ -23,6 +23,7 @@ + diff --git a/TeslaSolarCharger/Client/Wrapper/EditableItem.cs b/TeslaSolarCharger/Client/Wrapper/EditableItem.cs index 2ea2be96d..ad1b921f9 100644 --- a/TeslaSolarCharger/Client/Wrapper/EditableItem.cs +++ b/TeslaSolarCharger/Client/Wrapper/EditableItem.cs @@ -8,10 +8,38 @@ public class EditableItem public string Guid { get; set; } = System.Guid.NewGuid().ToString(); public EditContext EditContext { get; set; } + public ValidationMessageStore MessageStore { get; } public EditableItem(T item) { Item = item; EditContext = new EditContext(item ?? throw new ArgumentNullException(nameof(item))); + MessageStore = new ValidationMessageStore(EditContext); + // Subscribe to the FieldChanged event + EditContext.OnFieldChanged += (sender, args) => + { + // Clear validation messages for the changed field + MessageStore.Clear(args.FieldIdentifier); + + // Notify UI to update + EditContext.NotifyValidationStateChanged(); + }; + } + + /// + /// Removes all validation errors for the specified property name. + /// + /// The name of the property for which to clear errors. + public void ClearErrors(string propertyName) + { + if (string.IsNullOrEmpty(propertyName)) return; + + var fieldIdentifier = new FieldIdentifier(Item, propertyName); + + // Clear validation messages for the specified property + MessageStore.Clear(fieldIdentifier); + + // Notify the EditContext to update the UI + EditContext.NotifyValidationStateChanged(); } } diff --git a/TeslaSolarCharger/Server/Contracts/ITeslaService.cs b/TeslaSolarCharger/Server/Contracts/ITeslaService.cs index b04242663..5672b121f 100644 --- a/TeslaSolarCharger/Server/Contracts/ITeslaService.cs +++ b/TeslaSolarCharger/Server/Contracts/ITeslaService.cs @@ -9,5 +9,4 @@ public interface ITeslaService Task WakeUpCar(int carId); Task StopCharging(int carId); Task SetAmp(int carId, int amps); - Task SetChargeLimit(int carId, int limitSoC); } diff --git a/TeslaSolarCharger/Server/Controllers/BackendApiController.cs b/TeslaSolarCharger/Server/Controllers/BackendApiController.cs new file mode 100644 index 000000000..0eb0c095a --- /dev/null +++ b/TeslaSolarCharger/Server/Controllers/BackendApiController.cs @@ -0,0 +1,19 @@ +using Microsoft.AspNetCore.Mvc; +using TeslaSolarCharger.Server.Services.Contracts; +using TeslaSolarCharger.Shared.Dtos; +using TeslaSolarCharger.Shared.Enums; +using TeslaSolarCharger.SharedBackend.Abstracts; + +namespace TeslaSolarCharger.Server.Controllers; + +public class BackendApiController (IBackendApiService backendApiService, ITokenHelper tokenHelper) : ApiBaseController +{ + [HttpGet] + public async Task> GetTokenState(bool useCache) + { + return new(await tokenHelper.GetBackendTokenState(useCache)); + } + + [HttpPost] + public Task LoginToBackend(DtoBackendLogin login) => backendApiService.GetToken(login); +} diff --git a/TeslaSolarCharger/Server/Controllers/ConfigController.cs b/TeslaSolarCharger/Server/Controllers/ConfigController.cs index 644c05ac0..5204d79ff 100644 --- a/TeslaSolarCharger/Server/Controllers/ConfigController.cs +++ b/TeslaSolarCharger/Server/Controllers/ConfigController.cs @@ -38,12 +38,10 @@ public ConfigController(IConfigJsonService configJsonService, ITeslaFleetApiServ /// /// Car Id of car to update /// Car Configuration which should be set to car - [HttpPut] - public Task UpdateCarBasicConfiguration(int carId, [FromBody] CarBasicConfiguration carBasicConfiguration) => - _configJsonService.UpdateCarBasicConfiguration(carId, carBasicConfiguration); - [HttpPost] - public Task AddTeslaFleetApiToken([FromBody] DtoTeslaTscDeliveryToken token) => - _teslaFleetApiService.AddNewTokenAsync(token); + public Task UpdateCarBasicConfiguration(int carId, [FromBody] CarBasicConfiguration carBasicConfiguration) + { + return _configJsonService.UpdateCarBasicConfiguration(carId, carBasicConfiguration); + } } } diff --git a/TeslaSolarCharger/Server/Controllers/FleetApiController.cs b/TeslaSolarCharger/Server/Controllers/FleetApiController.cs index 903472dbd..cb0e2a892 100644 --- a/TeslaSolarCharger/Server/Controllers/FleetApiController.cs +++ b/TeslaSolarCharger/Server/Controllers/FleetApiController.cs @@ -20,28 +20,11 @@ public class FleetApiController( : ApiBaseController { [HttpGet] - public Task> FleetApiTokenState() => fleetApiService.GetFleetApiTokenState(); + public Task> FleetApiTokenState() => fleetApiService.GetFleetApiTokenState(); [HttpGet] public Task> GetOauthUrl(string locale, string baseUrl) => backendApiService.StartTeslaOAuth(locale, baseUrl); - [HttpGet] - public Task RefreshFleetApiToken() => fleetApiService.GetNewTokenFromBackend(); - - /// - /// Note: This endpoint is only available in development environment - /// - /// Is thrown when not beeing in dev Mode - [HttpGet] - public Task SetChargeLimit(int carId, int percent) - { - if (!configurationWrapper.IsDevelopmentEnvironment()) - { - throw new InvalidOperationException("This method is only available in development environment"); - } - return teslaService.SetChargeLimit(carId, percent); - } - [HttpGet] public Task> TestFleetApiAccess(int carId) => fleetApiService.TestFleetApiAccess(carId); [HttpGet] diff --git a/TeslaSolarCharger/Server/Dtos/Result.cs b/TeslaSolarCharger/Server/Dtos/Result.cs new file mode 100644 index 000000000..417567215 --- /dev/null +++ b/TeslaSolarCharger/Server/Dtos/Result.cs @@ -0,0 +1,9 @@ +using Microsoft.AspNetCore.Mvc; + +namespace TeslaSolarCharger.Server.Dtos; + +public record Result(T? Data, string? ErrorMessage, ProblemDetails? ProblemDetails) +{ + // Convenience property to check if it's an error + public bool HasError => !string.IsNullOrEmpty(ErrorMessage); +} diff --git a/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/DtoBackendApiTeslaResponse.cs b/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/DtoBackendApiTeslaResponse.cs new file mode 100644 index 000000000..375c5b194 --- /dev/null +++ b/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/DtoBackendApiTeslaResponse.cs @@ -0,0 +1,9 @@ +using System.Net; + +namespace TeslaSolarCharger.Server.Dtos.Solar4CarBackend; + +public class DtoBackendApiTeslaResponse +{ + public HttpStatusCode StatusCode { get; set; } + public string? JsonResponse { get; set; } +} diff --git a/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/User/DtoAccessToken.cs b/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/User/DtoAccessToken.cs new file mode 100644 index 000000000..97a8c2db7 --- /dev/null +++ b/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/User/DtoAccessToken.cs @@ -0,0 +1,8 @@ +namespace TeslaSolarCharger.Server.Dtos.Solar4CarBackend.User; + +public class DtoAccessToken(string accessToken, string refreshToken) +{ + public string AccessToken { get; set; } = accessToken; + public string RefreshToken { get; set; } = refreshToken; + public long ExpiresAt { get; set; } +} diff --git a/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/User/DtoCreateUser.cs b/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/User/DtoCreateUser.cs new file mode 100644 index 000000000..562a81c34 --- /dev/null +++ b/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/User/DtoCreateUser.cs @@ -0,0 +1,8 @@ +namespace TeslaSolarCharger.Server.Dtos.Solar4CarBackend.User; + +public class DtoCreateUser(string userName, string password) +{ + public string UserName { get; set; } = userName; + public string? Email { get; set; } + public string Password { get; set; } = password; +} diff --git a/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/User/DtoLogin.cs b/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/User/DtoLogin.cs new file mode 100644 index 000000000..b7650c520 --- /dev/null +++ b/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/User/DtoLogin.cs @@ -0,0 +1,8 @@ +namespace TeslaSolarCharger.Server.Dtos.Solar4CarBackend.User; + +public class DtoLogin(string userName, string password, string installationId) +{ + public string UserName { get; set; } = userName; + public string Password { get; set; } = password; + public string InstallationId { get; set; } = installationId; +} diff --git a/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/User/DtoTokenRefreshModel.cs b/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/User/DtoTokenRefreshModel.cs new file mode 100644 index 000000000..8f39b7d59 --- /dev/null +++ b/TeslaSolarCharger/Server/Dtos/Solar4CarBackend/User/DtoTokenRefreshModel.cs @@ -0,0 +1,7 @@ +namespace TeslaSolarCharger.Server.Dtos.Solar4CarBackend.User; + +public class DtoTokenRefreshModel(string accessToken, string refreshToken) +{ + public string AccessToken { get; set; } = accessToken; + public string RefreshToken { get; set; } = refreshToken; +} diff --git a/TeslaSolarCharger/Server/Dtos/TscBackend/DtoInstallationInformation.cs b/TeslaSolarCharger/Server/Dtos/TscBackend/DtoInstallationInformation.cs deleted file mode 100644 index df05e1ee1..000000000 --- a/TeslaSolarCharger/Server/Dtos/TscBackend/DtoInstallationInformation.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace TeslaSolarCharger.Server.Dtos.TscBackend; - -public class DtoInstallationInformation -{ - public string InstallationId { get; set; } - public string Version { get; set; } - public string InfoReason { get; set; } -} diff --git a/TeslaSolarCharger/Server/Dtos/TscBackend/DtoTeslaTscDeliveryToken.cs b/TeslaSolarCharger/Server/Dtos/TscBackend/DtoTeslaTscDeliveryToken.cs deleted file mode 100644 index 1d9facb72..000000000 --- a/TeslaSolarCharger/Server/Dtos/TscBackend/DtoTeslaTscDeliveryToken.cs +++ /dev/null @@ -1,12 +0,0 @@ -using TeslaSolarCharger.Model.Enums; - -namespace TeslaSolarCharger.Server.Dtos.TscBackend; - -public class DtoTeslaTscDeliveryToken -{ - public string AccessToken { get; set; } - public string RefreshToken { get; set; } - public string IdToken { get; set; } - public TeslaFleetApiRegion Region { get; set; } - public int ExpiresIn { get; set; } -} diff --git a/TeslaSolarCharger/Server/Exceptions/ValidationException.cs b/TeslaSolarCharger/Server/Exceptions/ValidationException.cs new file mode 100644 index 000000000..f5b127f4c --- /dev/null +++ b/TeslaSolarCharger/Server/Exceptions/ValidationException.cs @@ -0,0 +1,15 @@ +using FluentValidation.Results; + +namespace TeslaSolarCharger.Server.Exceptions; + +public class ValidationException() : Exception("One or more validation failures have occurred.") +{ + public IDictionary Errors { get; } = new Dictionary(); + + public ValidationException(IEnumerable failures) : this() + { + Errors = failures + .GroupBy(e => e.PropertyName, e => e.ErrorMessage) + .ToDictionary(failureGroup => failureGroup.Key, failureGroup => failureGroup.ToArray()); + } +} diff --git a/TeslaSolarCharger/Server/Middlewares/ApiExceptionFilterAttribute.cs b/TeslaSolarCharger/Server/Middlewares/ApiExceptionFilterAttribute.cs new file mode 100644 index 000000000..9c540235a --- /dev/null +++ b/TeslaSolarCharger/Server/Middlewares/ApiExceptionFilterAttribute.cs @@ -0,0 +1,148 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; +using System.Net; +using TeslaSolarCharger.Server.Exceptions; + +namespace TeslaSolarCharger.Server.Middlewares; + +public class ApiExceptionFilterAttribute : ExceptionFilterAttribute +{ + private readonly ILogger _logger; + private readonly IDictionary> _exceptionHandlers; + + public ApiExceptionFilterAttribute(ILogger logger) + { + _logger = logger; + _exceptionHandlers = new Dictionary> + { + { typeof(ValidationException), HandleValidationException }, + { typeof(UnauthorizedAccessException), HandleUnauthorizedExcepction }, + { typeof(FileNotFoundException), HandleFileNotFoundException }, + { typeof(ArgumentException), HandleArgumentException }, + { typeof(ProtocolViolationException), HandleProtocolViolationException }, + { typeof(InvalidOperationException), HandleInvalidOperationException }, + }; + } + + public override void OnException(ExceptionContext context) + { + HandleException(context); + base.OnException(context); + } + + private void HandleException(ExceptionContext context) + { + _logger.LogError(context.Exception, context.Exception.Message); + if (_exceptionHandlers.TryGetValue(context.Exception.GetType(), out var handler)) + { + handler(context); + return; + } + HandleUnknwonException(context); + } + + private void HandleValidationException(ExceptionContext context) + { + var exception = context.Exception as ValidationException; + var problemDetails = new ValidationProblemDetails(exception!.Errors) + { + Title = "One or more validation failures have occurred.", + Status = StatusCodes.Status422UnprocessableEntity, + Detail = exception!.Message, + Instance = context.HttpContext.Request.Path.Value, + }; + var result = new ObjectResult(problemDetails); + context.Result = result; + context.ExceptionHandled = true; + } + + private void HandleUnauthorizedExcepction(ExceptionContext context) + { + var exception = context.Exception as UnauthorizedAccessException; + var problemDetails = new ProblemDetails + { + Title = "Unauthorized", + Status = StatusCodes.Status401Unauthorized, + Detail = exception?.Message, + Instance = context.HttpContext.Request.Path.Value, + }; + var result = new ObjectResult(problemDetails); + context.Result = result; + context.ExceptionHandled = true; + } + + private void HandleFileNotFoundException(ExceptionContext context) + { + var exception = context.Exception as UnauthorizedAccessException; + var problemDetails = new ProblemDetails + { + Type = "https://tools.ietf.org/html/rfc7231#section-6.5.4", + Title = "File not found", + Status = StatusCodes.Status404NotFound, + Detail = exception?.Message, + Instance = context.HttpContext.Request.Path.Value, + }; + var result = new ObjectResult(problemDetails); + context.Result = result; + context.ExceptionHandled = true; + } + + private void HandleArgumentException(ExceptionContext context) + { + var exception = context.Exception as ArgumentException; + var problemDetails = new ProblemDetails + { + Title = "Bad request", + Status = StatusCodes.Status400BadRequest, + Detail = exception?.Message, + Instance = context.HttpContext.Request.Path.Value, + }; + var result = new ObjectResult(problemDetails); + context.Result = result; + context.ExceptionHandled = true; + } + + private void HandleProtocolViolationException(ExceptionContext context) + { + var exception = context.Exception as ProtocolViolationException; + var problemDetails = new ProblemDetails + { + Title = "Bad request", + Status = StatusCodes.Status400BadRequest, + Detail = exception?.Message, + Instance = context.HttpContext.Request.Path.Value, + }; + var result = new ObjectResult(problemDetails); + context.Result = result; + context.ExceptionHandled = true; + } + + private void HandleInvalidOperationException(ExceptionContext context) + { + var exception = context.Exception as InvalidOperationException; + var problemDetails = new ProblemDetails + { + Title = "Precondition failed", + Status = StatusCodes.Status412PreconditionFailed, + Detail = exception?.Message, + Instance = context.HttpContext.Request.Path.Value, + }; + var result = new ObjectResult(problemDetails); + context.Result = result; + context.ExceptionHandled = true; + } + + private void HandleUnknwonException(ExceptionContext context) + { + var problemDetails = new ProblemDetails + { + Title = "An unexpected error occurred!", + Status = StatusCodes.Status500InternalServerError, + Detail = context.Exception.Message, + Instance = context.HttpContext.Request.Path.Value, + }; + var result = new ObjectResult(problemDetails); + context.Result = result; + context.ExceptionHandled = true; + } +} diff --git a/TeslaSolarCharger/Server/Middlewares/ErrorHandlingMiddleware.cs b/TeslaSolarCharger/Server/Middlewares/ErrorHandlingMiddleware.cs new file mode 100644 index 000000000..b74c6a7ab --- /dev/null +++ b/TeslaSolarCharger/Server/Middlewares/ErrorHandlingMiddleware.cs @@ -0,0 +1,101 @@ +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using System.Net; +using TeslaSolarCharger.Server.Exceptions; + +namespace TeslaSolarCharger.Server.Middlewares; + +public class ErrorHandlingMiddleware(ILogger logger) : IMiddleware +{ + public async Task InvokeAsync(HttpContext context, RequestDelegate next) + { + try + { + //As Unauthorized dos not necessaryl throw an exception, we need to check the status code + await next(context).ConfigureAwait(false); + if (context.Response.StatusCode == StatusCodes.Status401Unauthorized) + { + await HandleUnauthorizedAsync(context).ConfigureAwait(false); + } + } + catch (Exception ex) + { + await HandleExceptionAsync(context, ex).ConfigureAwait(false); + } + } + + private Task HandleUnauthorizedAsync(HttpContext context) + { + var authError = context.Items["AuthError"] as string; + var detail = authError ?? "Authentication is required or the token is invalid."; + + logger.LogWarning("Unauthorized access attempt detected: {Path}; AuthError: {authError}", context.Request.Path, authError); + + + var problemDetails = new ProblemDetails + { + Title = "Unauthorized", + Status = StatusCodes.Status401Unauthorized, + Detail = detail, + Instance = context.Request.Path.Value, + }; + + context.Response.ContentType = "application/json"; + var result = JsonConvert.SerializeObject(problemDetails); + return context.Response.WriteAsync(result); + } + + private Task HandleExceptionAsync(HttpContext context, Exception exception) + { + var problemDetails = new ProblemDetails + { + Title = "An unexpected error occurred!", + Status = StatusCodes.Status500InternalServerError, + Detail = exception.Message, + Instance = context.Request.Path.Value, + }; + + switch (exception) + { + case ValidationException validationException: + problemDetails.Title = "Validation failed"; + problemDetails.Type = "https://tools.ietf.org/html/rfc7231#section-6.5.1"; + problemDetails.Status = StatusCodes.Status422UnprocessableEntity; + problemDetails.Detail = "One or more validation failures have occurred."; + break; + + case UnauthorizedAccessException e: + logger.LogWarning(e, e.Message); + context.Response.StatusCode = (int)HttpStatusCode.Forbidden; + break; + + case FileNotFoundException e: + logger.LogError(e, e.Message); + context.Response.StatusCode = (int)HttpStatusCode.NotFound; + break; + case ArgumentException e: + logger.LogError(e, e.Message); + context.Response.StatusCode = (int)HttpStatusCode.NotFound; + break; + + case ProtocolViolationException e: + logger.LogError(e, e.Message); + context.Response.StatusCode = (int)HttpStatusCode.BadRequest; + break; + + case InvalidOperationException e: + logger.LogError(e, e.Message); + context.Response.StatusCode = (int)HttpStatusCode.PreconditionFailed; + break; + + case { } e: + logger.LogError(e, e.Message); + context.Response.StatusCode = (int)HttpStatusCode.InternalServerError; + break; + } + + context.Response.ContentType = "application/json"; + var result = JsonConvert.SerializeObject(problemDetails); + return context.Response.WriteAsync(result); + } +} diff --git a/TeslaSolarCharger/Server/Program.cs b/TeslaSolarCharger/Server/Program.cs index 683dca424..28ab97d3c 100644 --- a/TeslaSolarCharger/Server/Program.cs +++ b/TeslaSolarCharger/Server/Program.cs @@ -1,12 +1,17 @@ +using FluentValidation; using Microsoft.EntityFrameworkCore; using Serilog; using Serilog.Context; +using SharpGrip.FluentValidation.AutoValidation.Mvc.Extensions; +using SharpGrip.FluentValidation.AutoValidation.Mvc.Interceptors; using System.Reflection; using TeslaSolarCharger.Model.Contracts; using TeslaSolarCharger.Server; using TeslaSolarCharger.Server.Contracts; +using TeslaSolarCharger.Server.Middlewares; using TeslaSolarCharger.Server.Resources.PossibleIssues.Contracts; using TeslaSolarCharger.Server.Scheduling; +using TeslaSolarCharger.Server.ServerValidators; using TeslaSolarCharger.Server.Services.Contracts; using TeslaSolarCharger.Services; using TeslaSolarCharger.Shared; @@ -20,7 +25,8 @@ // Add services to the container. builder.Services.AddControllersWithViews(); -builder.Services.AddControllers().AddNewtonsoftJson(); +builder.Services.AddControllers(options => options.Filters.Add()) + .AddNewtonsoftJson(); builder.Services.AddRazorPages(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle @@ -39,6 +45,10 @@ builder.Host.UseSerilog((context, configuration) => configuration .ReadFrom.Configuration(context.Configuration)); +builder.Services.AddFluentValidationAutoValidation(); +builder.Services.AddValidatorsFromAssemblyContaining(); + + var app = builder.Build(); Log.Logger = new LoggerConfiguration() @@ -75,6 +85,7 @@ app.UseBlazorFrameworkFiles(); app.UseStaticFiles(); +app.UseMiddleware(); app.UseRouting(); app.UseSwagger(); @@ -97,14 +108,6 @@ async Task DoStartupStuff(WebApplication webApplication, ILogger logger var teslaFleetApiService = webApplication.Services.GetRequiredService(); await teslaFleetApiService.RefreshFleetApiRequestsAreAllowed(); - try - { - await teslaFleetApiService.RefreshTokensIfAllowedAndNeeded(); - } - catch(Exception ex) - { - logger1.LogError(ex, "Error refreshing Tesla tokens"); - } var shouldRetry = false; var baseConfiguration = await configurationWrapper.GetBaseConfigurationAsync(); diff --git a/TeslaSolarCharger/Server/Resources/PossibleIssues/Contracts/IIssueKeys.cs b/TeslaSolarCharger/Server/Resources/PossibleIssues/Contracts/IIssueKeys.cs index b2654610a..7373d1c90 100644 --- a/TeslaSolarCharger/Server/Resources/PossibleIssues/Contracts/IIssueKeys.cs +++ b/TeslaSolarCharger/Server/Resources/PossibleIssues/Contracts/IIssueKeys.cs @@ -3,14 +3,11 @@ public interface IIssueKeys { string VersionNotUpToDate { get; } - string FleetApiTokenNotRequested { get; } string FleetApiTokenUnauthorized { get; } + string NoFleetApiToken { get; } string FleetApiTokenMissingScopes { get; } string FleetApiTokenRequestExpired { get; } - string FleetApiTokenNotReceived { get; } - string FleetApiTokenExpired { get; } string FleetApiTokenRefreshNonSuccessStatusCode { get; } - string FleetApiTokenNoApiRequestsAllowed { get; } string CrashedOnStartup { get; } string RestartNeeded { get; } string GetVehicle { get; } @@ -19,9 +16,16 @@ public interface IIssueKeys string FleetApiNonSuccessStatusCode { get; } string FleetApiNonSuccessResult { get; } string UnsignedCommand { get; } - string CarRateLimited { get; } string BleCommandNoSuccess { get; } string SolarValuesNotAvailable { get; } string UsingFleetApiAsBleFallback { get; } string BleVersionCompatibility { get; } + string NoBackendApiToken { get; } + string BackendTokenUnauthorized { get; } + string FleetApiTokenExpired { get; } + string Solar4CarSideFleetApiNonSuccessStatusCode { get; } + string BackendTokenNotRefreshable { get; } + string BaseAppNotLicensed { get; } + string FleetApiNotLicensed { get; } + string FleetTelemetryNotConnected { get; } } diff --git a/TeslaSolarCharger/Server/Resources/PossibleIssues/IssueKeys.cs b/TeslaSolarCharger/Server/Resources/PossibleIssues/IssueKeys.cs index 965c98307..fc2397de5 100644 --- a/TeslaSolarCharger/Server/Resources/PossibleIssues/IssueKeys.cs +++ b/TeslaSolarCharger/Server/Resources/PossibleIssues/IssueKeys.cs @@ -5,27 +5,30 @@ namespace TeslaSolarCharger.Server.Resources.PossibleIssues; public class IssueKeys : IIssueKeys { public string VersionNotUpToDate => "VersionNotUpToDate"; - public string FleetApiTokenNotRequested => "FleetApiTokenNotRequested"; public string FleetApiTokenUnauthorized => "FleetApiTokenUnauthorized"; + public string NoFleetApiToken => "NoFleetApiToken"; public string FleetApiTokenMissingScopes => "FleetApiTokenMissingScopes"; public string FleetApiTokenRequestExpired => "FleetApiTokenRequestExpired"; - public string FleetApiTokenNotReceived => "FleetApiTokenNotReceived"; public string FleetApiTokenRefreshNonSuccessStatusCode => "FleetApiTokenRefreshNonSuccessStatusCode"; - public string FleetApiTokenExpired => "FleetApiTokenExpired"; - public string FleetApiTokenNoApiRequestsAllowed => "FleetApiRequestsNotAllowed"; public string CrashedOnStartup => "CrashedOnStartup"; public string RestartNeeded => "RestartNeeded"; public string GetVehicle => "GetVehicle"; public string GetVehicleData => "GetVehicleData"; public string CarStateUnknown => "CarStateUnknown"; - public string UnhandledCarStateRefresh => "UnhandledCarStateRefresh"; public string FleetApiNonSuccessStatusCode => "FleetApiNonSuccessStatusCode_"; + public string Solar4CarSideFleetApiNonSuccessStatusCode => "Solar4CarSideFleetApiNonSuccessStatusCode_"; public string FleetApiNonSuccessResult => "FleetApiNonSuccessResult_"; public string UnsignedCommand => "UnsignedCommand"; - public string CarRateLimited => "CarRateLimited"; public string BleCommandNoSuccess => "BleCommandNoSuccess_"; public string SolarValuesNotAvailable => "SolarValuesNotAvailable"; public string UsingFleetApiAsBleFallback => "UsingFleetApiAsBleFallback"; public string BleVersionCompatibility => "BleVersionCompatibility"; + public string NoBackendApiToken => "NoBackendApiToken"; + public string BackendTokenUnauthorized => "BackendTokenUnauthorized"; + public string BackendTokenNotRefreshable => "BackendTokenNotRefreshable"; + public string FleetApiTokenExpired => "FleetApiTokenExpired"; + public string BaseAppNotLicensed => "BaseAppNotLicensed"; + public string FleetApiNotLicensed => "FleetApiNotLicensed"; + public string FleetTelemetryNotConnected => "FleetTelemetryNotConnected"; } diff --git a/TeslaSolarCharger/Server/Resources/PossibleIssues/PossibleIssues.cs b/TeslaSolarCharger/Server/Resources/PossibleIssues/PossibleIssues.cs index 71c4cde91..94544f4b4 100644 --- a/TeslaSolarCharger/Server/Resources/PossibleIssues/PossibleIssues.cs +++ b/TeslaSolarCharger/Server/Resources/PossibleIssues/PossibleIssues.cs @@ -18,7 +18,7 @@ public class PossibleIssues(IIssueKeys issueKeys) : IPossibleIssues HideOccurrenceCount = true, } }, - { issueKeys.FleetApiTokenNotRequested, new DtoIssue + { issueKeys.NoFleetApiToken, new DtoIssue { IssueSeverity = IssueSeverity.Error, IsTelegramEnabled = false, @@ -33,6 +33,7 @@ public class PossibleIssues(IIssueKeys issueKeys) : IPossibleIssues IsTelegramEnabled = true, ShowErrorAfterOccurrences = 1, HasPlaceHolderIssueKey = false, + HideOccurrenceCount = true, } }, { issueKeys.FleetApiTokenMissingScopes, new DtoIssue @@ -41,6 +42,7 @@ public class PossibleIssues(IIssueKeys issueKeys) : IPossibleIssues IsTelegramEnabled = true, ShowErrorAfterOccurrences = 1, HasPlaceHolderIssueKey = false, + HideOccurrenceCount = true, } }, { issueKeys.FleetApiTokenRequestExpired, new DtoIssue @@ -52,33 +54,6 @@ public class PossibleIssues(IIssueKeys issueKeys) : IPossibleIssues HideOccurrenceCount = true, } }, - { issueKeys.FleetApiTokenNotReceived, new DtoIssue - { - IssueSeverity = IssueSeverity.Warning, - IsTelegramEnabled = false, - ShowErrorAfterOccurrences = 1, - HasPlaceHolderIssueKey = false, - HideOccurrenceCount = true, - } - }, - { issueKeys.FleetApiTokenExpired, new DtoIssue - { - IssueSeverity = IssueSeverity.Error, - IsTelegramEnabled = true, - ShowErrorAfterOccurrences = 1, - HasPlaceHolderIssueKey = false, - HideOccurrenceCount = true, - } - }, - { issueKeys.FleetApiTokenNoApiRequestsAllowed, new DtoIssue - { - IssueSeverity = IssueSeverity.Error, - IsTelegramEnabled = true, - ShowErrorAfterOccurrences = 2, - HasPlaceHolderIssueKey = false, - HideOccurrenceCount = true, - } - }, { issueKeys.CrashedOnStartup, new DtoIssue { IssueSeverity = IssueSeverity.Error, @@ -153,14 +128,6 @@ public class PossibleIssues(IIssueKeys issueKeys) : IPossibleIssues HasPlaceHolderIssueKey = false, } }, - { issueKeys.CarRateLimited, new DtoIssue - { - IssueSeverity = IssueSeverity.Error, - IsTelegramEnabled = true, - ShowErrorAfterOccurrences = 1, - HasPlaceHolderIssueKey = false, - } - }, { issueKeys.BleCommandNoSuccess, new DtoIssue { IssueSeverity = IssueSeverity.Error, @@ -194,6 +161,78 @@ public class PossibleIssues(IIssueKeys issueKeys) : IPossibleIssues HideOccurrenceCount = true, } }, + { issueKeys.NoBackendApiToken, new DtoIssue + { + IssueSeverity = IssueSeverity.Error, + IsTelegramEnabled = true, + ShowErrorAfterOccurrences = 1, + HasPlaceHolderIssueKey = false, + HideOccurrenceCount = true, + } + }, + { issueKeys.BackendTokenUnauthorized, new DtoIssue + { + IssueSeverity = IssueSeverity.Error, + IsTelegramEnabled = true, + ShowErrorAfterOccurrences = 1, + HasPlaceHolderIssueKey = false, + HideOccurrenceCount = true, + } + }, + { issueKeys.FleetApiTokenExpired, new DtoIssue + { + IssueSeverity = IssueSeverity.Error, + IsTelegramEnabled = true, + ShowErrorAfterOccurrences = 2, + HasPlaceHolderIssueKey = false, + HideOccurrenceCount = true, + } + }, + { issueKeys.Solar4CarSideFleetApiNonSuccessStatusCode, new DtoIssue + { + IssueSeverity = IssueSeverity.Error, + IsTelegramEnabled = true, + ShowErrorAfterOccurrences = 2, + HasPlaceHolderIssueKey = true, + HideOccurrenceCount = true, + } + }, + { issueKeys.BackendTokenNotRefreshable, new DtoIssue + { + IssueSeverity = IssueSeverity.Error, + IsTelegramEnabled = true, + ShowErrorAfterOccurrences = 1, + HasPlaceHolderIssueKey = false, + HideOccurrenceCount = true, + } + }, + { issueKeys.BaseAppNotLicensed, new DtoIssue + { + IssueSeverity = IssueSeverity.Error, + IsTelegramEnabled = true, + ShowErrorAfterOccurrences = 1, + HasPlaceHolderIssueKey = false, + HideOccurrenceCount = true, + } + }, + { issueKeys.FleetApiNotLicensed, new DtoIssue + { + IssueSeverity = IssueSeverity.Error, + IsTelegramEnabled = true, + ShowErrorAfterOccurrences = 1, + HasPlaceHolderIssueKey = false, + HideOccurrenceCount = true, + } + }, + { issueKeys.FleetTelemetryNotConnected, new DtoIssue + { + IssueSeverity = IssueSeverity.Error, + IsTelegramEnabled = true, + ShowErrorAfterOccurrences = 1, + HasPlaceHolderIssueKey = false, + HideOccurrenceCount = true, + } + }, }; public DtoIssue GetIssueByKey(string key) diff --git a/TeslaSolarCharger/Server/Scheduling/JobManager.cs b/TeslaSolarCharger/Server/Scheduling/JobManager.cs index d00212425..4e2d229d8 100644 --- a/TeslaSolarCharger/Server/Scheduling/JobManager.cs +++ b/TeslaSolarCharger/Server/Scheduling/JobManager.cs @@ -43,10 +43,11 @@ public async Task StartJobs() var mqttReconnectionJob = JobBuilder.Create().WithIdentity(nameof(MqttReconnectionJob)).Build(); var newVersionCheckJob = JobBuilder.Create().WithIdentity(nameof(NewVersionCheckJob)).Build(); var spotPriceJob = JobBuilder.Create().WithIdentity(nameof(SpotPriceJob)).Build(); + var backendTokenRefreshJob = JobBuilder.Create().WithIdentity(nameof(BackendTokenRefreshJob)).Build(); var fleetApiTokenRefreshJob = JobBuilder.Create().WithIdentity(nameof(FleetApiTokenRefreshJob)).Build(); var vehicleDataRefreshJob = JobBuilder.Create().WithIdentity(nameof(VehicleDataRefreshJob)).Build(); var teslaMateChargeCostUpdateJob = JobBuilder.Create().WithIdentity(nameof(TeslaMateChargeCostUpdateJob)).Build(); - var apiCallCounterResetJob = JobBuilder.Create().WithIdentity(nameof(ApiCallCounterResetJob)).Build(); + var backendNotificationRefreshJob = JobBuilder.Create().WithIdentity(nameof(BackendNotificationRefreshJob)).Build(); var errorMessagingJob = JobBuilder.Create().WithIdentity(nameof(ErrorMessagingJob)).Build(); var errorDetectionJob = JobBuilder.Create().WithIdentity(nameof(ErrorDetectionJob)).Build(); var bleApiVersionDetectionJob = JobBuilder.Create().WithIdentity(nameof(BleApiVersionDetectionJob)).Build(); @@ -96,9 +97,12 @@ public async Task StartJobs() var spotPricePlanningTrigger = TriggerBuilder.Create().WithIdentity("spotPricePlanningTrigger") .WithSchedule(SimpleScheduleBuilder.RepeatHourlyForever(1)).Build(); - var fleetApiTokenRefreshTrigger = TriggerBuilder.Create().WithIdentity("fleetApiTokenRefreshTrigger") + var backendTokenRefreshTrigger = TriggerBuilder.Create().WithIdentity("backendTokenRefreshTrigger") .WithSchedule(SimpleScheduleBuilder.RepeatSecondlyForever(59)).Build(); + var fleetApiTokenRefreshTrigger = TriggerBuilder.Create().WithIdentity("fleetApiTokenRefreshTrigger") + .WithSchedule(SimpleScheduleBuilder.RepeatSecondlyForever(58)).Build(); + var vehicleDataRefreshTrigger = TriggerBuilder.Create().WithIdentity("vehicleDataRefreshTrigger") .WithSchedule(SimpleScheduleBuilder.RepeatSecondlyForever(configurationWrapper.CarRefreshAfterCommandSeconds())).Build(); @@ -154,10 +158,11 @@ public async Task StartJobs() triggersAndJobs.Add(carStateCachingJob, new HashSet { carStateCachingTrigger }); triggersAndJobs.Add(finishedChargingProcessFinalizingJob, new HashSet { finishedChargingProcessFinalizingTrigger }); triggersAndJobs.Add(mqttReconnectionJob, new HashSet { mqttReconnectionTrigger }); + triggersAndJobs.Add(backendTokenRefreshJob, new HashSet { backendTokenRefreshTrigger }); triggersAndJobs.Add(fleetApiTokenRefreshJob, new HashSet { fleetApiTokenRefreshTrigger }); triggersAndJobs.Add(vehicleDataRefreshJob, new HashSet { vehicleDataRefreshTrigger }); triggersAndJobs.Add(teslaMateChargeCostUpdateJob, new HashSet { teslaMateChargeCostUpdateTrigger }); - triggersAndJobs.Add(apiCallCounterResetJob, new HashSet { triggerAtNight, triggerNow }); + triggersAndJobs.Add(backendNotificationRefreshJob, new HashSet { triggerAtNight, triggerNow }); } await _scheduler.ScheduleJobs(triggersAndJobs, false).ConfigureAwait(false); diff --git a/TeslaSolarCharger/Server/Scheduling/Jobs/ApiCallCounterResetJob.cs b/TeslaSolarCharger/Server/Scheduling/Jobs/ApiCallCounterResetJob.cs deleted file mode 100644 index 84c5558c4..000000000 --- a/TeslaSolarCharger/Server/Scheduling/Jobs/ApiCallCounterResetJob.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Quartz; -using TeslaSolarCharger.Server.Services.Contracts; -using TeslaSolarCharger.Shared.Contracts; -using TeslaSolarCharger.Shared.Dtos.Contracts; - -namespace TeslaSolarCharger.Server.Scheduling.Jobs; - -public class ApiCallCounterResetJob(ILogger logger, - ITeslaFleetApiService service, - IBackendApiService backendApiService, - IDateTimeProvider dateTimeProvider, - ISettings settings) : IJob -{ - public async Task Execute(IJobExecutionContext context) - { - logger.LogTrace("{method}({context})", nameof(Execute), context); - if (settings.StartupTime < dateTimeProvider.UtcNow().AddMinutes(-10)) - { - await backendApiService.PostTeslaApiCallStatistics().ConfigureAwait(false); - } - service.ResetApiRequestCounters(); - await backendApiService.GetNewBackendNotifications().ConfigureAwait(false); - } -} diff --git a/TeslaSolarCharger/Server/Scheduling/Jobs/BackendNotificationRefreshJob.cs b/TeslaSolarCharger/Server/Scheduling/Jobs/BackendNotificationRefreshJob.cs new file mode 100644 index 000000000..aa9ddcfdb --- /dev/null +++ b/TeslaSolarCharger/Server/Scheduling/Jobs/BackendNotificationRefreshJob.cs @@ -0,0 +1,16 @@ +using Quartz; +using TeslaSolarCharger.Server.Services.Contracts; + +namespace TeslaSolarCharger.Server.Scheduling.Jobs; + +public class BackendNotificationRefreshJob(ILogger logger, + ITeslaFleetApiService service, + IBackendApiService backendApiService) : IJob +{ + public async Task Execute(IJobExecutionContext context) + { + logger.LogTrace("{method}({context})", nameof(Execute), context); + service.ResetApiRequestCounters(); + await backendApiService.GetNewBackendNotifications().ConfigureAwait(false); + } +} diff --git a/TeslaSolarCharger/Server/Scheduling/Jobs/BackendTokenRefreshJob.cs b/TeslaSolarCharger/Server/Scheduling/Jobs/BackendTokenRefreshJob.cs new file mode 100644 index 000000000..e6cb24863 --- /dev/null +++ b/TeslaSolarCharger/Server/Scheduling/Jobs/BackendTokenRefreshJob.cs @@ -0,0 +1,16 @@ +using Quartz; +using TeslaSolarCharger.Server.Services.Contracts; + +namespace TeslaSolarCharger.Server.Scheduling.Jobs; + +[DisallowConcurrentExecution] +public class BackendTokenRefreshJob(ILogger logger, + IBackendApiService service) + : IJob +{ + public async Task Execute(IJobExecutionContext context) + { + logger.LogTrace("{method}({context})", nameof(Execute), context); + await service.RefreshBackendTokenIfNeeded().ConfigureAwait(false); + } +} diff --git a/TeslaSolarCharger/Server/Scheduling/Jobs/FleetApiTokenRefreshJob.cs b/TeslaSolarCharger/Server/Scheduling/Jobs/FleetApiTokenRefreshJob.cs index 3996a50b4..00e1c69cf 100644 --- a/TeslaSolarCharger/Server/Scheduling/Jobs/FleetApiTokenRefreshJob.cs +++ b/TeslaSolarCharger/Server/Scheduling/Jobs/FleetApiTokenRefreshJob.cs @@ -11,13 +11,6 @@ public class FleetApiTokenRefreshJob(ILogger logger, public async Task Execute(IJobExecutionContext context) { logger.LogTrace("{method}({context})", nameof(Execute), context); - await service.RefreshFleetApiRequestsAreAllowed().ConfigureAwait(false); - var newTokenReceived = await service.GetNewTokenFromBackend().ConfigureAwait(false); - if (newTokenReceived) - { - logger.LogInformation("A new Tesla Token was received."); - - } - await service.RefreshTokensIfAllowedAndNeeded().ConfigureAwait(false); + await service.RefreshFleetApiTokenIfNeeded().ConfigureAwait(false); } } diff --git a/TeslaSolarCharger/Server/ServerValidators/CarBasicConfigurationValidator.cs b/TeslaSolarCharger/Server/ServerValidators/CarBasicConfigurationValidator.cs new file mode 100644 index 000000000..e80b34091 --- /dev/null +++ b/TeslaSolarCharger/Server/ServerValidators/CarBasicConfigurationValidator.cs @@ -0,0 +1,69 @@ +using FluentValidation; +using Microsoft.EntityFrameworkCore; +using TeslaSolarCharger.Model.Contracts; +using TeslaSolarCharger.Server.Services.Contracts; +using TeslaSolarCharger.Shared.Contracts; +using TeslaSolarCharger.Shared.Enums; + +namespace TeslaSolarCharger.Server.ServerValidators; + +public class CarBasicConfigurationValidator : Shared.Dtos.CarBasicConfigurationValidator +{ + public CarBasicConfigurationValidator(IConfigurationWrapper configurationWrapper, IBleService bleService, ITokenHelper tokenHelper, ITeslaSolarChargerContext dbContext) + { + When(x => x.ShouldBeManaged, () => + { + var isTeslaMateDataSource = configurationWrapper.UseTeslaMateIntegration() && !configurationWrapper.GetVehicleDataFromTesla(); + if (isTeslaMateDataSource) + { + RuleFor(x => x.UseFleetTelemetry).Equal(false) + .WithMessage("As TeslaMate is selected as DataSource in BaseConfiguration you can not enable Fleet Telemetry"); + } + + When(x => (x.UseFleetTelemetry == false), () => + { + RuleFor(x => x.IncludeTrackingRelevantFields) + .Equal(false) + .WithMessage("Tracking relevant fields can only be included if Fleet Telemetry is enabled."); + }); + + RuleFor(x => x.UseFleetTelemetry) + .CustomAsync(async (fleetTelemetryEnabled, context, cancellationToken) => + { + if (fleetTelemetryEnabled != true) + { + return; + } + var tokenState = await tokenHelper.GetFleetApiTokenState(true); + if (tokenState != TokenState.UpToDate) + { + context.AddFailure("You need a valid Fleet API token to use Fleet Telemetry. Go to BaseConfiguration to Generate a new Fleet API Token."); + } + var isCarFleetTelemetryHardwareIncompatible = await dbContext.Cars + .Where(c => c.Vin == context.InstanceToValidate.Vin && c.IsFleetTelemetryHardwareIncompatible) + .Select(c => c.IsFleetTelemetryHardwareIncompatible) + .FirstOrDefaultAsync(); + if (isCarFleetTelemetryHardwareIncompatible) + { + context.AddFailure("The selected car is not compatible with Fleet Telemetry. Please disable Fleet Telemetry."); + } + }); + + When(x => x.UseBle, () => + { + RuleFor(x => x.BleApiBaseUrl) + .NotEmpty() + .CustomAsync(async (bleApiBaseUrl, context, cancellationToken) => + { + var errorMessage = await bleService.CheckBleApiVersionCompatibility(bleApiBaseUrl); + if (!string.IsNullOrEmpty(errorMessage)) + { + // The validation failed; add your returned error message directly: + context.AddFailure(errorMessage); + } + }); + + }); + }); + } +} diff --git a/TeslaSolarCharger/Server/ServiceCollectionExtensions.cs b/TeslaSolarCharger/Server/ServiceCollectionExtensions.cs index 9ea7ce85b..5c84d4184 100644 --- a/TeslaSolarCharger/Server/ServiceCollectionExtensions.cs +++ b/TeslaSolarCharger/Server/ServiceCollectionExtensions.cs @@ -11,6 +11,7 @@ using TeslaSolarCharger.Model.EntityFramework; using TeslaSolarCharger.Server.Contracts; using TeslaSolarCharger.Server.Helper; +using TeslaSolarCharger.Server.Middlewares; using TeslaSolarCharger.Server.Resources.PossibleIssues; using TeslaSolarCharger.Server.Resources.PossibleIssues.Contracts; using TeslaSolarCharger.Server.Scheduling; @@ -30,7 +31,6 @@ using TeslaSolarCharger.Shared.TimeProviding; using TeslaSolarCharger.Shared.Wrappers; using TeslaSolarCharger.SharedBackend; -using TeslaSolarCharger.SharedBackend.MappingExtensions; namespace TeslaSolarCharger.Server; @@ -48,10 +48,11 @@ public static IServiceCollection AddMyDependencies(this IServiceCollection servi .AddTransient() .AddTransient() .AddTransient() + .AddTransient() .AddTransient() .AddTransient() .AddTransient() - .AddTransient() + .AddTransient() .AddTransient() .AddTransient() .AddTransient() @@ -89,7 +90,6 @@ public static IServiceCollection AddMyDependencies(this IServiceCollection servi }, ServiceLifetime.Transient, ServiceLifetime.Transient) .AddTransient() .AddTransient() - .AddTransient() .AddTransient() .AddTransient() .AddTransient() @@ -100,7 +100,7 @@ public static IServiceCollection AddMyDependencies(this IServiceCollection servi .AddTransient() .AddTransient() .AddTransient() - .AddTransient() + .AddTransient() .AddTransient() .AddTransient() .AddTransient() @@ -113,8 +113,10 @@ public static IServiceCollection AddMyDependencies(this IServiceCollection servi .AddTransient() .AddTransient() .AddTransient() + .AddTransient() .AddSingleton() .AddSingleton() + .AddScoped() .AddSharedBackendDependencies(); return services; } diff --git a/TeslaSolarCharger/Server/Services/ApiServices/IndexService.cs b/TeslaSolarCharger/Server/Services/ApiServices/IndexService.cs index 9edd92dda..25e092eb9 100644 --- a/TeslaSolarCharger/Server/Services/ApiServices/IndexService.cs +++ b/TeslaSolarCharger/Server/Services/ApiServices/IndexService.cs @@ -81,11 +81,6 @@ public async Task> GetCarBaseStatesOfEnabledCars() var dbCar = await teslaSolarChargerContext.Cars.Where(c => c.Id == enabledCar.Id).SingleAsync(); dtoCarBaseValues.FleetApiState = dbCar.TeslaFleetApiState; - dtoCarBaseValues.VehicleRateLimitedUntil = dbCar.VehicleRateLimitedUntil; - dtoCarBaseValues.VehicleDataRateLimitedUntil = dbCar.VehicleDataRateLimitedUntil; - dtoCarBaseValues.CommandsRateLimitedUntil = dbCar.CommandsRateLimitedUntil; - dtoCarBaseValues.ChargingCommandsRateLimitedUntil = dbCar.ChargingCommandsRateLimitedUntil; - dtoCarBaseValues.WakeUpRateLimitedUntil = dbCar.WakeUpRateLimitedUntil; dtoCarBaseValues.ChargeInformation = GenerateChargeInformation(enabledCar); dtoCarBaseValues.ModuleTemperatureMin = await teslaSolarChargerContext.CarValueLogs .Where(c => c.CarId == enabledCar.Id && c.Type == CarValueType.ModuleTempMin) diff --git a/TeslaSolarCharger/Server/Services/BackendApiService.cs b/TeslaSolarCharger/Server/Services/BackendApiService.cs index b36bbe554..42a57f4c1 100644 --- a/TeslaSolarCharger/Server/Services/BackendApiService.cs +++ b/TeslaSolarCharger/Server/Services/BackendApiService.cs @@ -1,15 +1,18 @@ -using Microsoft.EntityFrameworkCore; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Caching.Memory; using Newtonsoft.Json; using System.Diagnostics; using System.Reflection; using TeslaSolarCharger.Model.Contracts; using TeslaSolarCharger.Model.Entities.TeslaSolarCharger; +using TeslaSolarCharger.Server.Dtos.Solar4CarBackend.User; using TeslaSolarCharger.Server.Dtos.TscBackend; using TeslaSolarCharger.Server.Resources.PossibleIssues.Contracts; using TeslaSolarCharger.Server.Services.Contracts; using TeslaSolarCharger.Shared.Contracts; using TeslaSolarCharger.Shared.Dtos; -using TeslaSolarCharger.Shared.Dtos.Contracts; +using TeslaSolarCharger.Shared.Enums; using TeslaSolarCharger.Shared.Resources.Contracts; namespace TeslaSolarCharger.Server.Services; @@ -21,114 +24,173 @@ public class BackendApiService( ITeslaSolarChargerContext teslaSolarChargerContext, IConstants constants, IDateTimeProvider dateTimeProvider, - ISettings settings, IErrorHandlingService errorHandlingService, - IIssueKeys issueKeys) + IIssueKeys issueKeys, + IPasswordGenerationService passwordGenerationService, + ITokenHelper tokenHelper, + IMemoryCache memoryCache) : IBackendApiService { public async Task> StartTeslaOAuth(string locale, string baseUrl) { logger.LogTrace("{method}()", nameof(StartTeslaOAuth)); - var currentTokens = await teslaSolarChargerContext.TeslaTokens.ToListAsync().ConfigureAwait(false); - teslaSolarChargerContext.TeslaTokens.RemoveRange(currentTokens); - var configEntriesToRemove = await teslaSolarChargerContext.TscConfigurations - .Where(c => c.Key == constants.TokenMissingScopes) - .ToListAsync().ConfigureAwait(false); - teslaSolarChargerContext.TscConfigurations.RemoveRange(configEntriesToRemove); - await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); - var installationId = await tscConfigurationService.GetInstallationId().ConfigureAwait(false); - var backendApiBaseUrl = configurationWrapper.BackendApiBaseUrl(); - using var httpClient = new HttpClient(); - var requestUri = $"{backendApiBaseUrl}Tsc/StartTeslaOAuth?installationId={Uri.EscapeDataString(installationId.ToString())}&baseUrl={Uri.EscapeDataString(baseUrl)}"; - var responseString = await httpClient.GetStringAsync(requestUri).ConfigureAwait(false); - var oAuthRequestInformation = JsonConvert.DeserializeObject(responseString) ?? throw new InvalidDataException("Could not get oAuth data"); - var requestUrl = GenerateAuthUrl(oAuthRequestInformation, locale); - var tokenRequested = await teslaSolarChargerContext.TscConfigurations - .Where(c => c.Key == constants.FleetApiTokenRequested) - .FirstOrDefaultAsync().ConfigureAwait(false); - if (tokenRequested == null) + var encryptionKey = passwordGenerationService.GeneratePassword(32); + await tscConfigurationService.SetConfigurationValueByKey(constants.TeslaTokenEncryptionKeyKey, encryptionKey).ConfigureAwait(false); + var state = Guid.NewGuid(); + var requestUri = $"Client/AddAuthenticationStartInformation?redirectUri={Uri.EscapeDataString(baseUrl)}&encryptionKey={Uri.EscapeDataString(encryptionKey)}&state={Uri.EscapeDataString(state.ToString())}"; + var request = new HttpRequestMessage(HttpMethod.Post, requestUri); + var token = await teslaSolarChargerContext.BackendTokens.SingleOrDefaultAsync().ConfigureAwait(false); + if (token == default) { - var config = new TscConfiguration - { - Key = constants.FleetApiTokenRequested, - Value = dateTimeProvider.UtcNow().ToString("O"), - }; - teslaSolarChargerContext.TscConfigurations.Add(config); + throw new InvalidOperationException("Can not start Tesla O Auth without backend token"); } - else + var result = await SendRequestToBackend(HttpMethod.Post, token.AccessToken, requestUri, null).ConfigureAwait(false); + request.Headers.Authorization = new("Bearer", token.AccessToken); + var oAuthRequestInformation = result.Data; + if (result.HasError) { - tokenRequested.Value = dateTimeProvider.UtcNow().ToString("O"); + throw new InvalidOperationException(result.ErrorMessage); } - await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); - await errorHandlingService.HandleError(nameof(BackendApiService), nameof(StartTeslaOAuth), "Waiting for Tesla token", - "Waiting for the Tesla Token from the TSC backend. This might take up to five minutes. If after five minutes this error is still displayed, open the Base Configuration and request a new token.", - issueKeys.FleetApiTokenNotReceived, null, null); - //Do not set FleetApiTokenNotReceived to resolved here, as the token might still be in transit - await errorHandlingService.HandleErrorResolved(issueKeys.FleetApiTokenNotRequested, null); + + if (oAuthRequestInformation == default) + { + throw new InvalidOperationException("oAuth Information is null"); + } + var requestUrl = GenerateAuthUrl(oAuthRequestInformation, locale); + await tscConfigurationService.SetConfigurationValueByKey(constants.FleetApiTokenMissingScopes, "false"); + await tscConfigurationService.SetConfigurationValueByKey(constants.FleetApiTokenUnauthorizedKey, "false"); await errorHandlingService.HandleErrorResolved(issueKeys.FleetApiTokenUnauthorized, null); await errorHandlingService.HandleErrorResolved(issueKeys.FleetApiTokenMissingScopes, null); await errorHandlingService.HandleErrorResolved(issueKeys.FleetApiTokenRequestExpired, null); - await errorHandlingService.HandleErrorResolved(issueKeys.FleetApiTokenExpired, null); await errorHandlingService.HandleErrorResolved(issueKeys.FleetApiTokenRefreshNonSuccessStatusCode, null); - return new DtoValue(requestUrl); + return new(requestUrl); } - internal string GenerateAuthUrl(DtoTeslaOAuthRequestInformation oAuthInformation, string locale) + public async Task GetToken(DtoBackendLogin login) { - logger.LogTrace("{method}({@oAuthInformation})", nameof(GenerateAuthUrl), oAuthInformation); - var url = - $"https://auth.tesla.com/oauth2/v3/authorize?&client_id={Uri.EscapeDataString(oAuthInformation.ClientId)}&locale={Uri.EscapeDataString(locale)}&prompt={Uri.EscapeDataString(oAuthInformation.Prompt)}&redirect_uri={Uri.EscapeDataString(oAuthInformation.RedirectUri)}&response_type={Uri.EscapeDataString(oAuthInformation.ResponseType)}&scope={Uri.EscapeDataString(oAuthInformation.Scope)}&state={Uri.EscapeDataString(oAuthInformation.State)}&prompt_missing_scopes=true"; - return url; + logger.LogTrace("{method}()", nameof(GetToken)); + + if (string.IsNullOrEmpty(login.UserName)) + { + throw new InvalidOperationException("Username is empty"); + } + if (string.IsNullOrEmpty(login.Password)) + { + throw new InvalidOperationException("Password is empty"); + } + var token = await teslaSolarChargerContext.BackendTokens.SingleOrDefaultAsync(); + if (token != default) + { + teslaSolarChargerContext.BackendTokens.Remove(token); + } + var installationId = await tscConfigurationService.GetInstallationId().ConfigureAwait(false); + var dtoLogin = new DtoLogin(login.UserName, login.Password, installationId.ToString()); + var result = await SendRequestToBackend(HttpMethod.Post, null, "User/Login", dtoLogin); + if (result.HasError) + { + throw new InvalidOperationException(result.ErrorMessage); + } + var newToken = result.Data; + if(newToken == default) + { + throw new InvalidOperationException("Could not parse token"); + } + token = new(newToken.AccessToken, newToken.RefreshToken) + { + ExpiresAtUtc = DateTimeOffset.FromUnixTimeSeconds(newToken.ExpiresAt), + }; + teslaSolarChargerContext.BackendTokens.Add(token); + await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); + await errorHandlingService.HandleErrorResolved(issueKeys.BackendTokenUnauthorized, null); + await errorHandlingService.HandleErrorResolved(issueKeys.BackendTokenNotRefreshable, null); + await errorHandlingService.HandleErrorResolved(issueKeys.NoBackendApiToken, null); } - public async Task PostInstallationInformation(string reason) + public async Task RefreshBackendTokenIfNeeded() { - try + logger.LogTrace("{method}(token)", nameof(RefreshBackendTokenIfNeeded)); + var tokenExpriationDate = await tokenHelper.GetBackendTokenExpirationDate(); + if(tokenExpriationDate == default) { - var url = configurationWrapper.BackendApiBaseUrl() + "Tsc/NotifyInstallation"; - var installationId = await tscConfigurationService.GetInstallationId().ConfigureAwait(false); - var currentVersion = await GetCurrentVersion().ConfigureAwait(false); - var installationInformation = new DtoInstallationInformation - { - InstallationId = installationId.ToString(), - Version = currentVersion ?? "unknown", - InfoReason = reason, - }; - using var httpClient = new HttpClient(); - httpClient.Timeout = TimeSpan.FromSeconds(10); - var response = await httpClient.PostAsJsonAsync(url, installationInformation).ConfigureAwait(false); + logger.LogError("Could not refresh backend token. No token found."); + return; } - catch (Exception e) + var currentDate = dateTimeProvider.DateTimeOffSetUtcNow(); + if(tokenExpriationDate > currentDate.AddMinutes(1)) { - logger.LogError(e, "Could not post installation information"); + logger.LogTrace("Token is still valid"); + return; + } + //As expiration date is not null a token must exist. + var token = await teslaSolarChargerContext.BackendTokens.SingleAsync(); + var dtoRefreshToken = new DtoTokenRefreshModel(token.AccessToken, token.RefreshToken); + var result = await SendRequestToBackend(HttpMethod.Post, null, "User/RefreshToken", dtoRefreshToken); + if (result.HasError) + { + await errorHandlingService.HandleError(nameof(BackendApiService), nameof(RefreshBackendTokenIfNeeded), + "Could not refresh backend token", result.ErrorMessage ?? string.Empty, issueKeys.BackendTokenNotRefreshable, null, null); + logger.LogError("Could not refresh backend token. {errorMessage}", result.ErrorMessage); + memoryCache.Remove(constants.BackendTokenStateKey); + throw new InvalidOperationException($"Could not refresh backend token {result.ErrorMessage}"); } + await errorHandlingService.HandleErrorResolved(issueKeys.BackendTokenUnauthorized, null); + await errorHandlingService.HandleErrorResolved(issueKeys.BackendTokenNotRefreshable, null); + await errorHandlingService.HandleErrorResolved(issueKeys.NoBackendApiToken, null); + var newToken = result.Data ?? throw new InvalidDataException("Could not parse new token"); + token.AccessToken = newToken.AccessToken; + token.RefreshToken = newToken.RefreshToken; + token.ExpiresAtUtc = DateTimeOffset.FromUnixTimeSeconds(newToken.ExpiresAt); + await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); + memoryCache.Remove(constants.BackendTokenStateKey); + } + internal string GenerateAuthUrl(DtoTeslaOAuthRequestInformation oAuthInformation, string locale) + { + logger.LogTrace("{method}({@oAuthInformation})", nameof(GenerateAuthUrl), oAuthInformation); + var url = + $"https://auth.tesla.com/oauth2/v3/authorize?&client_id={Uri.EscapeDataString(oAuthInformation.ClientId)}&locale={Uri.EscapeDataString(locale)}&prompt={Uri.EscapeDataString(oAuthInformation.Prompt)}&redirect_uri={Uri.EscapeDataString(oAuthInformation.RedirectUri)}&response_type={Uri.EscapeDataString(oAuthInformation.ResponseType)}&scope={Uri.EscapeDataString(oAuthInformation.Scope)}&state={Uri.EscapeDataString(oAuthInformation.State)}&prompt_missing_scopes=true"; + return url; } - public async Task PostErrorInformation(string source, string methodName, string message, string issueKey, string? vin, - string? stackTrace) + public async Task PostInstallationInformation(string reason) + { try { - var url = configurationWrapper.BackendApiBaseUrl() + "Tsc/NotifyError"; + var tokenState = await tokenHelper.GetBackendTokenState(true); var installationId = await tscConfigurationService.GetInstallationId().ConfigureAwait(false); var currentVersion = await GetCurrentVersion().ConfigureAwait(false); - var errorInformation = new DtoErrorInformation() - { - InstallationId = installationId.ToString(), - Source = source, - MethodName = methodName, - Message = message, - Version = currentVersion ?? "unknown", - StackTrace = stackTrace, - }; + using var httpClient = new HttpClient(); httpClient.Timeout = TimeSpan.FromSeconds(10); - var response = await httpClient.PostAsJsonAsync(url, errorInformation).ConfigureAwait(false); + if (tokenState == TokenState.UpToDate) + { + var token = await teslaSolarChargerContext.BackendTokens.SingleAsync(); + var result = await SendRequestToBackend(HttpMethod.Post, token.AccessToken, + $"Client/NotifyInstallation?version={Uri.EscapeDataString(currentVersion ?? string.Empty)}&infoReason={Uri.EscapeDataString(reason)}", + null); + if (!result.HasError) + { + logger.LogInformation("Sent installation information to Backend"); + return; + } + + logger.LogWarning("Error while sending installation information to backend. {errorMessage}", result.ErrorMessage); + } + var noTokenResult = await SendRequestToBackend(HttpMethod.Post, null, + $"Client/NotifyInstallationAnonymous?version={Uri.EscapeDataString(currentVersion ?? string.Empty)}&infoReason={Uri.EscapeDataString(reason)}&installationId={Uri.EscapeDataString(installationId.ToString())}", + null); + if (!noTokenResult.HasError) + { + logger.LogInformation("Sent installation information to Backend"); + return; + } + + logger.LogWarning("Error while sending installation information to backend. {errorMessage}", noTokenResult.ErrorMessage); } catch (Exception e) { - logger.LogError(e, "Could not post error information"); + logger.LogError(e, "Could not post installation information"); } } @@ -141,62 +203,6 @@ public async Task PostErrorInformation(string source, string methodName, string return Task.FromResult(fileVersionInfo.ProductVersion); } - public async Task PostTeslaApiCallStatistics() - { - logger.LogTrace("{method}()", nameof(PostTeslaApiCallStatistics)); - var shouldTransferDate = configurationWrapper.SendTeslaApiStatsToBackend(); - var currentDate = dateTimeProvider.UtcNow().Date; - if (!shouldTransferDate) - { - logger.LogWarning("You manually disabled tesla API stats transfer to the backend. This means your usage won't be considered in future optimizations."); - return; - } - - Func predicate = d => d > (currentDate.AddDays(-1)) && (d < currentDate); - var cars = settings.Cars.Where(c => c.WakeUpCalls.Count(predicate) > 0 - || c.VehicleDataCalls.Count(predicate) > 0 - || c.VehicleCalls.Count(predicate) > 0 - || c.ChargeStartCalls.Count(predicate) > 0 - || c.ChargeStopCalls.Count(predicate) > 0 - || c.SetChargingAmpsCall.Count(predicate) > 0 - || c.OtherCommandCalls.Count(predicate) > 0).ToList(); - - var getVehicleDataFromTesla = configurationWrapper.GetVehicleDataFromTesla(); - foreach (var car in cars) - { - var statistics = new DtoTeslaApiCallStatistic - { - Date = DateOnly.FromDateTime(currentDate.AddDays(-1)), - InstallationId = await tscConfigurationService.GetInstallationId().ConfigureAwait(false), - StartupTime = settings.StartupTime, - GetDataFromTesla = getVehicleDataFromTesla, - ApiRefreshInterval = (int) configurationWrapper.FleetApiRefreshInterval().TotalSeconds, - UseBle = car.UseBle, - Vin = car.Vin, - WakeUpCalls = car.WakeUpCalls.Where(predicate).ToList(), - VehicleDataCalls = car.VehicleDataCalls.Where(predicate).ToList(), - VehicleCalls = car.VehicleCalls.Where(predicate).ToList(), - ChargeStartCalls = car.ChargeStartCalls.Where(predicate).ToList(), - ChargeStopCalls = car.ChargeStopCalls.Where(predicate).ToList(), - SetChargingAmpsCall = car.SetChargingAmpsCall.Where(predicate).ToList(), - OtherCommandCalls = car.OtherCommandCalls.Where(predicate).ToList(), - }; - var url = configurationWrapper.BackendApiBaseUrl() + "Tsc/NotifyTeslaApiCallStatistics"; - try - { - using var httpClient = new HttpClient(); - httpClient.Timeout = TimeSpan.FromSeconds(10); - var response = await httpClient.PostAsJsonAsync(url, statistics).ConfigureAwait(false); - } - catch (Exception e) - { - logger.LogError(e, "Could not post tesla api call statistics"); - } - - } - - } - public async Task GetNewBackendNotifications() { logger.LogTrace("{method}()", nameof(GetNewBackendNotifications)); @@ -205,12 +211,13 @@ public async Task GetNewBackendNotifications() .OrderByDescending(n => n.BackendIssueId) .Select(n => n.BackendIssueId) .FirstOrDefaultAsync().ConfigureAwait(false); - var url = configurationWrapper.BackendApiBaseUrl() + $"Tsc/GetBackendNotifications?installationId={installationId}&lastKnownNotificationId={lastKnownNotificationId}"; - using var httpClient = new HttpClient(); - httpClient.Timeout = TimeSpan.FromSeconds(10); - var response = await httpClient.GetStringAsync(url).ConfigureAwait(false); - var notifications = JsonConvert.DeserializeObject>(response) ?? throw new InvalidDataException("Could not parse notifications"); - + var result = await SendRequestToBackend>(HttpMethod.Get, null, + $"Tsc/GetBackendNotifications?installationId={installationId}&lastKnownNotificationId={lastKnownNotificationId}", null); + if (result.HasError) + { + logger.LogError("Could not load new Backend Information. {errorMessage}", result.ErrorMessage); + } + var notifications = result.Data ?? throw new InvalidDataException("Could not parse notifications"); foreach (var dtoBackendNotification in notifications) { teslaSolarChargerContext.BackendNotifications.Add(new BackendNotification @@ -227,4 +234,158 @@ public async Task GetNewBackendNotifications() } await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); } + + public async Task IsBaseAppLicensed(bool useCache) + { + logger.LogTrace("{method}({useCache})", nameof(IsBaseAppLicensed), useCache); + + if (useCache && memoryCache.TryGetValue(constants.IsBaseAppLicensedKey, out bool cachedIsLicense)) + { + logger.LogTrace("Returning is base app licensed from cache: {isLicensed}", cachedIsLicense); + return cachedIsLicense; + } + + var token = await teslaSolarChargerContext.BackendTokens.SingleAsync(); + var isLicensed = await SendRequestToBackend>(HttpMethod.Get, token.AccessToken, "Client/IsBaseAppLicensed", null); + if (isLicensed.HasError) + { + logger.LogError("Could not check if base app is licensed. {errorMessage}", isLicensed.ErrorMessage); + return false; + } + var isBaseAppLicensed = isLicensed.Data?.Value ?? false; + memoryCache.Set(constants.IsBaseAppLicensedKey, isBaseAppLicensed, GetLicenseCacheEntryOptions()); + return isBaseAppLicensed; + } + + public async Task IsFleetApiLicensed(string vin, bool useCache) + { + logger.LogTrace("{method}({vin}, {useCache})", nameof(IsFleetApiLicensed), vin, useCache); + var memoryCacheKey = $"{constants.IsFleetApiLicensedKey}{vin}"; + + if (useCache && memoryCache.TryGetValue(memoryCacheKey, out bool cachedIsLicense)) + { + logger.LogTrace("Returning is base app licensed from cache: {isLicensed}", cachedIsLicense); + return cachedIsLicense; + } + + var token = await teslaSolarChargerContext.BackendTokens.SingleAsync(); + var isLicensed = await SendRequestToBackend>(HttpMethod.Get, token.AccessToken, $"Client/IsFleetApiLicensed?vin={vin}", null); + if (isLicensed.HasError) + { + logger.LogError("Could not check if fleet api is licensed for car {vin}. {errorMessage}", vin, isLicensed.ErrorMessage); + return false; + } + var isFleetApiLicensed = isLicensed.Data?.Value ?? false; + memoryCache.Set(memoryCacheKey, isFleetApiLicensed, GetLicenseCacheEntryOptions()); + + return isFleetApiLicensed; + } + + /// + /// Send a request to the backend API + /// + /// + /// HTTP Method to use + /// Backend API Token + /// Request URL, e.g. User/Login + /// Body to send to backend + /// + public async Task> SendRequestToBackend(HttpMethod httpMethod, string? accessToken, string requestUrlPart, object? content) + { + var request = new HttpRequestMessage(); + var finalUrl = configurationWrapper.BackendApiBaseUrl() + requestUrlPart; + request.RequestUri = new Uri(finalUrl); + if (accessToken != default) + { + request.Headers.Authorization = new("Bearer", accessToken); + } + try + { + using var httpClient = new HttpClient(); + httpClient.Timeout = TimeSpan.FromSeconds(10); + if (httpMethod == HttpMethod.Get) + { + request.Method = HttpMethod.Get; + } + else if (httpMethod == HttpMethod.Post) + { + request.Method = HttpMethod.Post; + if (content != default) + { + var jsonContent = new StringContent( + JsonConvert.SerializeObject(content), + System.Text.Encoding.UTF8, + "application/json"); + request.Content = jsonContent; + } + } + else + { + return new Dtos.Result( + default, + $"Unsupported HTTP method: {httpMethod}", + null + ); + } + var response = await httpClient.SendAsync(request).ConfigureAwait(false); + if (response.IsSuccessStatusCode) + { + var responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + if (typeof(T) != typeof(object)) + { + var deserializedObject = JsonConvert.DeserializeObject(responseContent); + + if (deserializedObject == null) + { + return new Dtos.Result( + default, + $"{finalUrl}: Could not deserialize response to {typeof(T).Name}.", + null + ); + } + + return new Dtos.Result(deserializedObject, null, null); + } + else + { + // If T=object, we don't do any deserialization + return new Dtos.Result( + default, + null, + null + ); + } + } + else + { + var problemDetails = await response.Content.ReadFromJsonAsync(); + var message = problemDetails != null + ? $"Cloud Error: {problemDetails.Detail}" + : "An error occurred while retrieving data from the backend server."; + + return new Dtos.Result(default, message, problemDetails); + } + } + catch (Exception ex) + { + logger.LogError(ex, "Error while sending request to backend"); + return new Dtos.Result( + default, + $"{finalUrl}: Unexpected error: {ex.Message}", null + ); + } + + } + + + private MemoryCacheEntryOptions GetLicenseCacheEntryOptions() + { + logger.LogTrace("{method}()", nameof(GetLicenseCacheEntryOptions)); + var validFor = TimeSpan.FromHours(6); + return new() + { + AbsoluteExpirationRelativeToNow = validFor, + }; + } + } diff --git a/TeslaSolarCharger/Server/Services/ChargingCostService.cs b/TeslaSolarCharger/Server/Services/ChargingCostService.cs index d97051a7f..6ec13a8ea 100644 --- a/TeslaSolarCharger/Server/Services/ChargingCostService.cs +++ b/TeslaSolarCharger/Server/Services/ChargingCostService.cs @@ -8,14 +8,12 @@ using TeslaSolarCharger.Shared.Dtos.Contracts; using TeslaSolarCharger.Shared.Enums; using TeslaSolarCharger.Shared.Resources.Contracts; -using TeslaSolarCharger.SharedBackend.MappingExtensions; namespace TeslaSolarCharger.Server.Services; public class ChargingCostService( ILogger logger, ITeslaSolarChargerContext teslaSolarChargerContext, - IMapperConfigurationFactory mapperConfigurationFactory, IServiceProvider serviceProvider, IConstants constants, ITscOnlyChargingCostService tscOnlyChargingCostService, @@ -237,13 +235,17 @@ public async Task DeleteChargePriceById(int id) public async Task> GetChargePrices() { logger.LogTrace("{method}()", nameof(GetChargePrices)); - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - .ForMember(d => d.Id, opt => opt.MapFrom(c => c.Id)); - }); var chargePrices = await teslaSolarChargerContext.ChargePrices - .ProjectTo(mapper) + .Select(e => new DtoChargePrice() + { + Id = e.Id, + ValidSince = e.ValidSince, + EnergyProvider = e.EnergyProvider, + EnergyProviderConfiguration = e.EnergyProviderConfiguration, + SolarPrice = e.SolarPrice, + GridPrice = e.GridPrice, + AddSpotPriceToGridPrice = e.AddSpotPriceToGridPrice, + }) .ToListAsync().ConfigureAwait(false); return chargePrices.OrderBy(p => p.ValidSince).ToList(); } @@ -288,15 +290,19 @@ public async Task> GetSpotPrices() public async Task GetChargePriceById(int id) { logger.LogTrace("{method}({id})", nameof(GetChargePriceById), id); - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - .ForMember(d => d.SpotPriceSurcharge, opt => opt.MapFrom(c => c.SpotPriceCorrectionFactor * 100)) - ; - }); var chargePrices = await teslaSolarChargerContext.ChargePrices .Where(c => c.Id == id) - .ProjectTo(mapper) + .Select(e => new DtoChargePrice() + { + Id = e.Id, + ValidSince = e.ValidSince, + EnergyProvider = e.EnergyProvider, + EnergyProviderConfiguration = e.EnergyProviderConfiguration, + SolarPrice = e.SolarPrice, + GridPrice = e.GridPrice, + AddSpotPriceToGridPrice = e.AddSpotPriceToGridPrice, + SpotPriceSurcharge = e.SpotPriceCorrectionFactor * 100, + }) .FirstAsync().ConfigureAwait(false); switch (chargePrices.EnergyProvider) { diff --git a/TeslaSolarCharger/Server/Services/ConfigJsonService.cs b/TeslaSolarCharger/Server/Services/ConfigJsonService.cs index e7fc1b927..db2f1865e 100644 --- a/TeslaSolarCharger/Server/Services/ConfigJsonService.cs +++ b/TeslaSolarCharger/Server/Services/ConfigJsonService.cs @@ -14,7 +14,6 @@ using TeslaSolarCharger.Shared.Dtos; using TeslaSolarCharger.Shared.Dtos.IndexRazor.CarValues; using TeslaSolarCharger.Model.EntityFramework; -using TeslaSolarCharger.SharedBackend.MappingExtensions; using System; using TeslaSolarCharger.Server.Scheduling; using TeslaSolarCharger.Server.Services.Contracts; @@ -29,7 +28,6 @@ public class ConfigJsonService( ITeslaSolarChargerContext teslaSolarChargerContext, IConstants constants, IDateTimeProvider dateTimeProvider, - IMapperConfigurationFactory mapperConfigurationFactory, JobManager jobManager, ITeslaMateDbContextWrapper teslaMateDbContextWrapper, IFleetTelemetryWebSocketService fleetTelemetryWebSocketService) @@ -177,16 +175,22 @@ public async Task> GetCarBasicConfigurations() { logger.LogTrace("{method}()", nameof(GetCarBasicConfigurations)); - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - ; - }); - var cars = await teslaSolarChargerContext.Cars .Where(c => c.IsAvailableInTeslaAccount) .OrderBy(c => c.ChargingPriority) - .ProjectTo(mapper) + .Select(c => new CarBasicConfiguration(c.Id, c.Name) + { + Vin = c.Vin ?? string.Empty, + MinimumAmpere = c.MinimumAmpere, + MaximumAmpere = c.MaximumAmpere, + UsableEnergy = c.UsableEnergy, + ChargingPriority = c.ChargingPriority, + ShouldBeManaged = c.ShouldBeManaged == true, + UseBle = c.UseBle, + BleApiBaseUrl = c.BleApiBaseUrl, + UseFleetTelemetry = c.UseFleetTelemetry, + IncludeTrackingRelevantFields = c.IncludeTrackingRelevantFields, + }) .ToListAsync().ConfigureAwait(false); return cars; @@ -249,7 +253,7 @@ public async Task UpdateCarBasicConfiguration(int carId, CarBasicConfiguration c databaseCar.UseBle = carBasicConfiguration.UseBle; databaseCar.BleApiBaseUrl = carBasicConfiguration.BleApiBaseUrl; databaseCar.UseFleetTelemetry = carBasicConfiguration.UseFleetTelemetry; - databaseCar.UseFleetTelemetryForLocationData = carBasicConfiguration.UseFleetTelemetryForLocationData; + databaseCar.IncludeTrackingRelevantFields = carBasicConfiguration.IncludeTrackingRelevantFields; await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); var settingsCar = settings.Cars.First(c => c.Id == carId); settingsCar.Name = carBasicConfiguration.Name; @@ -315,20 +319,45 @@ public async Task SaveOrUpdateCar(DtoCar car) private async Task> GetCars() { logger.LogTrace("{method}()", nameof(GetCars)); - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - .ForMember(d => d.WakeUpCalls, opt => opt.MapFrom(s => s.WakeUpCalls == null ? new List() : JsonConvert.DeserializeObject>(s.WakeUpCalls))) - .ForMember(d => d.VehicleDataCalls, opt => opt.MapFrom(s => s.VehicleDataCalls == null ? new List() : JsonConvert.DeserializeObject>(s.VehicleDataCalls))) - .ForMember(d => d.VehicleCalls, opt => opt.MapFrom(s => s.VehicleCalls == null ? new List() : JsonConvert.DeserializeObject>(s.VehicleCalls))) - .ForMember(d => d.ChargeStartCalls, opt => opt.MapFrom(s => s.ChargeStartCalls == null ? new List() : JsonConvert.DeserializeObject>(s.ChargeStartCalls))) - .ForMember(d => d.ChargeStopCalls, opt => opt.MapFrom(s => s.ChargeStopCalls == null ? new List() : JsonConvert.DeserializeObject>(s.ChargeStopCalls))) - .ForMember(d => d.SetChargingAmpsCall, opt => opt.MapFrom(s => s.SetChargingAmpsCall == null ? new List() : JsonConvert.DeserializeObject>(s.SetChargingAmpsCall))) - .ForMember(d => d.OtherCommandCalls, opt => opt.MapFrom(s => s.OtherCommandCalls == null ? new List() : JsonConvert.DeserializeObject>(s.OtherCommandCalls))) - ; - }); var cars = await teslaSolarChargerContext.Cars - .ProjectTo(mapper) + .Select(c => new DtoCar() + { + Id = c.Id, + Vin = c.Vin ?? string.Empty, + TeslaMateCarId = c.TeslaMateCarId, + ChargeMode = c.ChargeMode, + MinimumSoC = c.MinimumSoc, + LatestTimeToReachSoC = c.LatestTimeToReachSoC, + IgnoreLatestTimeToReachSocDate = c.IgnoreLatestTimeToReachSocDate, + IgnoreLatestTimeToReachSocDateOnWeekend = c.IgnoreLatestTimeToReachSocDateOnWeekend, + MaximumAmpere = c.MaximumAmpere, + MinimumAmpere = c.MinimumAmpere, + UsableEnergy = c.UsableEnergy, + ShouldBeManaged = c.ShouldBeManaged, + ChargingPriority = c.ChargingPriority, + Name = c.Name, + SoC = c.SoC, + SocLimit = c.SocLimit, + ChargerPhases = c.ChargerPhases, + ChargerVoltage = c.ChargerVoltage, + ChargerActualCurrent = c.ChargerActualCurrent, + ChargerPilotCurrent = c.ChargerPilotCurrent, + ChargerRequestedCurrent = c.ChargerRequestedCurrent, + PluggedIn = c.PluggedIn, + ClimateOn = c.ClimateOn, + Latitude = c.Latitude, + Longitude = c.Longitude, + State = c.State, + UseBle = c.UseBle, + BleApiBaseUrl = c.BleApiBaseUrl, + WakeUpCalls = c.WakeUpCalls, + VehicleDataCalls = c.VehicleDataCalls, + VehicleCalls = c.VehicleCalls, + ChargeStartCalls = c.ChargeStartCalls, + ChargeStopCalls = c.ChargeStopCalls, + SetChargingAmpsCall = c.SetChargingAmpsCall, + OtherCommandCalls = c.OtherCommandCalls, + }) .ToListAsync().ConfigureAwait(false); return cars; } @@ -356,13 +385,13 @@ public async Task CacheCarStates() dbCar.Latitude = car.Latitude; dbCar.Longitude = car.Longitude; dbCar.State = car.State; - dbCar.WakeUpCalls = JsonConvert.SerializeObject(car.WakeUpCalls); - dbCar.VehicleDataCalls = JsonConvert.SerializeObject(car.VehicleDataCalls); - dbCar.VehicleCalls = JsonConvert.SerializeObject(car.VehicleCalls); - dbCar.ChargeStartCalls = JsonConvert.SerializeObject(car.ChargeStartCalls); - dbCar.ChargeStopCalls = JsonConvert.SerializeObject(car.ChargeStopCalls); - dbCar.SetChargingAmpsCall = JsonConvert.SerializeObject(car.SetChargingAmpsCall); - dbCar.OtherCommandCalls = JsonConvert.SerializeObject(car.OtherCommandCalls); + dbCar.WakeUpCalls = car.WakeUpCalls; + dbCar.VehicleDataCalls = car.VehicleDataCalls; + dbCar.VehicleCalls = car.VehicleCalls; + dbCar.ChargeStartCalls = car.ChargeStartCalls; + dbCar.ChargeStopCalls = car.ChargeStopCalls; + dbCar.SetChargingAmpsCall = car.SetChargingAmpsCall; + dbCar.OtherCommandCalls = car.OtherCommandCalls; await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); diff --git a/TeslaSolarCharger/Server/Services/Contracts/IBackendApiService.cs b/TeslaSolarCharger/Server/Services/Contracts/IBackendApiService.cs index 866eb8210..7b1272e14 100644 --- a/TeslaSolarCharger/Server/Services/Contracts/IBackendApiService.cs +++ b/TeslaSolarCharger/Server/Services/Contracts/IBackendApiService.cs @@ -1,4 +1,5 @@ -using TeslaSolarCharger.Shared.Dtos; +using TeslaSolarCharger.Model.Entities.TeslaSolarCharger; +using TeslaSolarCharger.Shared.Dtos; namespace TeslaSolarCharger.Server.Services.Contracts; @@ -6,8 +7,11 @@ public interface IBackendApiService { Task> StartTeslaOAuth(string locale, string baseUrl); Task PostInstallationInformation(string reason); - Task PostErrorInformation(string source, string methodName, string message, string issueKey, string? vin, string? stackTrace); Task GetCurrentVersion(); - Task PostTeslaApiCallStatistics(); Task GetNewBackendNotifications(); + Task GetToken(DtoBackendLogin login); + Task RefreshBackendTokenIfNeeded(); + Task> SendRequestToBackend(HttpMethod httpMethod, string? accessToken, string requestUrlPart, object? content); + Task IsBaseAppLicensed(bool useCache); + Task IsFleetApiLicensed(string vin, bool useCache); } diff --git a/TeslaSolarCharger/Server/Services/Contracts/IBleService.cs b/TeslaSolarCharger/Server/Services/Contracts/IBleService.cs index 0fca075b5..c9886c572 100644 --- a/TeslaSolarCharger/Server/Services/Contracts/IBleService.cs +++ b/TeslaSolarCharger/Server/Services/Contracts/IBleService.cs @@ -15,4 +15,5 @@ public interface IBleService Task CheckBleApiVersionCompatibilities(); Task GetChargeState(string vin); Task GetDriveState(string vin); + Task CheckBleApiVersionCompatibility(string? host); } diff --git a/TeslaSolarCharger/Server/Services/Contracts/IPasswordGenerationService.cs b/TeslaSolarCharger/Server/Services/Contracts/IPasswordGenerationService.cs new file mode 100644 index 000000000..f8b782efd --- /dev/null +++ b/TeslaSolarCharger/Server/Services/Contracts/IPasswordGenerationService.cs @@ -0,0 +1,6 @@ +namespace TeslaSolarCharger.Server.Services.Contracts; + +public interface IPasswordGenerationService +{ + string GeneratePassword(int length); +} diff --git a/TeslaSolarCharger/Server/Services/Contracts/ITeslaFleetApiService.cs b/TeslaSolarCharger/Server/Services/Contracts/ITeslaFleetApiService.cs index b9a5fbca4..1641656ce 100644 --- a/TeslaSolarCharger/Server/Services/Contracts/ITeslaFleetApiService.cs +++ b/TeslaSolarCharger/Server/Services/Contracts/ITeslaFleetApiService.cs @@ -1,5 +1,4 @@ using LanguageExt; -using TeslaSolarCharger.Server.Dtos.TscBackend; using TeslaSolarCharger.Shared.Dtos; using TeslaSolarCharger.Shared.Dtos.Car; using TeslaSolarCharger.Shared.Enums; @@ -8,16 +7,14 @@ namespace TeslaSolarCharger.Server.Services.Contracts; public interface ITeslaFleetApiService { - Task AddNewTokenAsync(DtoTeslaTscDeliveryToken token); - Task> GetFleetApiTokenState(); - Task GetNewTokenFromBackend(); + Task> GetFleetApiTokenState(); Task> TestFleetApiAccess(int carId); Task> IsFleetApiProxyEnabled(string vin); Task RefreshCarData(); - Task RefreshTokensIfAllowedAndNeeded(); Task RefreshFleetApiRequestsAreAllowed(); void ResetApiRequestCounters(); Task>> GetNewCarsInAccount(); Task>> GetAllCarsFromAccount(); + Task RefreshFleetApiTokenIfNeeded(); } diff --git a/TeslaSolarCharger/Server/Services/Contracts/ITeslaFleetApiTokenHelper.cs b/TeslaSolarCharger/Server/Services/Contracts/ITeslaFleetApiTokenHelper.cs deleted file mode 100644 index 6d5da7ab4..000000000 --- a/TeslaSolarCharger/Server/Services/Contracts/ITeslaFleetApiTokenHelper.cs +++ /dev/null @@ -1,9 +0,0 @@ -using TeslaSolarCharger.Shared.Enums; - -namespace TeslaSolarCharger.Server.Services.Contracts; - -public interface ITeslaFleetApiTokenHelper -{ - Task GetFleetApiTokenState(); - Task GetTokenRequestedDate(); -} diff --git a/TeslaSolarCharger/Server/Services/Contracts/ITokenHelper.cs b/TeslaSolarCharger/Server/Services/Contracts/ITokenHelper.cs new file mode 100644 index 000000000..1749d9857 --- /dev/null +++ b/TeslaSolarCharger/Server/Services/Contracts/ITokenHelper.cs @@ -0,0 +1,11 @@ +using TeslaSolarCharger.Shared.Enums; + +namespace TeslaSolarCharger.Server.Services.Contracts; + +public interface ITokenHelper +{ + Task GetFleetApiTokenState(bool useCache); + Task GetBackendTokenState(bool useCache); + Task GetFleetApiTokenExpirationDate(bool useCache); + Task GetBackendTokenExpirationDate(); +} diff --git a/TeslaSolarCharger/Server/Services/Contracts/ITscConfigurationService.cs b/TeslaSolarCharger/Server/Services/Contracts/ITscConfigurationService.cs index 55e694179..406d26008 100644 --- a/TeslaSolarCharger/Server/Services/Contracts/ITscConfigurationService.cs +++ b/TeslaSolarCharger/Server/Services/Contracts/ITscConfigurationService.cs @@ -3,4 +3,19 @@ public interface ITscConfigurationService { Task GetInstallationId(); + + /// + /// Get a configuration value by its key + /// + /// Configuration key to get the value from + /// Configuration value, null if value key does not exist in database + Task GetConfigurationValueByKey(string configurationKey); + + /// + /// Set a configuration value by its key. If the key does not exist, it will be created. If it exists, the value will be updated. + /// + /// Key to update + /// Value to update + /// + Task SetConfigurationValueByKey(string configurationKey, string configurationValue); } diff --git a/TeslaSolarCharger/Server/Services/ErrorHandlingService.cs b/TeslaSolarCharger/Server/Services/ErrorHandlingService.cs index d3c95f995..b00462537 100644 --- a/TeslaSolarCharger/Server/Services/ErrorHandlingService.cs +++ b/TeslaSolarCharger/Server/Services/ErrorHandlingService.cs @@ -12,7 +12,6 @@ using TeslaSolarCharger.Shared.Dtos.LoggedError; using TeslaSolarCharger.Shared.Enums; using TeslaSolarCharger.Shared.Resources.Contracts; -using TeslaSolarCharger.SharedBackend.MappingExtensions; using TeslaSolarCharger.SharedModel.Enums; using Error = LanguageExt.Common.Error; @@ -24,11 +23,11 @@ public class ErrorHandlingService(ILogger logger, ITeslaSolarChargerContext context, IDateTimeProvider dateTimeProvider, IConfigurationWrapper configurationWrapper, - IMapperConfigurationFactory mapperConfigurationFactory, ISettings settings, - ITeslaFleetApiTokenHelper teslaFleetApiTokenHelper, + ITokenHelper tokenHelper, IPossibleIssues possibleIssues, - IConstants constants) : IErrorHandlingService + IConstants constants, + IFleetTelemetryWebSocketService fleetTelemetryWebSocketService) : IErrorHandlingService { public async Task>> GetActiveLoggedErrors() { @@ -37,27 +36,28 @@ public async Task>> GetActiveLoggedErrors() return unfilterdErrorsFin.Match( Succ: unfilteredErrors => { - var mappingConfiguration = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - .ForMember(d => d.OccurrenceCount, opt => opt.MapFrom(s => s.FurtherOccurrences.Count() + 1)) - .ForMember(d => d.Severity, opt => opt.MapFrom(s => possibleIssues.GetIssueByKey(s.IssueKey).IssueSeverity)) - .ForMember(d => d.HideOccurrenceCount, opt => opt.MapFrom(s => possibleIssues.GetIssueByKey(s.IssueKey).HideOccurrenceCount)) - ; - }); - var mapper = mappingConfiguration.CreateMapper(); var errors = unfilteredErrors .Where(e => e.DismissedAt == default || (e.FurtherOccurrences.Any() && (e.DismissedAt < e.FurtherOccurrences.Max()))) - .Select(e => mapper.Map(e)) + .Select(e => new DtoLoggedError() + { + Id = e.Id, + Severity = possibleIssues.GetIssueByKey(e.IssueKey).IssueSeverity, + Headline = e.Headline, + IssueKey = e.IssueKey, + OccurrenceCount = e.FurtherOccurrences.Count() + 1, + Vin = e.Vin, + Message = e.Message, + HideOccurrenceCount = possibleIssues.GetIssueByKey(e.IssueKey).HideOccurrenceCount + }) .ToList(); var removedErrorCount = errors.RemoveAll(e => e.OccurrenceCount < possibleIssues.GetIssueByKey(e.IssueKey).ShowErrorAfterOccurrences); logger.LogDebug("{removedErrorsCount} errors removed as did not reach minimum error count", removedErrorCount); - return Fin>.Succ(errors); + return Fin>.Succ(errors); }, Fail: error => { - return Fin>.Fail(error); + return Fin>.Fail(error); }); } @@ -69,29 +69,29 @@ public async Task>> GetHiddenErrors() return unfilterdErrorsFin.Match( Succ: unfilteredErrors => { - var mappingConfiguration = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - .ForMember(d => d.OccurrenceCount, opt => opt.MapFrom(s => s.FurtherOccurrences.Count() + 1)) - .ForMember(d => d.Severity, opt => opt.MapFrom(s => possibleIssues.GetIssueByKey(s.IssueKey).IssueSeverity)) - .ForMember(d => d.HideOccurrenceCount, opt => opt.MapFrom(s => possibleIssues.GetIssueByKey(s.IssueKey).HideOccurrenceCount)) - ; - }); - var mapper2 = mappingConfiguration.CreateMapper(); var hiddenErrors = new List(); foreach (var loggedError in unfilteredErrors) { var occurrences = new List() { loggedError.StartTimeStamp }.Concat(loggedError.FurtherOccurrences).ToList(); + var hiddenError = new DtoHiddenError() + { + Id = loggedError.Id, + Severity = possibleIssues.GetIssueByKey(loggedError.IssueKey).IssueSeverity, + Headline = loggedError.Headline, + IssueKey = loggedError.IssueKey, + OccurrenceCount = occurrences.Count, + Vin = loggedError.Vin, + Message = loggedError.Message, + HideOccurrenceCount = possibleIssues.GetIssueByKey(loggedError.IssueKey).HideOccurrenceCount, + }; if (occurrences.Count < possibleIssues.GetIssueByKey(loggedError.IssueKey).ShowErrorAfterOccurrences) { - var hiddenError = mapper2.Map(loggedError); hiddenError.HideReason = LoggedErrorHideReason.NotEnoughOccurrences; hiddenErrors.Add(hiddenError); } else if(loggedError.DismissedAt > occurrences.Max()) { - var hiddenError = mapper2.Map(loggedError); hiddenError.HideReason = LoggedErrorHideReason.Dismissed; hiddenErrors.Add(hiddenError); } @@ -137,9 +137,12 @@ await AddOrRemoveErrors(activeErrors, issueKeys.SolarValuesNotAvailable, "Solar await AddOrRemoveErrors(activeErrors, issueKeys.VersionNotUpToDate, "New software version available", "Update TSC to the latest version.", settings.IsNewVersionAvailable).ConfigureAwait(false); - await AddOrRemoveErrors(activeErrors, issueKeys.FleetApiTokenNoApiRequestsAllowed, "No Fleet API requests allowed", - "Make sure your TSC can access the internet and TSC is on its latest version.", !settings.AllowUnlimitedFleetApiRequests).ConfigureAwait(false); + //ToDO: fix next line, currently not working due to cyclic reference + //await AddOrRemoveErrors(activeErrors, issueKeys.BaseAppNotLicensed, "Base App not licensed", + // "Can not send commands to car as app is not licensed", !await backendApiService.IsBaseAppLicensed(true)); + + //ToDo: if last check there was no token related issue, only detect token related issues every x minutes as creates high load in backend await DetectTokenStateIssues(activeErrors); foreach (var car in settings.CarsToManage) { @@ -155,6 +158,20 @@ await AddOrRemoveErrors(activeErrors, issueKeys.FleetApiTokenNoApiRequestsAllowe //ToDo: In a future release this should only be done if no fleet api request was sent the last x minutes (BleUsageStopAfterError) await HandleErrorResolved(issueKeys.UsingFleetApiAsBleFallback, car.Vin); } + var fleetTelemetryEnabled = await context.Cars + .Where(c => c.Vin == car.Vin) + .Select(c => c.UseFleetTelemetry) + .FirstOrDefaultAsync(); + + if (fleetTelemetryEnabled && (!fleetTelemetryWebSocketService.IsClientConnected(car.Vin))) + { + await HandleError(nameof(ErrorHandlingService), nameof(DetectErrors), $"Fleet Telemetry not connected for car {car.Vin}", + "Fleet telemetry is not connected. Please check the connection.", issueKeys.FleetTelemetryNotConnected, car.Vin, null); + } + else + { + await HandleErrorResolved(issueKeys.FleetTelemetryNotConnected, car.Vin); + } if (car.State is CarStateEnum.Asleep or CarStateEnum.Offline) { @@ -417,25 +434,29 @@ private List GetIssueKeysUsingReflection() private async Task DetectTokenStateIssues(List activeErrors) { logger.LogTrace("{method}()", nameof(DetectTokenStateIssues)); - var tokenState = await teslaFleetApiTokenHelper.GetFleetApiTokenState(); - await AddOrRemoveErrors(activeErrors, issueKeys.FleetApiTokenNotRequested, "Fleet API token not requested", - "Open the Base Configuration and request a new token. Important: You need to allow access to all selectable scopes.", - tokenState == FleetApiTokenState.NotRequested).ConfigureAwait(false); + var backendTokenState = await tokenHelper.GetBackendTokenState(true); + var fleetApiTokenState = await tokenHelper.GetFleetApiTokenState(true); + await AddOrRemoveErrors(activeErrors, issueKeys.NoBackendApiToken, "No Backen API token", + "You are currently not connected to the backend. Open the Base Configuration and request a new token.", + backendTokenState == TokenState.NotAvailable).ConfigureAwait(false); + await AddOrRemoveErrors(activeErrors, issueKeys.BackendTokenUnauthorized, "Backend Token Unauthorized", + "You recently changed your Solar4Car password or did not use TSC for at least 30 days. Open the Base Configuration and request a new token.", + backendTokenState == TokenState.Unauthorized).ConfigureAwait(false); await AddOrRemoveErrors(activeErrors, issueKeys.FleetApiTokenUnauthorized, "Fleet API token is unauthorized", - "You recently changed your password or did not enable mobile access in your car. Enable mobile access in your car and open the Base Configuration and request a new token. Important: You need to allow access to all selectable scopes.", - tokenState == FleetApiTokenState.TokenUnauthorized).ConfigureAwait(false); + "You recently changed your Tesla password or did not enable mobile access in your car. Enable mobile access in your car and open the Base Configuration and request a new token. Important: You need to allow access to all selectable scopes.", + fleetApiTokenState == TokenState.Unauthorized).ConfigureAwait(false); + await AddOrRemoveErrors(activeErrors, issueKeys.NoFleetApiToken, "No Fleet API Token available.", + "Open the Base Configuration and request a new token.", + fleetApiTokenState == TokenState.NotAvailable).ConfigureAwait(false); + await AddOrRemoveErrors(activeErrors, issueKeys.FleetApiTokenExpired, "Fleet API token is expired", + "Either you recently changed your Tesla password or did not enable mobile access in your car. Enable mobile access in your car and open the Base Configuration and request a new token. Important: You need to allow access to all selectable scopes.", + fleetApiTokenState == TokenState.Expired).ConfigureAwait(false); await AddOrRemoveErrors(activeErrors, issueKeys.FleetApiTokenMissingScopes, "Your Tesla token has missing scopes.", "Open the Base Configuration and request a new token. Note: You need to allow all selectable scopes as otherwise TSC won't work properly.", - tokenState == FleetApiTokenState.MissingScopes).ConfigureAwait(false); - await AddOrRemoveErrors(activeErrors, issueKeys.FleetApiTokenRequestExpired, "Tesla Token could not be received", - "Open the Base Configuration and request a new token.", - tokenState == FleetApiTokenState.TokenRequestExpired).ConfigureAwait(false); - await AddOrRemoveErrors(activeErrors, issueKeys.FleetApiTokenExpired, "Tesla Token expired", - "Open the Base Configuration and request a new token.", - tokenState == FleetApiTokenState.Expired).ConfigureAwait(false); - - //Remove all token related issue keys on token error because very likely it is because of the underlaying token issue. - if (tokenState != FleetApiTokenState.UpToDate && tokenState != FleetApiTokenState.NotNeeded) + fleetApiTokenState == TokenState.MissingScopes).ConfigureAwait(false); + + //Remove all fleet api related issue keys on token error because very likely it is because of the underlaying token issue. + if (fleetApiTokenState != TokenState.UpToDate) { foreach (var activeError in activeErrors.Where(activeError => activeError.IssueKey.StartsWith(issueKeys.GetVehicleData) || activeError.IssueKey.StartsWith(issueKeys.CarStateUnknown) diff --git a/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs b/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs index 4a2723c47..f256f4bd1 100644 --- a/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs +++ b/TeslaSolarCharger/Server/Services/FleetTelemetryWebSocketService.cs @@ -15,6 +15,7 @@ using TeslaSolarCharger.Shared.Dtos.Contracts; using TeslaSolarCharger.Shared.Dtos.Settings; using TeslaSolarCharger.Shared.Enums; +using TeslaSolarCharger.Shared.Resources.Contracts; namespace TeslaSolarCharger.Server.Services; @@ -23,8 +24,7 @@ public class FleetTelemetryWebSocketService( IConfigurationWrapper configurationWrapper, IDateTimeProvider dateTimeProvider, IServiceProvider serviceProvider, - ISettings settings, - ITscConfigurationService tscConfigurationService) : IFleetTelemetryWebSocketService + ISettings settings) : IFleetTelemetryWebSocketService { private readonly TimeSpan _heartbeatsendTimeout = TimeSpan.FromSeconds(5); @@ -46,8 +46,9 @@ public async Task ReconnectWebSocketsForEnabledCars() && (c.ShouldBeManaged == true) && (c.TeslaFleetApiState != TeslaCarFleetApiState.NotWorking) && (c.TeslaFleetApiState != TeslaCarFleetApiState.OpenedLinkButNotTested) - && (c.TeslaFleetApiState != TeslaCarFleetApiState.NotConfigured)) - .Select(c => new { c.Vin, c.UseFleetTelemetryForLocationData, }) + && (c.TeslaFleetApiState != TeslaCarFleetApiState.NotConfigured) + && (c.IsFleetTelemetryHardwareIncompatible == false)) + .Select(c => new { c.Vin, IncludeTrackingRelevantFields = c.IncludeTrackingRelevantFields, }) .ToListAsync(); var bytesToSend = Encoding.UTF8.GetBytes("Heartbeat"); foreach (var car in cars) @@ -92,7 +93,7 @@ await existingClient.WebSocketClient.SendAsync(segment, WebSocketMessageType.Tex Clients.Remove(existingClient); } - ConnectToFleetTelemetryApi(car.Vin, car.UseFleetTelemetryForLocationData); + ConnectToFleetTelemetryApi(car.Vin, car.IncludeTrackingRelevantFields); } } @@ -114,27 +115,32 @@ await client.WebSocketClient } } - private async Task ConnectToFleetTelemetryApi(string vin, bool useFleetTelemetryForLocationData) + private async Task ConnectToFleetTelemetryApi(string vin, bool includeTrackingRelevantFields) { logger.LogTrace("{method}({carId})", nameof(ConnectToFleetTelemetryApi), vin); var currentDate = dateTimeProvider.UtcNow(); var scope = serviceProvider.CreateScope(); var context = scope.ServiceProvider.GetRequiredService(); - var token = await context.TeslaTokens - .Where(t => t.ExpiresAtUtc > currentDate) - .OrderByDescending(t => t.ExpiresAtUtc) - .FirstOrDefaultAsync().ConfigureAwait(false); - if (token == default) + var tscConfigurationService = scope.ServiceProvider.GetRequiredService(); + var constants = scope.ServiceProvider.GetRequiredService(); + var decryptionKey = await tscConfigurationService.GetConfigurationValueByKey(constants.TeslaTokenEncryptionKeyKey); + if (decryptionKey == default) + { + logger.LogError("Decryption key not found do not send command"); + throw new InvalidOperationException("No Decryption key found."); + } + var url = configurationWrapper.FleetTelemetryApiUrl() + + $"vin={vin}&forceReconfiguration=false&includeTrackingRelevantFields={includeTrackingRelevantFields}&encryptionKey={Uri.EscapeDataString(decryptionKey)}"; + var authToken = await context.BackendTokens.AsNoTracking().SingleOrDefaultAsync(); + if(authToken == default) { logger.LogError("Can not connect to WebSocket: No token found for car {vin}", vin); return; } - var installationId = await tscConfigurationService.GetInstallationId().ConfigureAwait(false); - var url = configurationWrapper.FleetTelemetryApiUrl() + - $"teslaToken={token.AccessToken}®ion={token.Region}&vin={vin}&forceReconfiguration=false&includeLocation={useFleetTelemetryForLocationData}&installationId={installationId}"; using var client = new ClientWebSocket(); try { + client.Options.SetRequestHeader("Authorization", $"Bearer {authToken.AccessToken}"); await client.ConnectAsync(new Uri(url), new CancellationTokenSource(_heartbeatsendTimeout).Token).ConfigureAwait(false); var cancellation = new CancellationTokenSource(); var dtoClient = new DtoFleetTelemetryWebSocketClients @@ -289,11 +295,14 @@ private async Task ReceiveMessages(DtoFleetTelemetryWebSocketClients client, str propertyName = nameof(DtoCar.SocLimit); break; case CarValueType.ChargerPhases: - propertyName = nameof(DtoCar.SocLimit); + propertyName = nameof(DtoCar.ChargerPhases); break; case CarValueType.ChargerVoltage: propertyName = nameof(DtoCar.ChargerVoltage); break; + case CarValueType.VehicleName: + propertyName = nameof(DtoCar.Name); + break; } if (propertyName != default) @@ -342,12 +351,27 @@ private async Task HandleErrorMessage(string jsonMessage) foreach (var vin in message.UnsupportedHardwareVins) { logger.LogInformation("Disable Fleet Telemetry for car {vin} as hardware is not supported", vin); + await SetCarToFleetTelemetryHardwareIncompatible(vin).ConfigureAwait(false); await DisableFleetTelemetryForCar(vin).ConfigureAwait(false); } return true; } + private async Task SetCarToFleetTelemetryHardwareIncompatible(string vin) + { + logger.LogTrace("{method}({vin})", nameof(SetCarToFleetTelemetryHardwareIncompatible), vin); + var scope = serviceProvider.CreateScope(); + var context = scope.ServiceProvider.GetRequiredService(); + var car = context.Cars.FirstOrDefault(c => c.Vin == vin); + if (car == default) + { + return; + } + car.IsFleetTelemetryHardwareIncompatible = true; + await context.SaveChangesAsync(); + } + private async Task DisableFleetTelemetryForCar(string vin) { logger.LogTrace("{method}({vin})", nameof(DisableFleetTelemetryForCar), vin); @@ -359,7 +383,7 @@ private async Task DisableFleetTelemetryForCar(string vin) return; } car.UseFleetTelemetry = false; - car.UseFleetTelemetryForLocationData = false; + car.IncludeTrackingRelevantFields = false; await context.SaveChangesAsync(); } diff --git a/TeslaSolarCharger/Server/Services/PasswordGenerationService.cs b/TeslaSolarCharger/Server/Services/PasswordGenerationService.cs new file mode 100644 index 000000000..1ba90cebf --- /dev/null +++ b/TeslaSolarCharger/Server/Services/PasswordGenerationService.cs @@ -0,0 +1,26 @@ +using System.Security.Cryptography; +using System.Text; +using TeslaSolarCharger.Server.Services.Contracts; + +namespace TeslaSolarCharger.Server.Services; + +public class PasswordGenerationService : IPasswordGenerationService +{ + private const string CharPool = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_=+[]{};:'\",.\\/?`~"; + + + public string GeneratePassword(int length) + { + using var rng = RandomNumberGenerator.Create(); + var password = new StringBuilder(); + + for (var i = 0; i < length; i++) + { + var randomNumber = new byte[1]; + rng.GetBytes(randomNumber); + var charIndex = randomNumber[0] % CharPool.Length; + password.Append(CharPool[charIndex]); + } + return password.ToString(); + } +} diff --git a/TeslaSolarCharger/Server/Services/TeslaBleService.cs b/TeslaSolarCharger/Server/Services/TeslaBleService.cs index 8aaee08a1..cb058e67f 100644 --- a/TeslaSolarCharger/Server/Services/TeslaBleService.cs +++ b/TeslaSolarCharger/Server/Services/TeslaBleService.cs @@ -187,80 +187,91 @@ public async Task CheckBleApiVersionCompatibilities() .Distinct().ToList(); foreach (var host in hosts) { - var baseUrl = GetBleBaseUrlFromConfiguredUrl(host); - if (string.IsNullOrEmpty(baseUrl)) - { - continue; - } - var url = baseUrl + "Hello/TscVersionCompatibility"; - using var client = new HttpClient(); - client.Timeout = TimeSpan.FromSeconds(3); - var vins = settings.Cars.Where(c => c.BleApiBaseUrl == host && c.UseBle).Select(c => c.Vin).ToList(); - try + await CheckBleApiVersionCompatibility(host).ConfigureAwait(false); + } + } + + public async Task CheckBleApiVersionCompatibility(string? host) + { + var baseUrl = GetBleBaseUrlFromConfiguredUrl(host); + if (string.IsNullOrEmpty(baseUrl)) + { + return "Could not generate a base url based on the inserted URL"; + } + var url = baseUrl + "Hello/TscVersionCompatibility"; + using var client = new HttpClient(); + client.Timeout = TimeSpan.FromSeconds(3); + var vins = settings.Cars.Where(c => c.BleApiBaseUrl == host && c.UseBle).Select(c => c.Vin).ToList(); + try + { + var response = await client.GetAsync(url).ConfigureAwait(false); + var responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + if (response.StatusCode == HttpStatusCode.NotFound) { - var response = await client.GetAsync(url).ConfigureAwait(false); - var responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false); - if (response.StatusCode == HttpStatusCode.NotFound) + foreach (var vin in vins) { - foreach (var vin in vins) - { - await errorHandlingService.HandleError(nameof(TeslaBleService), nameof(CheckBleApiVersionCompatibilities), - $"BLE container with URL {host} not up to date", $"Used for {vin}. Update the BLE container to the latest version", - issueKeys.BleVersionCompatibility, vin, null).ConfigureAwait(false); - } - continue; + await errorHandlingService.HandleError(nameof(TeslaBleService), nameof(CheckBleApiVersionCompatibilities), + $"BLE container with URL {host} not up to date", $"Used for {vin}. Update the BLE container to the latest version", + issueKeys.BleVersionCompatibility, vin, null).ConfigureAwait(false); } - var commandResult = JsonConvert.DeserializeObject>(responseContent); - if (commandResult == default || commandResult.Value == default) - { - foreach (var vin in vins) - { - await errorHandlingService.HandleError(nameof(TeslaBleService), nameof(CheckBleApiVersionCompatibilities), - $"BLE container with URL {host} does not respond properly", $"Used for {vin}. Could not get value from {responseContent}", - issueKeys.BleVersionCompatibility, vin, null).ConfigureAwait(false); - } - continue; - } - var couldParse = Version.TryParse(commandResult.Value, out var bleContainerVersion); - if (!couldParse || bleContainerVersion == default) - { - foreach (var vin in vins) - { - await errorHandlingService.HandleError(nameof(TeslaBleService), nameof(CheckBleApiVersionCompatibilities), - $"BLE container with URL {host} does not respond properly", $"Used for {vin}. Could not get version from {commandResult.Value}", - issueKeys.BleVersionCompatibility, vin, null).ConfigureAwait(false); - } - continue; - } + return "BLE container is not up to date. Update the BLE container to the latest version."; + } - var correctVersion = new Version(2, 31, 0); - if (!bleContainerVersion.Equals(correctVersion)) + var commandResult = JsonConvert.DeserializeObject>(responseContent); + if (commandResult == default || commandResult.Value == default) + { + foreach (var vin in vins) { - foreach (var vin in vins) - { - await errorHandlingService.HandleError(nameof(TeslaBleService), nameof(CheckBleApiVersionCompatibilities), - $"BLE container with URL {host} has an incompatible version", $"Used for {vin}. Correct version: {correctVersion}; BLE version: {bleContainerVersion}. Update TSC and BLE container to the latest version.", - issueKeys.BleVersionCompatibility, vin, null).ConfigureAwait(false); - } - continue; + await errorHandlingService.HandleError(nameof(TeslaBleService), nameof(CheckBleApiVersionCompatibilities), + $"BLE container with URL {host} does not respond properly", $"Used for {vin}. Could not get value from {responseContent}", + issueKeys.BleVersionCompatibility, vin, null).ConfigureAwait(false); } + return $"BLE container does not respond properly: {responseContent}"; + } + var couldParse = Version.TryParse(commandResult.Value, out var bleContainerVersion); + if (!couldParse || bleContainerVersion == default) + { foreach (var vin in vins) { - await errorHandlingService.HandleErrorResolved(issueKeys.BleVersionCompatibility, vin).ConfigureAwait(false); + await errorHandlingService.HandleError(nameof(TeslaBleService), nameof(CheckBleApiVersionCompatibilities), + $"BLE container with URL {host} does not respond properly", $"Used for {vin}. Could not get version from {commandResult.Value}", + issueKeys.BleVersionCompatibility, vin, null).ConfigureAwait(false); } + + return $"BLE container does not respond properly. Could not get version from: {commandResult.Value}"; } - catch (Exception ex) + + var correctVersion = new Version(2, 31, 0); + if (!bleContainerVersion.Equals(correctVersion)) { foreach (var vin in vins) { await errorHandlingService.HandleError(nameof(TeslaBleService), nameof(CheckBleApiVersionCompatibilities), - $"BLE container with URL {host} not reachable", $"Used for {vin}. Looks like the url is not correct or BLE container is not online.", - issueKeys.BleVersionCompatibility, vin, ex.StackTrace).ConfigureAwait(false); + $"BLE container with URL {host} has an incompatible version", $"Used for {vin}. Correct version: {correctVersion}; BLE version: {bleContainerVersion}. Update TSC and BLE container to the latest version.", + issueKeys.BleVersionCompatibility, vin, null).ConfigureAwait(false); } - + + return $"BLE container with URL {host} has an incompatible version; Correct version: {correctVersion}; BLE version: {bleContainerVersion}. Update TSC and BLE container to the latest version."; + } + + foreach (var vin in vins) + { + await errorHandlingService.HandleErrorResolved(issueKeys.BleVersionCompatibility, vin).ConfigureAwait(false); + } + + return null; + } + catch (Exception ex) + { + foreach (var vin in vins) + { + await errorHandlingService.HandleError(nameof(TeslaBleService), nameof(CheckBleApiVersionCompatibilities), + $"BLE container with URL {host} not reachable", $"Used for {vin}. Looks like the url is not correct or BLE container is not online.", + issueKeys.BleVersionCompatibility, vin, ex.StackTrace).ConfigureAwait(false); } + return "BLE container is not reachable. Looks like the url is not correct or BLE container is not online."; } } diff --git a/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs b/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs index 4557d94d4..4fa58b2ef 100644 --- a/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs +++ b/TeslaSolarCharger/Server/Services/TeslaFleetApiService.cs @@ -1,15 +1,13 @@ using LanguageExt; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Caching.Memory; using Newtonsoft.Json; using System.Net; -using System.Net.Http.Headers; using TeslaSolarCharger.Model.Contracts; using TeslaSolarCharger.Model.Entities.TeslaSolarCharger; -using TeslaSolarCharger.Model.Enums; using TeslaSolarCharger.Server.Contracts; -using TeslaSolarCharger.Server.Dtos; +using TeslaSolarCharger.Server.Dtos.Solar4CarBackend; using TeslaSolarCharger.Server.Dtos.TeslaFleetApi; -using TeslaSolarCharger.Server.Dtos.TscBackend; using TeslaSolarCharger.Server.Resources.PossibleIssues.Contracts; using TeslaSolarCharger.Server.Services.Contracts; using TeslaSolarCharger.Shared.Contracts; @@ -37,8 +35,10 @@ public class TeslaFleetApiService( ISettings settings, IBleService bleService, IIssueKeys issueKeys, - ITeslaFleetApiTokenHelper teslaFleetApiTokenHelper, - IFleetTelemetryWebSocketService fleetTelemetryWebSocketService) + ITokenHelper tokenHelper, + IFleetTelemetryWebSocketService fleetTelemetryWebSocketService, + IMemoryCache memoryCache, + IBackendApiService backendApiService) : ITeslaService, ITeslaFleetApiService { private const string IsChargingErrorMessage = "is_charging"; @@ -65,12 +65,6 @@ public class TeslaFleetApiService( BleCompatible = true, TeslaApiRequestType = TeslaApiRequestType.Command, }; - private DtoFleetApiRequest SetScheduledChargingRequest => new() - { - RequestUrl = constants.SetScheduledChargingRequestUrl, - NeedsProxy = true, - TeslaApiRequestType = TeslaApiRequestType.Command, - }; private DtoFleetApiRequest SetChargeLimitRequest => new() { RequestUrl = constants.SetChargeLimitRequestUrl, @@ -113,12 +107,12 @@ public async Task StartCharging(int carId, int startAmp, CarStateEnum? carState) logger.LogDebug("Should start charging with 0 amp. Skipping charge start."); return; } - await WakeUpCarIfNeeded(carId, carState).ConfigureAwait(false); + await WakeUpCarIfNeeded(carId).ConfigureAwait(false); var vin = GetVinByCarId(carId); await SetAmp(carId, startAmp).ConfigureAwait(false); - var result = await SendCommandToTeslaApi(vin, ChargeStartRequest, HttpMethod.Post).ConfigureAwait(false); + var result = await SendCommandToTeslaApi(vin, ChargeStartRequest).ConfigureAwait(false); } @@ -126,7 +120,7 @@ public async Task WakeUpCar(int carId) { logger.LogTrace("{method}({carId})", nameof(WakeUpCar), carId); var car = settings.Cars.First(c => c.Id == carId); - var result = await SendCommandToTeslaApi(car.Vin, WakeUpRequest, HttpMethod.Post).ConfigureAwait(false); + var result = await SendCommandToTeslaApi(car.Vin, WakeUpRequest).ConfigureAwait(false); if (car.TeslaMateCarId != default) { //ToDo: fix with https://github.com/pkuehnel/TeslaSolarCharger/issues/1511 @@ -146,7 +140,7 @@ public async Task StopCharging(int carId) } var vin = GetVinByCarId(carId); - var result = await SendCommandToTeslaApi(vin, ChargeStopRequest, HttpMethod.Post).ConfigureAwait(false); + var result = await SendCommandToTeslaApi(vin, ChargeStopRequest).ConfigureAwait(false); } public async Task SetAmp(int carId, int amps) @@ -160,44 +154,10 @@ public async Task SetAmp(int carId, int amps) } var vin = GetVinByCarId(carId); var commandData = $"{{\"charging_amps\":{amps}}}"; - var result = await SendCommandToTeslaApi(vin, SetChargingAmpsRequest, HttpMethod.Post, commandData, amps).ConfigureAwait(false); + var result = await SendCommandToTeslaApi(vin, SetChargingAmpsRequest, amps).ConfigureAwait(false); car.LastSetAmp = amps; } - public async Task SetScheduledCharging(int carId, DateTimeOffset? chargingStartTime) - { - logger.LogTrace("{method}({param1}, {param2})", nameof(SetScheduledCharging), carId, chargingStartTime); - var vin = GetVinByCarId(carId); - var car = settings.Cars.First(c => c.Id == carId); - if (!IsChargingScheduleChangeNeeded(chargingStartTime, dateTimeProvider.DateTimeOffSetNow(), car, out var parameters)) - { - logger.LogDebug("No change in updating scheduled charging needed."); - return; - } - - await WakeUpCarIfNeeded(carId, car.State).ConfigureAwait(false); - - var result = await SendCommandToTeslaApi(vin, SetScheduledChargingRequest, HttpMethod.Post, JsonConvert.SerializeObject(parameters)).ConfigureAwait(false); - //assume update was sucessfull as update is not working after mosquitto restart (or wrong cached State) - if (parameters["enable"] == "false") - { - car.ScheduledChargingStartTime = null; - } - } - - public async Task SetChargeLimit(int carId, int limitSoC) - { - logger.LogTrace("{method}({param1}, {param2})", nameof(SetChargeLimit), carId, limitSoC); - var vin = GetVinByCarId(carId); - var car = settings.Cars.First(c => c.Id == carId); - await WakeUpCarIfNeeded(carId, car.State).ConfigureAwait(false); - var parameters = new Dictionary() - { - { "percent", limitSoC }, - }; - await SendCommandToTeslaApi(vin, SetChargeLimitRequest, HttpMethod.Post, JsonConvert.SerializeObject(parameters)).ConfigureAwait(false); - } - public async Task> TestFleetApiAccess(int carId) { logger.LogTrace("{method}({carId})", nameof(TestFleetApiAccess), carId); @@ -205,10 +165,10 @@ public async Task> TestFleetApiAccess(int carId) var inMemoryCar = settings.Cars.First(c => c.Id == carId); try { - await WakeUpCarIfNeeded(carId, inMemoryCar.State).ConfigureAwait(false); + await WakeUpCarIfNeeded(carId).ConfigureAwait(false); var amps = 7; var commandData = $"{{\"charging_amps\":{amps}}}"; - var result = await SendCommandToTeslaApi(vin, SetChargingAmpsRequest, HttpMethod.Post, commandData, amps).ConfigureAwait(false); + var result = await SendCommandToTeslaApi(vin, SetChargingAmpsRequest, amps).ConfigureAwait(false); var successResult = result?.Response?.Result == true; var car = teslaSolarChargerContext.Cars.First(c => c.Id == carId); car.TeslaFleetApiState = successResult ? TeslaCarFleetApiState.Ok : TeslaCarFleetApiState.NotWorking; @@ -251,48 +211,11 @@ public async Task RefreshCarData() } try { - var vehicle = await SendCommandToTeslaApi(car.Vin, VehicleRequest, HttpMethod.Get).ConfigureAwait(false); - var vehicleResult = vehicle?.Response; - logger.LogTrace("Got vehicle {@vehicle}", vehicle); - if (vehicleResult == default) - { - await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(RefreshCarData), $"Error while getting vehicle info for car {car.Vin}", - $"Could not deserialize vehicle: {JsonConvert.SerializeObject(vehicle)}", issueKeys.GetVehicle, car.Vin, null).ConfigureAwait(false); - logger.LogError("Could not deserialize vehicle for car {carId}: {@vehicle}", carId, vehicle); - continue; - } - await errorHandlingService.HandleErrorResolved(issueKeys.GetVehicle, car.Vin); - var vehicleState = vehicleResult.State; - if (configurationWrapper.GetVehicleDataFromTesla()) - { - var carStateLog = new CarValueLog() - { - CarId = car.Id, - Timestamp = dateTimeProvider.UtcNow(), - Source = CarValueSource.FleetApi, - Type = CarValueType.AsleepOrOffline, - }; - if (vehicleState == "asleep") - { - carStateLog.BooleanValue = true; - car.State = CarStateEnum.Asleep; - } - else if (vehicleState == "offline") - { - carStateLog.BooleanValue = true; - car.State = CarStateEnum.Offline; - } - else - { - carStateLog.BooleanValue = false; - } - teslaSolarChargerContext.CarValueLogs.Add(carStateLog); - await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); - } + await RefreshVehicleOnlineState(car).ConfigureAwait(false); - if (vehicleState is "asleep" or "offline") + if (car.State is CarStateEnum.Asleep or CarStateEnum.Offline) { - logger.LogDebug("Do not call current vehicle data as car is {state}", vehicleState); + logger.LogDebug("Do not call current vehicle data as car is {state}", car.State); continue; } } @@ -305,7 +228,7 @@ public async Task RefreshCarData() try { - var vehicleData = await SendCommandToTeslaApi(car.Vin, VehicleDataRequest, HttpMethod.Get) + var vehicleData = await SendCommandToTeslaApi(car.Vin, VehicleDataRequest) .ConfigureAwait(false); logger.LogTrace("Got vehicleData {@vehicleData}", vehicleData); var vehicleDataResult = vehicleData?.Response; @@ -461,6 +384,105 @@ public async Task RefreshCarData() } } + private async Task RefreshVehicleOnlineState(DtoCar car) + { + logger.LogTrace("{method}({carId})", nameof(RefreshVehicleOnlineState), car.Id); + var vehicle = await SendCommandToTeslaApi(car.Vin, VehicleRequest).ConfigureAwait(false); + var vehicleResult = vehicle?.Response; + logger.LogTrace("Got vehicle {@vehicle}", vehicle); + if (vehicleResult == default) + { + await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(RefreshCarData), $"Error while getting vehicle info for car {car.Vin}", + $"Could not deserialize vehicle: {JsonConvert.SerializeObject(vehicle)}", issueKeys.GetVehicle, car.Vin, null).ConfigureAwait(false); + logger.LogError("Could not deserialize vehicle for car {carId}: {@vehicle}", car.Id, vehicle); + return; + } + await errorHandlingService.HandleErrorResolved(issueKeys.GetVehicle, car.Vin); + var vehicleState = vehicleResult.State; + if (configurationWrapper.GetVehicleDataFromTesla()) + { + var carStateLog = new CarValueLog() + { + CarId = car.Id, + Timestamp = dateTimeProvider.UtcNow(), + Source = CarValueSource.FleetApi, + Type = CarValueType.AsleepOrOffline, + }; + if (vehicleState == "asleep") + { + carStateLog.BooleanValue = true; + car.State = CarStateEnum.Asleep; + } + else if (vehicleState == "offline") + { + carStateLog.BooleanValue = true; + car.State = CarStateEnum.Offline; + } + else + { + carStateLog.BooleanValue = false; + } + teslaSolarChargerContext.CarValueLogs.Add(carStateLog); + await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); + } + + return; + } + + public async Task RefreshFleetApiTokenIfNeeded() + { + logger.LogTrace("{method}()", nameof(RefreshFleetApiTokenIfNeeded)); + var fleetApiTokenExpiration = await tokenHelper.GetFleetApiTokenExpirationDate(true); + if (fleetApiTokenExpiration == default) + { + var fleetApiTokenState = await tokenHelper.GetFleetApiTokenState(true); + logger.LogDebug("Do not refresh Fleet API Token as state is {state}", fleetApiTokenState); + return; + } + var currentDate = dateTimeProvider.DateTimeOffSetUtcNow(); + if(fleetApiTokenExpiration > currentDate.AddMinutes(1)) + { + logger.LogDebug("Do not refresh Fleet API Token as it is still valid until {expiration}", fleetApiTokenExpiration); + return; + } + logger.LogDebug("Refresh Fleet API Token as it is expired since {expiration}", fleetApiTokenExpiration); + var decryptionKey = await tscConfigurationService.GetConfigurationValueByKey(constants.TeslaTokenEncryptionKeyKey); + if (decryptionKey == default) + { + logger.LogError("Decryption key not found do not send command"); + throw new InvalidOperationException("No Decryption key found."); + } + var token = await teslaSolarChargerContext.BackendTokens.SingleOrDefaultAsync().ConfigureAwait(false); + if (token == default) + { + throw new InvalidOperationException("Can not start Tesla O Auth without backend token"); + } + var result = await backendApiService.SendRequestToBackend(HttpMethod.Post, token.AccessToken, + $"TeslaOAuth/RefreshToken?encryptionKey={Uri.EscapeDataString(decryptionKey)}", null); + memoryCache.Remove(constants.FleetApiTokenStateKey); + memoryCache.Remove(constants.FleetApiTokenExpirationTimeKey); + if (result.HasError) + { + logger.LogError("Refresh Fleet API Token was not successfull. {errorMessage}", result.ErrorMessage); + return; + } + var response = result.Data; + if (response == default) + { + logger.LogError("Could not deserialize response from TeslaOAuth/RefreshToken"); + return; + } + + if (response.StatusCode is >= HttpStatusCode.OK and < HttpStatusCode.Ambiguous) + { + logger.LogInformation("Refresh Fleet API Token was successfull"); + } + else + { + logger.LogError("Refresh Token did not succeed between Backend and Tesla."); + } + } + private async Task IsCarDataRefreshNeeded(DtoCar car) { logger.LogTrace("{method}({vin})", nameof(IsCarDataRefreshNeeded), car.Vin); @@ -472,52 +494,58 @@ private async Task IsCarDataRefreshNeeded(DtoCar car) logger.LogDebug("Latest car refresh: {latestRefresh}", latestRefresh); var currentUtcDate = dateTimeProvider.UtcNow(); var latestChangeToDetect = currentUtcDate.AddSeconds(-configurationWrapper.CarRefreshAfterCommandSeconds()); - if (fleetTelemetryWebSocketService.IsClientConnected(car.Vin)) + var fleetTelemetryEnabled = await teslaSolarChargerContext.Cars + .Where(c => c.Vin == car.Vin) + .Select(c => c.UseFleetTelemetry) + .FirstOrDefaultAsync(); + if (fleetTelemetryEnabled) { - var latestDetectedChange = latestRefresh.AddSeconds(-configurationWrapper.CarRefreshAfterCommandSeconds()); - logger.LogTrace("Fleet Telemetry Client connected, check fleet telemetry changes and do not request Fleet API after commands."); - if (latestRefresh > latestChangeToDetect) - { - logger.LogDebug("Do not refresh data for car {vin} as latest refresh is {latestRefresh} and earliest change to detect is {earliestChangeToDetect}", car.Vin, latestRefresh, latestChangeToDetect); - } - else - { - if (await FleetTelemetryValueChanged(car.Id, CarValueType.IsCharging, latestDetectedChange, latestChangeToDetect).ConfigureAwait(false)) - { - logger.LogDebug("Send a request as Fleet Telemetry detected a change in is charging state."); - return true; - } - - if (await FleetTelemetryValueChanged(car.Id, CarValueType.IsPluggedIn, latestDetectedChange, latestChangeToDetect).ConfigureAwait(false)) - { - logger.LogDebug("Send a request as Fleet Telemetry detected a change in plugged in state."); - return true; - } - - var latestValueBeforeLatestRefresh = await GetLatestValueBeforeTimeStamp(car.Id, CarValueType.ChargeAmps, latestDetectedChange).ConfigureAwait(false); - var latestValue = await GetLatestValueBeforeTimeStamp(car.Id, CarValueType.ChargeAmps, latestChangeToDetect).ConfigureAwait(false); - if (latestValue != default && latestValueBeforeLatestRefresh == default) - { - logger.LogDebug("Send a request as the first charging amps value was detected."); - return true; - } + logger.LogDebug("Do not refresh via Fleet API as Fleet Telemetry is enabled"); + return false; + //var latestDetectedChange = latestRefresh.AddSeconds(-configurationWrapper.CarRefreshAfterCommandSeconds()); + //logger.LogTrace("Fleet Telemetry Client connected, check fleet telemetry changes and do not request Fleet API after commands."); + //if (latestRefresh > latestChangeToDetect) + //{ + // logger.LogDebug("Do not refresh data for car {vin} as latest refresh is {latestRefresh} and earliest change to detect is {earliestChangeToDetect}", car.Vin, latestRefresh, latestChangeToDetect); + //} + //else + //{ + // if (await FleetTelemetryValueChanged(car.Id, CarValueType.IsCharging, latestDetectedChange, latestChangeToDetect).ConfigureAwait(false)) + // { + // logger.LogDebug("Send a request as Fleet Telemetry detected a change in is charging state."); + // return true; + // } + + // if (await FleetTelemetryValueChanged(car.Id, CarValueType.IsPluggedIn, latestDetectedChange, latestChangeToDetect).ConfigureAwait(false)) + // { + // logger.LogDebug("Send a request as Fleet Telemetry detected a change in plugged in state."); + // return true; + // } + + // var latestValueBeforeLatestRefresh = await GetLatestValueBeforeTimeStamp(car.Id, CarValueType.ChargeAmps, latestDetectedChange).ConfigureAwait(false); + // var latestValue = await GetLatestValueBeforeTimeStamp(car.Id, CarValueType.ChargeAmps, latestChangeToDetect).ConfigureAwait(false); + // if (latestValue != default && latestValueBeforeLatestRefresh == default) + // { + // logger.LogDebug("Send a request as the first charging amps value was detected."); + // return true; + // } + + // if (latestValue != default && latestValueBeforeLatestRefresh != default) + // { + // List values = + // [ + // latestValue, + // latestValueBeforeLatestRefresh, + // ]; + // if (AnyValueChanged(values) && values.Any(v => v.DoubleValue == 0)) + // { + // logger.LogDebug("Send a request as Fleet Telemetry detected at least one 0 value in charging amps."); + // return true; + // } + // } + + //} - if (latestValue != default && latestValueBeforeLatestRefresh != default) - { - List values = - [ - latestValue, - latestValueBeforeLatestRefresh, - ]; - if (AnyValueChanged(values) && values.Any(v => v.DoubleValue == 0)) - { - logger.LogDebug("Send a request as Fleet Telemetry detected at least one 0 value in charging amps."); - return true; - } - } - - } - } else { @@ -769,33 +797,46 @@ internal DateTimeOffset RoundToNextQuarterHour(DateTimeOffset chargingStartTime) return chargingStartTime; } - private async Task WakeUpCarIfNeeded(int carId, CarStateEnum? carState) + private async Task WakeUpCarIfNeeded(int carId) { - if (carState is CarStateEnum.Asleep or CarStateEnum.Offline or CarStateEnum.Suspended) + logger.LogTrace("{method}({carId})", nameof(WakeUpCarIfNeeded), carId); + var car = settings.Cars.First(c => c.Id == carId); + await RefreshVehicleOnlineState(car); + if (car.State is not (CarStateEnum.Asleep or CarStateEnum.Offline or CarStateEnum.Suspended)) { - var car = settings.Cars.First(c => c.Id == carId); - switch (carState) - { - case CarStateEnum.Offline or CarStateEnum.Asleep: - logger.LogInformation("Wakeup car."); - await WakeUpCar(carId).ConfigureAwait(false); - break; - case CarStateEnum.Suspended: - logger.LogInformation("Resume logging as is suspended"); - if (car.TeslaMateCarId != default) - { - //ToDo: fix with https://github.com/pkuehnel/TeslaSolarCharger/issues/1511 - //await teslamateApiService.ResumeLogging(car.TeslaMateCarId.Value).ConfigureAwait(false); - } - break; - } + return; + } + switch (car.State) + { + case CarStateEnum.Offline or CarStateEnum.Asleep: + logger.LogInformation("Wakeup car."); + await WakeUpCar(carId).ConfigureAwait(false); + break; + case CarStateEnum.Suspended: + logger.LogInformation("Resume logging as is suspended"); + if (car.TeslaMateCarId != default) + { + //ToDo: fix with https://github.com/pkuehnel/TeslaSolarCharger/issues/1511 + //await teslamateApiService.ResumeLogging(car.TeslaMateCarId.Value).ConfigureAwait(false); + } + + break; } - } - private async Task?> SendCommandToTeslaApi(string vin, DtoFleetApiRequest fleetApiRequest, HttpMethod httpMethod, string contentData = "{}", int? amp = null) where T : class + private async Task?> SendCommandToTeslaApi(string vin, DtoFleetApiRequest fleetApiRequest, int? intParam = null) where T : class { - logger.LogTrace("{method}({vin}, {@fleetApiRequest}, {contentData})", nameof(SendCommandToTeslaApi), vin, fleetApiRequest, contentData); + logger.LogTrace("{method}({vin}, {@fleetApiRequest}, {intParam})", nameof(SendCommandToTeslaApi), vin, fleetApiRequest, intParam); + if (!await backendApiService.IsBaseAppLicensed(true)) + { + logger.LogError("Can not send request to car as base app is not licensed"); + await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), "Base App not licensed", + "Can not send commands to car as app is not licensed", + issueKeys.BaseAppNotLicensed, null, null).ConfigureAwait(false); + return null; + } + await errorHandlingService.HandleErrorResolved(issueKeys.BaseAppNotLicensed, null); + var car = settings.Cars.First(c => c.Vin == vin); if (fleetApiRequest.BleCompatible) { @@ -824,7 +865,7 @@ private async Task WakeUpCarIfNeeded(int carId, CarStateEnum? carState) } else if (fleetApiRequest.RequestUrl == SetChargingAmpsRequest.RequestUrl) { - result = await bleService.SetAmp(vin, amp!.Value); + result = await bleService.SetAmp(vin, intParam!.Value); } else if (fleetApiRequest.RequestUrl == WakeUpRequest.RequestUrl) { @@ -866,80 +907,107 @@ private async Task WakeUpCarIfNeeded(int carId, CarStateEnum? carState) await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), $"Error sending BLE command for car {car.Vin}", $"Sending command to tesla via BLE did not succeed. Fleet API URL would be: {fleetApiRequest.RequestUrl}. BLE Response: {result.ResultMessage}", issueKeys.BleCommandNoSuccess + fleetApiRequest.RequestUrl, car.Vin, null).ConfigureAwait(false); - car.LastNonSuccessBleCall = dateTimeProvider.UtcNow(); - var fallbackUntilLocalTimeString = - (car.LastNonSuccessBleCall + configurationWrapper.BleUsageStopAfterError()).Value.ToLocalTime(); - logger.LogWarning("Command BLE enabled but command did not succeed, using Fleet API as fallback until {fallbackUntil}.", fallbackUntilLocalTimeString); - await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), - $"Using Fleet API as BLE fallback for car {car.Vin}", - $"As the BLE command did not succeed, Fleet API is used as fallback until {fallbackUntilLocalTimeString}. Note: During this time it is not possible to retry BLE automatically you need to go to the car settings page and test BLE access manually.", - issueKeys.UsingFleetApiAsBleFallback, car.Vin, null).ConfigureAwait(false); + if (await backendApiService.IsFleetApiLicensed(car.Vin, true)) + { + car.LastNonSuccessBleCall = dateTimeProvider.UtcNow(); + var fallbackUntilLocalTimeString = + (car.LastNonSuccessBleCall + configurationWrapper.BleUsageStopAfterError()).Value.ToLocalTime(); + logger.LogWarning("Command BLE enabled but command did not succeed, using Fleet API as fallback until {fallbackUntil}.", fallbackUntilLocalTimeString); + await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), + $"Using Fleet API as BLE fallback for car {car.Vin}", + $"As the BLE command did not succeed, Fleet API is used as fallback until {fallbackUntilLocalTimeString}. Note: During this time it is not possible to retry BLE automatically you need to go to the car settings page and test BLE access manually.", + issueKeys.UsingFleetApiAsBleFallback, car.Vin, null).ConfigureAwait(false); + } + else + { + //Do not use Fleet API if not licensed + logger.LogInformation("Do not use Fleet API as Fallback as Fleet API is not licensed for car {vin}", car.Vin); + return null; + } + } } } - var accessToken = await GetAccessToken().ConfigureAwait(false); + + if (!await backendApiService.IsFleetApiLicensed(car.Vin, true)) + { + await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), $"Fleet API not licensed for car {car.Vin}", + "Can not send Fleet API commands to car as Fleet API is not licensed", + issueKeys.FleetApiNotLicensed, car.Vin, null).ConfigureAwait(false); + logger.LogError("Can not send Fleet API commands to car {vin} as car is not licensed", car.Vin); + return null; + } + await errorHandlingService.HandleErrorResolved(issueKeys.FleetApiNotLicensed, car.Vin); + + var accessToken = await teslaSolarChargerContext.BackendTokens.SingleOrDefaultAsync(); if (accessToken == default) { logger.LogError("Access token not found do not send command"); return null; } - using var httpClient = new HttpClient(); - httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken.AccessToken); - var content = new StringContent(contentData, System.Text.Encoding.UTF8, "application/json"); - var rateLimitedUntil = await RateLimitedUntil(vin, fleetApiRequest.TeslaApiRequestType).ConfigureAwait(false); - var currentDate = dateTimeProvider.UtcNow(); - if (currentDate < rateLimitedUntil) + var fleetApiProxyRequired = await IsFleetApiProxyEnabled(vin).ConfigureAwait(false); + var decryptionKey = await tscConfigurationService.GetConfigurationValueByKey(constants.TeslaTokenEncryptionKeyKey); + if (decryptionKey == default) { - logger.LogError("Car with VIN {vin} rate limited until {rateLimitedUntil}. Skipping command.", vin, rateLimitedUntil); - await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), $"Car {car.Vin} is rate limited", - $"Car is rate limited until {rateLimitedUntil}", issueKeys.CarRateLimited, car.Vin, null); + logger.LogError("Decryption key not found do not send command"); return null; } - await errorHandlingService.HandleErrorResolved(issueKeys.CarRateLimited, car.Vin); - var fleetApiProxyRequired = await IsFleetApiProxyEnabled(vin).ConfigureAwait(false); - var baseUrl = GetFleetApiBaseUrl(accessToken.Region, fleetApiRequest.NeedsProxy, fleetApiProxyRequired.Value); - var requestUri = $"{baseUrl}api/1/vehicles/{vin}/{fleetApiRequest.RequestUrl}"; - var request = new HttpRequestMessage() + var requestUri = $"{fleetApiRequest.RequestUrl}?encryptionKey={Uri.EscapeDataString(decryptionKey)}&vin={vin}&carRequiresProxy={fleetApiProxyRequired.Value}"; + if (fleetApiRequest.RequestUrl == SetChargingAmpsRequest.RequestUrl) { - Content = content, - RequestUri = new Uri(requestUri), - Method = httpMethod, - }; - var response = await httpClient.SendAsync(request).ConfigureAwait(false); - var responseString = await response.Content.ReadAsStringAsync().ConfigureAwait(false); - logger.LogTrace("Response status code: {statusCode}", response.StatusCode); - logger.LogTrace("Response string: {responseString}", responseString); - logger.LogTrace("Response headers: {@headers}", response.Headers); - if (response.IsSuccessStatusCode) + requestUri += $"&s={intParam}"; + } + var backendResult = await backendApiService.SendRequestToBackend(HttpMethod.Post, accessToken.AccessToken, requestUri, null).ConfigureAwait(false); + if (backendResult.HasError) + { + await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), $"Solar4Car related error while sending command to car {car.Vin}", + $"Sending command to Tesla API resulted in non succes status code. The issue very likely is not on Tesla's side but on Solar4Car side. Error Message: {backendResult.ErrorMessage} : Command name:{fleetApiRequest.RequestUrl}, Int Param:{intParam}.", + issueKeys.Solar4CarSideFleetApiNonSuccessStatusCode + fleetApiRequest.RequestUrl, car.Vin, null).ConfigureAwait(false); + logger.LogError("Sending command to Tesla API resulted in non succes status code. The issue very likely is not on Tesla's side but on Solar4Car side. ErrorMessage: {errorMessage} : Command name:{commandName}, Int Param:{intParam}.", backendResult.ErrorMessage, fleetApiRequest.RequestUrl, intParam); + return null; + } + else + { + await errorHandlingService.HandleErrorResolved(issueKeys.Solar4CarSideFleetApiNonSuccessStatusCode + fleetApiRequest.RequestUrl, car.Vin); + } + var backendApiResponse = backendResult.Data; + if (backendApiResponse == default) + { + logger.LogError("Could not deserialize Backend API Tesla Response."); + return null; + } + + if (backendApiResponse.StatusCode is >= HttpStatusCode.OK and < HttpStatusCode.MultipleChoices) { AddRequestToCar(vin, fleetApiRequest); await errorHandlingService.HandleErrorResolved(issueKeys.FleetApiNonSuccessStatusCode + fleetApiRequest.RequestUrl, car.Vin); } else { - await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), $"Error while sending command to car {car.Vin}", - $"Sending command to Tesla API resulted in non succes status code: {response.StatusCode} : Command name:{fleetApiRequest.RequestUrl}, Content data:{contentData}. Response string: {responseString}", + await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), $"Tesla related error while sending command to car {car.Vin}", + $"Sending command to Tesla API resulted in non succes status code: {backendApiResponse.StatusCode} : Command name:{fleetApiRequest.RequestUrl}, Int Param:{intParam}. Tesla Result: {backendApiResponse.JsonResponse}", issueKeys.FleetApiNonSuccessStatusCode + fleetApiRequest.RequestUrl, car.Vin, null).ConfigureAwait(false); - logger.LogError("Sending command to Tesla API resulted in non succes status code: {statusCode} : Command name:{commandName}, Content data:{contentData}. Response string: {responseString}", response.StatusCode, fleetApiRequest.RequestUrl, contentData, responseString); - await HandleNonSuccessTeslaApiStatusCodes(response.StatusCode, accessToken, responseString, fleetApiRequest.TeslaApiRequestType, vin).ConfigureAwait(false); - if (response.StatusCode == HttpStatusCode.ServiceUnavailable) - { - return new() { Error = responseString, ErrorDescription = "ServiceUnavailable", }; - } + logger.LogError("Sending command to Tesla API resulted in non succes status code: {statusCode} : Command name:{commandName}, Int Param:{intParam}. Tesla Result: {result}", backendApiResponse.StatusCode, fleetApiRequest.RequestUrl, intParam, backendApiResponse.JsonResponse); + //ToDo: should be able to handle null backend API response. e.g. with an error "incompatible version". + await HandleNonSuccessTeslaApiStatusCodes(backendApiResponse.StatusCode, backendApiResponse.JsonResponse, vin).ConfigureAwait(false); + return null; } - var teslaCommandResultResponse = JsonConvert.DeserializeObject>(responseString); - if (response.IsSuccessStatusCode && (teslaCommandResultResponse?.Response is DtoVehicleCommandResult vehicleCommandResult)) + + + //ToDo: should be able to handle null backend API response. e.g. with an error "incompatible version". + var teslaCommandResultResponse = JsonConvert.DeserializeObject>(backendApiResponse.JsonResponse); + if ((backendApiResponse.StatusCode is >= HttpStatusCode.OK and < HttpStatusCode.MultipleChoices) && (teslaCommandResultResponse?.Response is DtoVehicleCommandResult vehicleCommandResult)) { if (vehicleCommandResult.Result != true - && !((fleetApiRequest.RequestUrl == ChargeStartRequest.RequestUrl) && responseString.Contains(IsChargingErrorMessage)) - && !((fleetApiRequest.RequestUrl == ChargeStopRequest.RequestUrl) && responseString.Contains(IsNotChargingErrorMessage))) + && !((fleetApiRequest.RequestUrl == ChargeStartRequest.RequestUrl) && backendApiResponse.JsonResponse.Contains(IsChargingErrorMessage)) + && !((fleetApiRequest.RequestUrl == ChargeStopRequest.RequestUrl) && backendApiResponse.JsonResponse.Contains(IsNotChargingErrorMessage))) { await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), $"Car {car.Vin} could not handle command", - $"Result of command request is false {fleetApiRequest.RequestUrl}, {contentData}. Response string: {responseString}", + $"Result of command request is false {fleetApiRequest.RequestUrl}, {intParam}. Response string: {backendApiResponse.JsonResponse}", issueKeys.FleetApiNonSuccessResult + fleetApiRequest.RequestUrl, car.Vin, null) .ConfigureAwait(false); - logger.LogError("Result of command request is false {fleetApiRequest.RequestUrl}, {contentData}. Response string: {responseString}", fleetApiRequest.RequestUrl, contentData, responseString); + logger.LogError("Result of command request is false {fleetApiRequest.RequestUrl}, {intParam}. Response string: {responseString}", fleetApiRequest.RequestUrl, intParam, backendApiResponse.JsonResponse); await HandleUnsignedCommands(vehicleCommandResult, vin).ConfigureAwait(false); } else @@ -947,7 +1015,7 @@ await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(Send await errorHandlingService.HandleErrorResolved(issueKeys.FleetApiNonSuccessResult + fleetApiRequest.RequestUrl, car.Vin); } } - logger.LogDebug("Response: {responseString}", responseString); + logger.LogDebug("Response: {responseString}", backendApiResponse.JsonResponse); return teslaCommandResultResponse; } @@ -989,10 +1057,6 @@ private void AddRequestToCar(string vin, DtoFleetApiRequest fleetApiRequest) { car.SetChargingAmpsCall.Add(currentDate); } - else if (fleetApiRequest.RequestUrl == SetScheduledChargingRequest.RequestUrl) - { - car.OtherCommandCalls.Add(currentDate); - } else if (fleetApiRequest.RequestUrl == SetChargeLimitRequest.RequestUrl) { car.OtherCommandCalls.Add(currentDate); @@ -1011,39 +1075,6 @@ private void AddRequestToCar(string vin, DtoFleetApiRequest fleetApiRequest) } } - private async Task RateLimitedUntil(string vin, TeslaApiRequestType teslaApiRequestType) - { - logger.LogTrace("{method}({vin}, {teslaApiRequestType})", nameof(RateLimitedUntil), vin, teslaApiRequestType); - var rateLimitedUntil = await GetRateLimitInfos(vin); - - return teslaApiRequestType switch - { - TeslaApiRequestType.Vehicle => rateLimitedUntil.VehicleRateLimitedUntil, - TeslaApiRequestType.VehicleData => rateLimitedUntil.VehicleDataRateLimitedUntil, - TeslaApiRequestType.Command => rateLimitedUntil.CommandsRateLimitedUntil, - TeslaApiRequestType.WakeUp => rateLimitedUntil.WakeUpRateLimitedUntil, - TeslaApiRequestType.Charging => rateLimitedUntil.ChargingCommandsRateLimitedUntil, - TeslaApiRequestType.Other => null, - _ => throw new ArgumentOutOfRangeException(nameof(teslaApiRequestType), teslaApiRequestType, null) - }; - } - - private async Task GetRateLimitInfos(string vin) - { - var rateLimitedUntil = await teslaSolarChargerContext.Cars - .Where(c => c.Vin == vin) - .Select(c => new DtoRateLimitInfos() - { - VehicleRateLimitedUntil = c.VehicleRateLimitedUntil, - VehicleDataRateLimitedUntil = c.VehicleDataRateLimitedUntil, - CommandsRateLimitedUntil = c.CommandsRateLimitedUntil, - ChargingCommandsRateLimitedUntil = c.ChargingCommandsRateLimitedUntil, - WakeUpRateLimitedUntil = c.WakeUpRateLimitedUntil, - }) - .FirstAsync(); - return rateLimitedUntil; - } - private async Task HandleUnsignedCommands(DtoVehicleCommandResult vehicleCommandResult, string vin) { if (string.Equals(vehicleCommandResult.Reason, "unsigned_cmds_hardlocked")) @@ -1064,223 +1095,54 @@ await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(Send } } - private string GetFleetApiBaseUrl(TeslaFleetApiRegion region, bool useProxyBaseUrl, bool fleetApiProxyRequired) - { - if (useProxyBaseUrl && fleetApiProxyRequired) - { - var configUrl = configurationWrapper.GetFleetApiBaseUrl(); - return configUrl ?? throw new KeyNotFoundException("Could not get Tesla HTTP proxy address"); - } - - if (region == TeslaFleetApiRegion.China) - { - return "https://fleet-api.prd.cn.vn.cloud.tesla.cn"; - } - var regionCode = region switch - { - TeslaFleetApiRegion.Emea => "eu", - TeslaFleetApiRegion.NorthAmerica => "na", - _ => throw new NotImplementedException($"Region {region} is not implemented."), - }; - return $"https://fleet-api.prd.{regionCode}.vn.cloud.tesla.com/"; - } - - /// - /// Get a new Token from TSC Backend - /// - /// True if a new Token was received - /// Token could not be extracted from result string - public async Task GetNewTokenFromBackend() - { - logger.LogTrace("{method}()", nameof(GetNewTokenFromBackend)); - //As all tokens get deleted when requesting a new one, we can assume that there is no token in the database. - var token = await teslaSolarChargerContext.TeslaTokens.FirstOrDefaultAsync().ConfigureAwait(false); - if (token != null) - { - return false; - } - - var tokenRequestedDate = await teslaFleetApiTokenHelper.GetTokenRequestedDate().ConfigureAwait(false); - if (tokenRequestedDate == null) - { - logger.LogError("Token has not been requested. Fleet API currently not working"); - return false; - } - if (tokenRequestedDate < dateTimeProvider.UtcNow().Subtract(constants.MaxTokenRequestWaitTime)) - { - logger.LogError("Last token request is too old. Request a new token."); - await errorHandlingService.HandleErrorResolved(issueKeys.FleetApiTokenNotReceived, null).ConfigureAwait(false); - return false; - } - using var httpClient = new HttpClient(); - var installationId = await tscConfigurationService.GetInstallationId().ConfigureAwait(false); - var url = configurationWrapper.BackendApiBaseUrl() + $"Tsc/DeliverAuthToken?installationId={installationId}"; - var response = await httpClient.GetAsync(url).ConfigureAwait(false); - var responseString = await response.Content.ReadAsStringAsync().ConfigureAwait(false); - if (!response.IsSuccessStatusCode) - { - logger.LogError("Error getting token from TSC Backend. Response status code: {statusCode}, Response string: {responseString}", - response.StatusCode, responseString); - return false; - - } - - var newToken = JsonConvert.DeserializeObject(responseString) ?? throw new InvalidDataException("Could not get token from string."); - await AddNewTokenAsync(newToken).ConfigureAwait(false); - await errorHandlingService.HandleErrorResolved(issueKeys.FleetApiTokenNotReceived, null).ConfigureAwait(false); - return true; - } - - public async Task RefreshTokensIfAllowedAndNeeded() - { - logger.LogTrace("{method}()", nameof(RefreshTokensIfAllowedAndNeeded)); - var tokens = await teslaSolarChargerContext.TeslaTokens.ToListAsync().ConfigureAwait(false); - if (tokens.Count < 1) - { - logger.LogError("No token found. Cannot refresh token."); - return; - } - - var tokensToRefresh = tokens.Where(t => t.ExpiresAtUtc < (dateTimeProvider.UtcNow() + TimeSpan.FromMinutes(2))).ToList(); - if (tokensToRefresh.Count < 1) - { - logger.LogTrace("No token needs to be refreshed."); - return; - } - - foreach (var tokenToRefresh in tokensToRefresh) - { - logger.LogWarning("Token {tokenId} needs to be refreshed as it expires on {expirationDateTime}", tokenToRefresh.Id, tokenToRefresh.ExpiresAtUtc); - - //DO NOTE REMOVE *2: As normal requests could result in reaching max unauthorized count, the max value is higher here, so even if token is unauthorized, refreshing it is still tried a couple of times. - if (tokenToRefresh.UnauthorizedCounter > (constants.MaxTokenUnauthorizedCount * 2)) - { - logger.LogError("Token {tokenId} has been unauthorized too often. Do not refresh token.", tokenToRefresh.Id); - continue; - } - using var httpClient = new HttpClient(); - var tokenUrl = "https://auth.tesla.com/oauth2/v3/token"; - var requestData = new Dictionary - { - { "grant_type", "refresh_token" }, - { "client_id", configurationWrapper.FleetApiClientId() }, - { "refresh_token", tokenToRefresh.RefreshToken }, - }; - var encodedContent = new FormUrlEncodedContent(requestData); - encodedContent.Headers.ContentType = new MediaTypeHeaderValue("application/x-www-form-urlencoded"); - var response = await httpClient.PostAsync(tokenUrl, encodedContent).ConfigureAwait(false); - var responseString = await response.Content.ReadAsStringAsync().ConfigureAwait(false); - if (response.IsSuccessStatusCode) - { - await errorHandlingService.HandleErrorResolved(issueKeys.FleetApiTokenRefreshNonSuccessStatusCode, null); - } - else - { - await errorHandlingService.HandleError(nameof(TeslaFleetApiService), nameof(SendCommandToTeslaApi), "Tesla Fleet API token could not be refreshed", - $"Refreshing token did result in non success status code. Response status code: {response.StatusCode} Response string: {responseString}", - issueKeys.FleetApiTokenRefreshNonSuccessStatusCode, null, null).ConfigureAwait(false); - logger.LogError("Refreshing token did result in non success status code. Response status code: {statusCode} Response string: {responseString}", response.StatusCode, responseString); - await HandleNonSuccessTeslaApiStatusCodes(response.StatusCode, tokenToRefresh, responseString, TeslaApiRequestType.Other).ConfigureAwait(false); - } - response.EnsureSuccessStatusCode(); - if (settings.AllowUnlimitedFleetApiRequests == false) - { - logger.LogError("Due to rate limitations fleet api requests are not allowed. As this version can not handle rate limits try updating to the latest version."); - teslaSolarChargerContext.TeslaTokens.Remove(tokenToRefresh); - await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); - return; - } - var newToken = JsonConvert.DeserializeObject(responseString) ?? throw new InvalidDataException("Could not get token from string."); - tokenToRefresh.AccessToken = newToken.AccessToken; - tokenToRefresh.RefreshToken = newToken.RefreshToken; - tokenToRefresh.IdToken = newToken.IdToken; - tokenToRefresh.ExpiresAtUtc = dateTimeProvider.UtcNow().AddSeconds(newToken.ExpiresIn); - tokenToRefresh.UnauthorizedCounter = 0; - await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); - logger.LogInformation("New Token saved to database."); - } - } - public async Task RefreshFleetApiRequestsAreAllowed() { logger.LogTrace("{method}()", nameof(RefreshFleetApiRequestsAreAllowed)); - if (settings.AllowUnlimitedFleetApiRequests && (settings.LastFleetApiRequestAllowedCheck > dateTimeProvider.UtcNow().AddHours(-1))) - { - return; - } - settings.LastFleetApiRequestAllowedCheck = dateTimeProvider.UtcNow(); - using var httpClient = new HttpClient(); - httpClient.Timeout = TimeSpan.FromSeconds(2); - var installationId = await tscConfigurationService.GetInstallationId().ConfigureAwait(false); - var url = configurationWrapper.BackendApiBaseUrl() + $"Tsc/AllowUnlimitedFleetApiAccess?installationId={installationId}"; - try - { - var response = await httpClient.GetAsync(url).ConfigureAwait(false); - var responseString = await response.Content.ReadAsStringAsync().ConfigureAwait(false); - if (!response.IsSuccessStatusCode) - { - settings.AllowUnlimitedFleetApiRequests = true; - return; - } - - var responseValue = JsonConvert.DeserializeObject>(responseString); - settings.AllowUnlimitedFleetApiRequests = responseValue?.Value == true; - } - catch (Exception) - { - settings.AllowUnlimitedFleetApiRequests = false; - } + //Currently no server side implmenetation + //if (settings.AllowUnlimitedFleetApiRequests && (settings.LastFleetApiRequestAllowedCheck > dateTimeProvider.UtcNow().AddHours(-1))) + //{ + // return; + //} + //settings.LastFleetApiRequestAllowedCheck = dateTimeProvider.UtcNow(); + //using var httpClient = new HttpClient(); + //httpClient.Timeout = TimeSpan.FromSeconds(2); + //var installationId = await tscConfigurationService.GetInstallationId().ConfigureAwait(false); + //var url = configurationWrapper.BackendApiBaseUrl() + $"Tsc/AllowUnlimitedFleetApiAccess?installationId={installationId}"; + //try + //{ + // var response = await httpClient.GetAsync(url).ConfigureAwait(false); + // var responseString = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + // if (!response.IsSuccessStatusCode) + // { + // settings.AllowUnlimitedFleetApiRequests = true; + // return; + // } + + // var responseValue = JsonConvert.DeserializeObject>(responseString); + // settings.AllowUnlimitedFleetApiRequests = responseValue?.Value == true; + //} + //catch (Exception) + //{ + // settings.AllowUnlimitedFleetApiRequests = false; + //} } - public async Task AddNewTokenAsync(DtoTeslaTscDeliveryToken token) + public async Task> GetFleetApiTokenState() { - var currentTokens = await teslaSolarChargerContext.TeslaTokens.ToListAsync().ConfigureAwait(false); - teslaSolarChargerContext.TeslaTokens.RemoveRange(currentTokens); - await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); - teslaSolarChargerContext.TeslaTokens.Add(new TeslaToken - { - AccessToken = token.AccessToken, - RefreshToken = token.RefreshToken, - IdToken = token.IdToken, - ExpiresAtUtc = dateTimeProvider.UtcNow().AddSeconds(token.ExpiresIn), - Region = token.Region, - UnauthorizedCounter = 0, - }); - await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); - } - - public async Task> GetFleetApiTokenState() - { - var tokenState = await teslaFleetApiTokenHelper.GetFleetApiTokenState(); + var tokenState = await tokenHelper.GetFleetApiTokenState(false); return new(tokenState); } - - - private async Task GetAccessToken() + private async Task HandleNonSuccessTeslaApiStatusCodes(HttpStatusCode statusCode, + string responseString, string? vin = null) { - logger.LogTrace("{method}()", nameof(GetAccessToken)); - var token = await teslaSolarChargerContext.TeslaTokens - .OrderByDescending(t => t.ExpiresAtUtc) - .FirstOrDefaultAsync().ConfigureAwait(false); - if (token != default && token.UnauthorizedCounter > constants.MaxTokenUnauthorizedCount) - { - logger.LogError("Token unauthorized counter is too high. Request a new token."); - throw new InvalidOperationException("Token unauthorized counter is too high. Request a new token."); - } - return token; - } - - private async Task HandleNonSuccessTeslaApiStatusCodes(HttpStatusCode statusCode, TeslaToken token, - string responseString, TeslaApiRequestType teslaApiRequestType, string? vin = null) - { - logger.LogTrace("{method}({statusCode}, {token}, {responseString})", nameof(HandleNonSuccessTeslaApiStatusCodes), statusCode, token, responseString); + logger.LogTrace("{method}({statusCode}, {responseString})", nameof(HandleNonSuccessTeslaApiStatusCodes), statusCode, responseString); if (statusCode == HttpStatusCode.Unauthorized) { logger.LogError( - "Your token or refresh token is invalid. Very likely you have changed your Tesla password. Current unauthorized counter {unauthorizedCounter}, Should have been valid until: {expiresAt}, Response: {responseString}", - ++token.UnauthorizedCounter, token.ExpiresAtUtc, responseString); + "Your token or refresh token is invalid. Response: {responseString}", responseString); + await tscConfigurationService.SetConfigurationValueByKey(constants.FleetApiTokenUnauthorizedKey, "true"); } else if (statusCode == HttpStatusCode.Forbidden) { @@ -1292,11 +1154,7 @@ private async Task HandleNonSuccessTeslaApiStatusCodes(HttpStatusCode statusCode else { logger.LogError("You did not select all scopes, so TSC can't send commands to your car. Response: {responseString}", responseString); - teslaSolarChargerContext.TscConfigurations.Add(new TscConfiguration() - { - Key = constants.TokenMissingScopes, - Value = responseString, - }); + await tscConfigurationService.SetConfigurationValueByKey(constants.FleetApiTokenMissingScopes, "true"); } } @@ -1307,34 +1165,6 @@ private async Task HandleNonSuccessTeslaApiStatusCodes(HttpStatusCode statusCode var car = teslaSolarChargerContext.Cars.First(c => c.Vin == vin); car.TeslaFleetApiState = TeslaCarFleetApiState.NotWorking; } - else if (statusCode == HttpStatusCode.TooManyRequests) - { - logger.LogWarning("Too many requests to Tesla API for car {vin}. {responseString}", vin, responseString); - var car = teslaSolarChargerContext.Cars.First(c => c.Vin == vin); - var nextAllowedUtcTime = GetUtcTimeFromRetryInSeconds(responseString); - switch (teslaApiRequestType) - { - case TeslaApiRequestType.Vehicle: - car.VehicleRateLimitedUntil = nextAllowedUtcTime; - break; - case TeslaApiRequestType.VehicleData: - car.VehicleDataRateLimitedUntil = nextAllowedUtcTime; - break; - case TeslaApiRequestType.Command: - car.CommandsRateLimitedUntil = nextAllowedUtcTime; - break; - case TeslaApiRequestType.WakeUp: - car.WakeUpRateLimitedUntil = nextAllowedUtcTime; - break; - case TeslaApiRequestType.Charging: - car.ChargingCommandsRateLimitedUntil = nextAllowedUtcTime; - break; - case TeslaApiRequestType.Other: - break; - default: - throw new ArgumentOutOfRangeException(nameof(teslaApiRequestType), teslaApiRequestType, null); - } - } else { logger.LogWarning( @@ -1346,15 +1176,6 @@ private async Task HandleNonSuccessTeslaApiStatusCodes(HttpStatusCode statusCode await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); } - private DateTime GetUtcTimeFromRetryInSeconds(string responseString) - { - logger.LogTrace("{method}({responseString})", nameof(GetUtcTimeFromRetryInSeconds), responseString); - - var retryInSeconds = RetryInSeconds(responseString); - var nextAllowedUtcTime = dateTimeProvider.UtcNow().AddSeconds(retryInSeconds); - return nextAllowedUtcTime; - } - public async Task>> GetNewCarsInAccount() { logger.LogTrace("{method}()", nameof(GetNewCarsInAccount)); @@ -1372,40 +1193,57 @@ public async Task>> GetNewCarsInAccount() public async Task>> GetAllCarsFromAccount() { logger.LogTrace("{method}()", nameof(GetAllCarsFromAccount)); - var accessToken = await GetAccessToken().ConfigureAwait(false); - if (accessToken == default || accessToken.ExpiresAtUtc < dateTimeProvider.UtcNow()) + var accessToken = await teslaSolarChargerContext.BackendTokens.SingleOrDefaultAsync(); + if (accessToken == default) { - logger.LogError("Can not add cars to TSC as no Tesla Token was found"); - return Fin>.Fail("No Tesla token found or existing token expired."); ; + logger.LogError("Can not add cars to TSC as no Backend Token was found"); + return Fin>.Fail("No Backend token found or existing token expired."); } - var baseUrl = GetFleetApiBaseUrl(accessToken.Region, false, false); - using var httpClient = new HttpClient(); - httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken.AccessToken); - var requestUri = $"{baseUrl}api/1/vehicles"; - var request = new HttpRequestMessage() + var decryptionKey = await tscConfigurationService.GetConfigurationValueByKey(constants.TeslaTokenEncryptionKeyKey); + if (decryptionKey == default) { - RequestUri = new Uri(requestUri), - Method = HttpMethod.Get, - }; + logger.LogError("Decryption key not found do not send command"); + return Fin>.Fail("No Decryption key found."); + } + var requestUri = $"FleetApiRequests/GetAllCarsFromAccount?encryptionKey={Uri.EscapeDataString(decryptionKey)}"; try { - var response = await httpClient.SendAsync(request); - var responseBodyString = await response.Content.ReadAsStringAsync(); - if (!response.IsSuccessStatusCode) + var backendResponse = await backendApiService.SendRequestToBackend(HttpMethod.Get, + accessToken.AccessToken, requestUri, null); + if (backendResponse.HasError) + { + logger.LogError("Error while getting all cars from account: {errorMessage}", backendResponse.ErrorMessage); + var exception = new HttpRequestException($"Requesting {requestUri} returned following error: {backendResponse.ErrorMessage}", null); + return Fin>.Fail(Error.New(exception)); + } + + var teslaBackendResult = backendResponse.Data; + if (teslaBackendResult == null) + { + logger.LogError("Could not deserialize Solar4CarBackend response body"); + return Fin>.Fail($"Could not deserialize response body"); + } + + if (teslaBackendResult.StatusCode is >= HttpStatusCode.OK and < HttpStatusCode.MultipleChoices) { - logger.LogError("Error while getting all cars from account: Status code: {statusCode}; Response Body: {responseBodyString}", response.StatusCode, responseBodyString); - var excpetion = new HttpRequestException($"Requesting {requestUri} returned following body: {responseBodyString}", null, - response.StatusCode); + logger.LogError("Error while getting all cars from account due to communication issue between Solar4Car Backend and Tesla: Underlaying Status code: {statusCode}; Underlaying Result: {jsonResult}", teslaBackendResult.StatusCode, teslaBackendResult.JsonResponse); + var excpetion = new HttpRequestException($"Requesting {requestUri} returned following statusCode: {teslaBackendResult.StatusCode} Underlaying result: {teslaBackendResult.JsonResponse}", null, + teslaBackendResult.StatusCode); return Fin>.Fail(Error.New(excpetion)); } - - var vehicles = JsonConvert.DeserializeObject>>(responseBodyString); + if(string.IsNullOrWhiteSpace(teslaBackendResult.JsonResponse)) + { + logger.LogError("Empty Tesla JSON response body from Solar4Car Backend"); + return Fin>.Fail("Empty Tesla JSON response body from Solar4Car Backend"); + } + + var vehicles = JsonConvert.DeserializeObject>>(teslaBackendResult.JsonResponse); if (vehicles?.Response == null) { - logger.LogError("Could not deserialize vehicle list response body {responseBodyString}", responseBodyString); - return Fin>.Fail($"Could not deserialize response body {responseBodyString}"); + logger.LogError("Could not deserialize vehicle list response body"); + return Fin>.Fail($"Could not deserialize response body"); } // Convert TeslaVehicle to DtoTesla diff --git a/TeslaSolarCharger/Server/Services/TeslaFleetApiTokenHelper.cs b/TeslaSolarCharger/Server/Services/TeslaFleetApiTokenHelper.cs deleted file mode 100644 index 322983422..000000000 --- a/TeslaSolarCharger/Server/Services/TeslaFleetApiTokenHelper.cs +++ /dev/null @@ -1,69 +0,0 @@ -using Microsoft.EntityFrameworkCore; -using TeslaSolarCharger.Model.Contracts; -using TeslaSolarCharger.Shared.Contracts; -using TeslaSolarCharger.Shared.Dtos.Contracts; -using TeslaSolarCharger.Shared.Enums; -using TeslaSolarCharger.Shared.Resources.Contracts; -using System.Globalization; -using TeslaSolarCharger.Server.Services.Contracts; - -namespace TeslaSolarCharger.Server.Services; - -public class TeslaFleetApiTokenHelper(ILogger logger, - ISettings settings, - IConfigurationWrapper configurationWrapper, - ITeslaSolarChargerContext teslaSolarChargerContext, - IConstants constants, - IDateTimeProvider dateTimeProvider) : ITeslaFleetApiTokenHelper -{ - public async Task GetFleetApiTokenState() - { - logger.LogTrace("{method}()", nameof(GetFleetApiTokenState)); - if (!settings.AllowUnlimitedFleetApiRequests) - { - return FleetApiTokenState.NoApiRequestsAllowed; - } - var hasCurrentTokenMissingScopes = await teslaSolarChargerContext.TscConfigurations - .Where(c => c.Key == constants.TokenMissingScopes) - .AnyAsync().ConfigureAwait(false); - if (hasCurrentTokenMissingScopes) - { - return FleetApiTokenState.MissingScopes; - } - var token = await teslaSolarChargerContext.TeslaTokens.FirstOrDefaultAsync().ConfigureAwait(false); - if (token != null) - { - if (token.UnauthorizedCounter > constants.MaxTokenUnauthorizedCount) - { - return FleetApiTokenState.TokenUnauthorized; - } - return (token.ExpiresAtUtc < dateTimeProvider.UtcNow() ? FleetApiTokenState.Expired : FleetApiTokenState.UpToDate); - } - var tokenRequestedDate = await GetTokenRequestedDate().ConfigureAwait(false); - if (tokenRequestedDate == null) - { - return FleetApiTokenState.NotRequested; - } - var currentDate = dateTimeProvider.UtcNow(); - if (tokenRequestedDate < (currentDate - constants.MaxTokenRequestWaitTime)) - { - return FleetApiTokenState.TokenRequestExpired; - } - return FleetApiTokenState.NotReceived; - } - - public async Task GetTokenRequestedDate() - { - logger.LogTrace("{method}()", nameof(GetTokenRequestedDate)); - var tokenRequestedDateString = await teslaSolarChargerContext.TscConfigurations - .Where(c => c.Key == constants.FleetApiTokenRequested) - .Select(c => c.Value) - .FirstOrDefaultAsync().ConfigureAwait(false); - if (tokenRequestedDateString == null) - { - return null; - } - var tokenRequestedDate = DateTime.Parse(tokenRequestedDateString, null, DateTimeStyles.RoundtripKind); - return tokenRequestedDate; - } -} diff --git a/TeslaSolarCharger/Server/Services/TimeSeriesDataService.cs b/TeslaSolarCharger/Server/Services/TimeSeriesDataService.cs index 440a11bb7..87c5b3921 100644 --- a/TeslaSolarCharger/Server/Services/TimeSeriesDataService.cs +++ b/TeslaSolarCharger/Server/Services/TimeSeriesDataService.cs @@ -1,17 +1,13 @@ -using AutoMapper.QueryableExtensions; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using TeslaSolarCharger.Model.Contracts; -using TeslaSolarCharger.Model.Entities.TeslaSolarCharger; using TeslaSolarCharger.Server.Services.Contracts; using TeslaSolarCharger.Shared.Dtos.TimeSeries; using TeslaSolarCharger.Shared.Enums; -using TeslaSolarCharger.SharedBackend.MappingExtensions; namespace TeslaSolarCharger.Server.Services; public class TimeSeriesDataService(ILogger logger, - ITeslaSolarChargerContext teslaSolarChargerContext, - IMapperConfigurationFactory mapperConfigurationFactory) : ITimeSeriesDataService + ITeslaSolarChargerContext teslaSolarChargerContext) : ITimeSeriesDataService { public async Task> GetTimeSeriesData(int carId, long startEpoch, long endEpoch, CarValueType carValueType) { @@ -19,20 +15,16 @@ public async Task> GetTimeSeriesData(int carId, long st var startDate = DateTimeOffset.FromUnixTimeSeconds(startEpoch).DateTime; var endDate = DateTimeOffset.FromUnixTimeSeconds(endEpoch).DateTime; - var mapper = mapperConfigurationFactory.Create(cfg => - { - cfg.CreateMap() - .ForMember(d => d.Timestamp, opt => opt.MapFrom(c => c.Timestamp.ToLocalTime())) - .ForMember(d => d.Value, opt => opt.MapFrom(c => c.IntValue ?? c.DoubleValue)) - ; - }); - var result = await teslaSolarChargerContext.CarValueLogs .Where(c => c.CarId == carId) .Where(c => c.Timestamp >= startDate && c.Timestamp <= endDate) .Where(c => c.Type == carValueType) .OrderBy(c => c.Timestamp) - .ProjectTo(mapper) + .Select(c => new DtoTimeSeriesDatum() + { + Timestamp = c.Timestamp.ToLocalTime(), + Value = c.IntValue ?? c.DoubleValue + }) .ToListAsync(); return result; diff --git a/TeslaSolarCharger/Server/Services/TokenHelper.cs b/TeslaSolarCharger/Server/Services/TokenHelper.cs new file mode 100644 index 000000000..2af2caa25 --- /dev/null +++ b/TeslaSolarCharger/Server/Services/TokenHelper.cs @@ -0,0 +1,234 @@ +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Caching.Memory; +using Newtonsoft.Json; +using TeslaSolarCharger.Model.Contracts; +using TeslaSolarCharger.Shared.Contracts; +using TeslaSolarCharger.Shared.Enums; +using TeslaSolarCharger.Shared.Resources.Contracts; +using TeslaSolarCharger.Server.Services.Contracts; +using TeslaSolarCharger.Shared.Dtos; +using System.Net; + +namespace TeslaSolarCharger.Server.Services; + +public class TokenHelper(ILogger logger, + ITeslaSolarChargerContext teslaSolarChargerContext, + IConstants constants, + ITscConfigurationService tscConfigurationService, + IConfigurationWrapper configurationWrapper, + IDateTimeProvider dateTimeProvider, + IMemoryCache memoryCache) : ITokenHelper +{ + public async Task GetFleetApiTokenState(bool useCache) + { + logger.LogTrace("{method}()", nameof(GetFleetApiTokenState)); + if (useCache && memoryCache.TryGetValue(constants.FleetApiTokenStateKey, out TokenState cachedFleetTokenState)) + { + logger.LogTrace("Returning FleetApiTokenState from cache: {tokenState}", cachedFleetTokenState); + return cachedFleetTokenState; + } + var state = await GetUncachedFleetApiTokenState().ConfigureAwait(false); + memoryCache.Set(constants.FleetApiTokenStateKey, state.TokenState, GetCacheEntryOptions(state.ExpiresAtUtc)); + memoryCache.Set(constants.FleetApiTokenExpirationTimeKey, state, GetCacheEntryOptions(state.ExpiresAtUtc)); + return state.TokenState; + } + + public async Task GetFleetApiTokenExpirationDate(bool useCache) + { + logger.LogTrace("{method}()", nameof(GetFleetApiTokenExpirationDate)); + if (useCache && memoryCache.TryGetValue(constants.FleetApiTokenExpirationTimeKey, out DateTimeOffset? expirationTime)) + { + logger.LogTrace("Returning FleetApiToken ExpirationTime from cache: {expirationTime}", expirationTime); + return expirationTime; + } + var state = await GetUncachedFleetApiTokenState().ConfigureAwait(false); + memoryCache.Set(constants.FleetApiTokenStateKey, state.TokenState, GetCacheEntryOptions(state.ExpiresAtUtc)); + memoryCache.Set(constants.FleetApiTokenExpirationTimeKey, state, GetCacheEntryOptions(state.ExpiresAtUtc)); + return state.ExpiresAtUtc; + } + + public async Task GetBackendTokenState(bool useCache) + { + logger.LogTrace("{method}", nameof(GetBackendTokenState)); + if (useCache && memoryCache.TryGetValue(constants.BackendTokenStateKey, out TokenState cachedFleetTokenState)) + { + logger.LogTrace("Returning BackendTokenState from cache: {tokenState}", cachedFleetTokenState); + return cachedFleetTokenState; + } + var state = await GetUncachedBackendTokenState().ConfigureAwait(false); + memoryCache.Set(constants.BackendTokenStateKey, state.TokenState, GetCacheEntryOptions(state.ExpiresAtUtc)); + return state.TokenState; + } + + public async Task GetBackendTokenExpirationDate() + { + logger.LogTrace("{method}()", nameof(GetBackendTokenExpirationDate)); + var expirationDate = await teslaSolarChargerContext.BackendTokens.Select(t => t.ExpiresAtUtc) + .SingleOrDefaultAsync(); + return expirationDate; + } + + private async Task GetUncachedFleetApiTokenState() + { + var hasCurrentTokenMissingScopes = string.Equals(await tscConfigurationService.GetConfigurationValueByKey(constants.FleetApiTokenMissingScopes), "true", StringComparison.InvariantCultureIgnoreCase); + if (hasCurrentTokenMissingScopes) + { + return new() + { + TokenState = TokenState.MissingScopes, + }; + } + var isTokenUnauthorized = string.Equals(await tscConfigurationService.GetConfigurationValueByKey(constants.FleetApiTokenUnauthorizedKey), "true", StringComparison.InvariantCultureIgnoreCase); + if (isTokenUnauthorized) + { + return new() + { + TokenState = TokenState.Unauthorized, + }; + } + var backendTokenState = await GetBackendTokenState(false); + if (backendTokenState != TokenState.UpToDate) + { + return new() + { + TokenState = TokenState.MissingPrecondition, + }; + } + var url = configurationWrapper.BackendApiBaseUrl() + "FleetApiRequests/FleetApiTokenExpiresInSeconds"; + using var httpClient = new HttpClient(); + httpClient.Timeout = TimeSpan.FromSeconds(10); + var request = new HttpRequestMessage(HttpMethod.Get, url); + var token = await teslaSolarChargerContext.BackendTokens.SingleOrDefaultAsync().ConfigureAwait(false); + if (token == default) + { + return new() + { + TokenState = TokenState.MissingPrecondition, + }; + } + request.Headers.Authorization = new("Bearer", token.AccessToken); + var response = await httpClient.SendAsync(request).ConfigureAwait(false); + var responseString = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + if (!response.IsSuccessStatusCode) + { + logger.LogError("Could not check if token is valid. StatusCode: {statusCode}, resultBody: {resultBody}", response.StatusCode, responseString); + return new() + { + TokenState = TokenState.MissingPrecondition, + }; + } + var validFleetApiToken = JsonConvert.DeserializeObject>(responseString); + if (validFleetApiToken == null) + { + logger.LogError("Could not check if fleet api token is available."); + return new() + { + TokenState = TokenState.MissingPrecondition, + }; + } + if (validFleetApiToken.Value == null) + { + return new() + { + TokenState = TokenState.NotAvailable, + }; + } + if (validFleetApiToken.Value <= 0) + { + return new() + { + TokenState = TokenState.Expired, + ExpiresAtUtc = dateTimeProvider.DateTimeOffSetUtcNow().AddSeconds(validFleetApiToken.Value.Value), + }; + } + return new() + { + TokenState = TokenState.UpToDate, + ExpiresAtUtc = dateTimeProvider.DateTimeOffSetUtcNow().AddSeconds(validFleetApiToken.Value.Value), + }; + } + + + private async Task GetUncachedBackendTokenState() + { + var token = await teslaSolarChargerContext.BackendTokens.SingleOrDefaultAsync().ConfigureAwait(false); + if (token == default) + { + return new() + { + TokenState = TokenState.NotAvailable, + }; + } + var currentDate = dateTimeProvider.DateTimeOffSetUtcNow(); + if (token.ExpiresAtUtc < currentDate) + { + return new() + { + TokenState = TokenState.Expired, + }; + } + var isTokenValid = await HasValidBackendToken(); + if (isTokenValid) + { + return new() + { + TokenState = TokenState.UpToDate, + ExpiresAtUtc = token.ExpiresAtUtc, + }; + } + + return new() + { + TokenState = TokenState.Unauthorized, + }; + } + + private async Task HasValidBackendToken() + { + logger.LogTrace("{method}", nameof(HasValidBackendToken)); + var token = await teslaSolarChargerContext.BackendTokens.SingleOrDefaultAsync(); + if (token == default) + { + return false; + } + var url = configurationWrapper.BackendApiBaseUrl() + "Client/IsTokenValid"; + using var httpClient = new HttpClient(); + httpClient.Timeout = TimeSpan.FromSeconds(10); + var request = new HttpRequestMessage(HttpMethod.Get, url); + request.Headers.Authorization = new("Bearer", token.AccessToken); + var response = await httpClient.SendAsync(request).ConfigureAwait(false); + if (response.StatusCode == HttpStatusCode.Unauthorized) + { + return false; + } + if (!response.IsSuccessStatusCode) + { + var responseString = await response.Content.ReadAsStringAsync().ConfigureAwait(false); + logger.LogError("Could not check if token is valid. StatusCode: {statusCode}, resultBody: {resultBody}", response.StatusCode, responseString); + throw new InvalidOperationException("Could not check if token is valid"); + } + return true; + } + + private MemoryCacheEntryOptions GetCacheEntryOptions(DateTimeOffset? validUntil) + { + logger.LogTrace("{method}({validUntil})", nameof(GetCacheEntryOptions), validUntil); + var validFor = TimeSpan.FromMinutes(15); + var currentDate = dateTimeProvider.DateTimeOffSetUtcNow(); + if (validUntil != default && (validUntil < (currentDate + validFor)) && (validUntil > currentDate)) + { + validFor = validUntil.Value - currentDate; + } + return new() + { + AbsoluteExpirationRelativeToNow = validFor, + }; + } + + private class TokenStateIncludingExpirationTime + { + public TokenState TokenState { get; init; } + public DateTimeOffset? ExpiresAtUtc { get; init; } + } + +} diff --git a/TeslaSolarCharger/Server/Services/TscConfigurationService.cs b/TeslaSolarCharger/Server/Services/TscConfigurationService.cs index 6e3d27cd2..589aae959 100644 --- a/TeslaSolarCharger/Server/Services/TscConfigurationService.cs +++ b/TeslaSolarCharger/Server/Services/TscConfigurationService.cs @@ -1,32 +1,22 @@ -using TeslaSolarCharger.Model.Contracts; +using Microsoft.EntityFrameworkCore; +using TeslaSolarCharger.Model.Contracts; using TeslaSolarCharger.Model.Entities.TeslaSolarCharger; -using TeslaSolarCharger.Server.Contracts; -using TeslaSolarCharger.Server.Dtos.TscBackend; using TeslaSolarCharger.Server.Services.Contracts; -using TeslaSolarCharger.Shared.Contracts; using TeslaSolarCharger.Shared.Resources.Contracts; -using TeslaSolarCharger.SharedBackend.Contracts; namespace TeslaSolarCharger.Server.Services; -public class TscConfigurationService : ITscConfigurationService +public class TscConfigurationService( + ILogger logger, + ITeslaSolarChargerContext teslaSolarChargerContext, + IConstants constants) + : ITscConfigurationService { - private readonly ILogger _logger; - private readonly ITeslaSolarChargerContext _teslaSolarChargerContext; - private readonly IConstants _constants; - - public TscConfigurationService(ILogger logger, ITeslaSolarChargerContext teslaSolarChargerContext, IConstants constants) - { - _logger = logger; - _teslaSolarChargerContext = teslaSolarChargerContext; - _constants = constants; - } - public async Task GetInstallationId() { - _logger.LogTrace("{method}()", nameof(GetInstallationId)); - var configurationIdString = _teslaSolarChargerContext.TscConfigurations - .Where(c => c.Key == _constants.InstallationIdKey) + logger.LogTrace("{method}()", nameof(GetInstallationId)); + var configurationIdString = teslaSolarChargerContext.TscConfigurations + .Where(c => c.Key == constants.InstallationIdKey) .Select(c => c.Value) .FirstOrDefault(); @@ -37,11 +27,54 @@ public async Task GetInstallationId() var installationIdConfiguration = new TscConfiguration() { - Key = _constants.InstallationIdKey, + Key = constants.InstallationIdKey, Value = Guid.NewGuid().ToString(), }; - _teslaSolarChargerContext.TscConfigurations.Add(installationIdConfiguration); - await _teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); + teslaSolarChargerContext.TscConfigurations.Add(installationIdConfiguration); + await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); return Guid.Parse(installationIdConfiguration.Value); } + + /// + /// Get a configuration value by its key + /// + /// Configuration key to get the value from + /// Configuration value, null if value key does not exist in database + public async Task GetConfigurationValueByKey(string configurationKey) + { + logger.LogTrace("{method}({configurationKey})", nameof(GetConfigurationValueByKey), configurationKey); + var configurationValue = await teslaSolarChargerContext.TscConfigurations + .FirstOrDefaultAsync(c => c.Key == configurationKey); + + return configurationValue?.Value; + } + + /// + /// Set a configuration value by its key. If the key does not exist, it will be created. If it exists, the value will be updated. + /// + /// Key to update + /// Value to update + /// + public async Task SetConfigurationValueByKey(string configurationKey, string configurationValue) + { + logger.LogTrace("{method}({configurationKey}, {configurationValue})", nameof(SetConfigurationValueByKey), configurationKey, configurationValue); + var configuration = await teslaSolarChargerContext.TscConfigurations + .FirstOrDefaultAsync(c => c.Key == configurationKey); + + if (configuration == default) + { + configuration = new() + { + Key = configurationKey, + Value = configurationValue, + }; + teslaSolarChargerContext.TscConfigurations.Add(configuration); + } + else + { + configuration.Value = configurationValue; + } + + await teslaSolarChargerContext.SaveChangesAsync().ConfigureAwait(false); + } } diff --git a/TeslaSolarCharger/Server/Services/TscOnlyChargingCostService.cs b/TeslaSolarCharger/Server/Services/TscOnlyChargingCostService.cs index 15970487a..bceadc365 100644 --- a/TeslaSolarCharger/Server/Services/TscOnlyChargingCostService.cs +++ b/TeslaSolarCharger/Server/Services/TscOnlyChargingCostService.cs @@ -11,7 +11,6 @@ using TeslaSolarCharger.Shared.Dtos.Contracts; using TeslaSolarCharger.Shared.Enums; using TeslaSolarCharger.Shared.Resources.Contracts; -using TeslaSolarCharger.SharedBackend.MappingExtensions; namespace TeslaSolarCharger.Server.Services; @@ -21,7 +20,6 @@ public class TscOnlyChargingCostService(ILogger logg IDateTimeProvider dateTimeProvider, IConfigurationWrapper configurationWrapper, IServiceProvider serviceProvider, - IMapperConfigurationFactory mapperConfigurationFactory, IConstants constants) : ITscOnlyChargingCostService { public async Task FinalizeFinishedChargingProcesses() @@ -108,23 +106,18 @@ public async Task GetChargeSummary(int carId) public async Task> GetFinalizedChargingProcesses(int carId) { - var mapper = mapperConfigurationFactory.Create(cfg => - { - //ToDo: Maybe possible null exceptions as not all members that are nullable in database are also nullable in dto - cfg.CreateMap() - .ForMember(d => d.StartTime, opt => opt.MapFrom(h => h.StartDate.ToLocalTime())) - .ForMember(d => d.EndTime, opt => opt.MapFrom(h => h.EndDate.HasValue ? h.EndDate.Value.ToLocalTime() : (DateTime?)null)) - .ForMember(d => d.CalculatedPrice, opt => opt.MapFrom(h => h.Cost == null ? 0m : Math.Round(h.Cost.Value, 2))) - .ForMember(d => d.UsedGridEnergy, opt => opt.MapFrom(h => h.UsedGridEnergyKwh == null ? 0m : Math.Round(h.UsedGridEnergyKwh.Value, 2))) - .ForMember(d => d.UsedHomeBatteryEnergy, opt => opt.MapFrom(h => h.UsedHomeBatteryEnergyKwh == null ? 0m : Math.Round(h.UsedHomeBatteryEnergyKwh.Value, 2))) - .ForMember(d => d.UsedSolarEnergy, opt => opt.MapFrom(h => h.UsedSolarEnergyKwh == null ? 0m : Math.Round(h.UsedSolarEnergyKwh.Value, 2))) - ; - }); - var handledCharges = await context.ChargingProcesses .Where(h => h.CarId == carId && h.Cost != null) .OrderByDescending(h => h.StartDate) - .ProjectTo(mapper) + .Select(h => new DtoHandledCharge() + { + StartTime = h.StartDate.ToLocalTime(), + EndTime = h.EndDate.HasValue ? h.EndDate.Value.ToLocalTime() : (DateTime?)null, + CalculatedPrice = h.Cost == null ? 0m : Math.Round(h.Cost.Value, 2), + UsedGridEnergy = h.UsedGridEnergyKwh == null ? 0m : Math.Round(h.UsedGridEnergyKwh.Value, 2), + UsedHomeBatteryEnergy = h.UsedHomeBatteryEnergyKwh == null ? 0m : Math.Round(h.UsedHomeBatteryEnergyKwh.Value, 2), + UsedSolarEnergy = h.UsedSolarEnergyKwh == null ? 0m : Math.Round(h.UsedSolarEnergyKwh.Value, 2), + }) .ToListAsync().ConfigureAwait(false); handledCharges.RemoveAll(c => (c.UsedGridEnergy + c.UsedSolarEnergy + c.UsedHomeBatteryEnergy) < 0.1m); diff --git a/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj b/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj index 8af36d709..032fb78e0 100644 --- a/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj +++ b/TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj @@ -43,7 +43,8 @@ --> - + + @@ -66,6 +67,8 @@ + + @@ -83,5 +86,9 @@ + + + + diff --git a/TeslaSolarCharger/Server/appsettings.json b/TeslaSolarCharger/Server/appsettings.json index 4da2bbefa..e7b12f8fd 100644 --- a/TeslaSolarCharger/Server/appsettings.json +++ b/TeslaSolarCharger/Server/appsettings.json @@ -58,8 +58,7 @@ "GeoFence": "Home", "IgnoreSslErrors": false, "FleetApiClientId": "f29f71d6285a-4873-8b6b-80f15854892e", - "BackendApiBaseUrl": "https://www.teslasolarcharger.de/api/", - "TeslaFleetApiBaseUrl": "https://www.teslasolarcharger.de/teslaproxy/", + "BackendApiBaseUrl": "https://api.solar4car.com/api/", "UseFleetApiProxy": false, "LogLocationData": false, "SendTeslaApiStatsToBackend": true, @@ -73,7 +72,8 @@ "CarRefreshAfterCommandSeconds": 11, "BleUsageStopAfterErrorSeconds": 300, "FleetApiRefreshIntervalSeconds": 500, - "FleetTelemetryApiUrl": "wss://api.fleet-telemetry.teslasolarcharger.de/ws?", + "FleetTelemetryApiUrl": "wss://api.fleet-telemetry.solar4car.com/ws?", + "BackendPasswordDefaultLength": 25, "GridPriceProvider": { "EnergyProvider": "FixedPrice", "Octopus": { diff --git a/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs index a29cfd126..7bba962e0 100644 --- a/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Contracts/IConfigurationWrapper.cs @@ -88,7 +88,6 @@ public interface IConfigurationWrapper string BackendApiBaseUrl(); bool IsDevelopmentEnvironment(); string GetAwattarBaseUrl(); - string? GetFleetApiBaseUrl(); string RestoreTempDirectory(); string ConfigFileDirectory(); string AutoBackupsZipDirectory(); @@ -109,4 +108,5 @@ public interface IConfigurationWrapper string FleetTelemetryApiUrl(); bool AllowPowerBufferChangeOnHome(); TimeSpan FleetApiRefreshInterval(); + int BackendPasswordDefaultLength(); } diff --git a/TeslaSolarCharger/Shared/Dtos/CarBasicConfiguration.cs b/TeslaSolarCharger/Shared/Dtos/CarBasicConfiguration.cs index 2d546f9a8..e881dc33a 100644 --- a/TeslaSolarCharger/Shared/Dtos/CarBasicConfiguration.cs +++ b/TeslaSolarCharger/Shared/Dtos/CarBasicConfiguration.cs @@ -1,5 +1,5 @@ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; +using FluentValidation; +using System.ComponentModel; using TeslaSolarCharger.Shared.Attributes; namespace TeslaSolarCharger.Shared.Dtos; @@ -21,31 +21,47 @@ public CarBasicConfiguration(int id, string? name) public string? Name { get; set; } [Disabled] public string Vin { get; set; } - [Range(1, int.MaxValue)] [Postfix("A")] [HelperText("TSC never sets a current below this value")] public int MinimumAmpere { get; set; } - [Range(1, int.MaxValue)] [Postfix("A")] [HelperText("TSC never sets a current above this value. This value is also used in the Max Power charge mode.")] public int MaximumAmpere { get; set; } - [Range(1, int.MaxValue)] [Postfix("kWh")] [HelperText("This value is used to reach a desired SoC in time if on spot price or PVOnly charge mode.")] public int UsableEnergy { get; set; } - [Range(1, int.MaxValue)] [HelperText("If there is not enough power for all cars, the cars will be charged ordered by priority. Cars with the same priority are ordered randomly.")] public int ChargingPriority { get; set; } [HelperText("If disabled, this car will not show up in the overview page and TSC does not manage it.")] public bool ShouldBeManaged { get; set; } = true; [DisplayName("Use BLE")] - [HelperText("Use BLE communication to go around Tesla rate limits. Note: A BLE device (e.g., Raspberry Pi) with installed TeslaSolarChargerBle Container needs to be near (max 4 meters without any walls in between) your car.")] + [HelperText("Use BLE communication (If enabled no car license is required for this car). Note: A BLE device (e.g., Raspberry Pi) with installed TeslaSolarChargerBle Container needs to be near (max 4 meters without any walls in between) your car.")] public bool UseBle { get; set; } [HelperText("Needed to send commands via BLE to the car. An example value would be `http://raspible:7210/`")] public string? BleApiBaseUrl { get; set; } - [HelperText("Only supported on cars with Software 2024.38.2+. Not supported on Pre 2021 Model S/X. If enabled, some data will be transferred via Fleet Telemetry. This improves the delay in the TSC detection of plugin and out of the car, as well as changes in the charging speed. Note: All data transferred via Fleet Telemetry passes my server. If your car does not support fleet telemetry, this option will be disabled automatically within two minutes.")] + [HelperText("Only supported on cars with Software 2024.45.32+. Not supported on Pre 2021 Model S/X. If your car does not support fleet telemetry, this option will be disabled automatically within two minutes.")] public bool UseFleetTelemetry { get; set; } - [HelperText("This further improves the detection if the car is at home. Enabling this results in additionally streaming the field Location over my server. If you do not mind that your car location data passes my server, do not disable this option.")] - public bool UseFleetTelemetryForLocationData { get; set; } = true; + [HelperText("When enabled, TSC collects data of additional fields that are not necessarily required for TSC to work, but logged data might be helpful for future visualizations. Note: For this a car license is required.")] + public bool IncludeTrackingRelevantFields { get; set; } +} + + +public class CarBasicConfigurationValidator : AbstractValidator +{ + public CarBasicConfigurationValidator() + { + When(x => x.ShouldBeManaged, () => + { + RuleFor(x => x.MinimumAmpere).GreaterThan(0); + RuleFor(x => x.MaximumAmpere).GreaterThan(0); + RuleFor(x => x.MaximumAmpere).LessThanOrEqualTo(64); + RuleFor(x => x) + .Must(config => config.MaximumAmpere > config.MinimumAmpere) + .WithMessage("MaximumAmpere must be greater than MinimumAmpere."); + RuleFor(x => x.UsableEnergy).GreaterThan(5); + RuleFor(x => x.ChargingPriority).GreaterThan(0); + }); + + } } diff --git a/TeslaSolarCharger/Shared/Dtos/DtoBackendLogin.cs b/TeslaSolarCharger/Shared/Dtos/DtoBackendLogin.cs new file mode 100644 index 000000000..fc5748ceb --- /dev/null +++ b/TeslaSolarCharger/Shared/Dtos/DtoBackendLogin.cs @@ -0,0 +1,7 @@ +namespace TeslaSolarCharger.Shared.Dtos; + +public class DtoBackendLogin() +{ + public string? UserName { get; set; } + public string? Password { get; set; } +} diff --git a/TeslaSolarCharger/Shared/Dtos/IndexRazor/CarValues/DtoCarBaseStates.cs b/TeslaSolarCharger/Shared/Dtos/IndexRazor/CarValues/DtoCarBaseStates.cs index 88759cc84..a723ca7b9 100644 --- a/TeslaSolarCharger/Shared/Dtos/IndexRazor/CarValues/DtoCarBaseStates.cs +++ b/TeslaSolarCharger/Shared/Dtos/IndexRazor/CarValues/DtoCarBaseStates.cs @@ -26,25 +26,4 @@ public class DtoCarBaseStates public List ChargeInformation { get; set; } = new(); public CarStateEnum? State { get; set; } public List ChargingSlots { get; set; } = new(); - - public DateTime? VehicleRateLimitedUntil { get; set; } - public DateTime? VehicleDataRateLimitedUntil { get; set; } - public DateTime? CommandsRateLimitedUntil { get; set; } - public DateTime? ChargingCommandsRateLimitedUntil { get; set; } - public DateTime? WakeUpRateLimitedUntil { get; set; } - - public DateTime? RateLimitedUntil - { - get - { - return new List - { - VehicleRateLimitedUntil, - VehicleDataRateLimitedUntil, - CommandsRateLimitedUntil, - ChargingCommandsRateLimitedUntil, - WakeUpRateLimitedUntil, - }.Max(); - } - } } diff --git a/TeslaSolarCharger/Shared/Enums/CarValueType.cs b/TeslaSolarCharger/Shared/Enums/CarValueType.cs index d5108f416..6ace40156 100644 --- a/TeslaSolarCharger/Shared/Enums/CarValueType.cs +++ b/TeslaSolarCharger/Shared/Enums/CarValueType.cs @@ -23,5 +23,6 @@ public enum CarValueType AsleepOrOffline, Gear, Speed, + VehicleName, Unknown = 9999, } diff --git a/TeslaSolarCharger/Shared/Enums/FleetApiTokenState.cs b/TeslaSolarCharger/Shared/Enums/FleetApiTokenState.cs deleted file mode 100644 index 39d9ff8eb..000000000 --- a/TeslaSolarCharger/Shared/Enums/FleetApiTokenState.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace TeslaSolarCharger.Shared.Enums; - -public enum FleetApiTokenState -{ - NotNeeded, - NotRequested, - TokenRequestExpired, - TokenUnauthorized, - MissingScopes, - NotReceived, - Expired, - UpToDate, - NoApiRequestsAllowed, -} diff --git a/TeslaSolarCharger/Shared/Enums/TokenState.cs b/TeslaSolarCharger/Shared/Enums/TokenState.cs new file mode 100644 index 000000000..6979fb21c --- /dev/null +++ b/TeslaSolarCharger/Shared/Enums/TokenState.cs @@ -0,0 +1,11 @@ +namespace TeslaSolarCharger.Shared.Enums; + +public enum TokenState +{ + MissingPrecondition, + NotAvailable, + Unauthorized, + MissingScopes, + Expired, + UpToDate, +} diff --git a/TeslaSolarCharger/Shared/Resources/Constants.cs b/TeslaSolarCharger/Shared/Resources/Constants.cs index 67bcd926a..924a25670 100644 --- a/TeslaSolarCharger/Shared/Resources/Constants.cs +++ b/TeslaSolarCharger/Shared/Resources/Constants.cs @@ -19,9 +19,7 @@ public class Constants : IConstants public Margin InputMargin => Margin.Dense; public string InstallationIdKey => "InstallationId"; - public string FleetApiTokenRequested => "FleetApiTokenRequested"; - public string TokenRefreshUnauthorized => "TokenRefreshUnauthorized"; - public string TokenMissingScopes => "TokenMissingScopes"; + public string FleetApiTokenMissingScopes => "FleetApiTokenMissingScopes"; public string CarConfigurationsConverted => "CarConfigurationsConverted"; public string BleBaseUrlConverted => "BleBaseUrlConverted"; public string HandledChargesCarIdsConverted => "HandledChargesCarIdsConverted"; @@ -32,16 +30,20 @@ public class Constants : IConstants public TimeSpan MinTokenRestLifetime => TimeSpan.FromMinutes(2); public int MaxTokenUnauthorizedCount => 5; public int ChargingDetailsAddTriggerEveryXSeconds => 59; - public string ChargeStartRequestUrl => "command/charge_start"; - public string ChargeStopRequestUrl => "command/charge_stop"; - public string SetChargingAmpsRequestUrl => "command/set_charging_amps"; - public string SetScheduledChargingRequestUrl => "command/set_scheduled_charging"; - public string SetChargeLimitRequestUrl => "command/set_charge_limit"; - public string SetSentryModeRequestUrl => "command/set_sentry_mode"; - public string FlashHeadlightsRequestUrl => "command/flash_lights"; - public string WakeUpRequestUrl => "wake_up"; - public string VehicleRequestUrl => ""; - public string VehicleDataRequestUrl => $"vehicle_data?endpoints={Uri.EscapeDataString("drive_state;location_data;vehicle_state;charge_state;climate_state")}"; + public string ChargeStartRequestUrl => "FleetApiRequests/ChargeStart"; + public string ChargeStopRequestUrl => "FleetApiRequests/ChargeStop"; + public string SetChargingAmpsRequestUrl => "FleetApiRequests/SetChargingAmps"; + public string SetChargeLimitRequestUrl => "FleetApiRequests/SetChargeLimit"; + public string WakeUpRequestUrl => "FleetApiRequests/WakeUp"; + public string VehicleRequestUrl => "FleetApiRequests/GetVehicle"; + public string VehicleDataRequestUrl => $"FleetApiRequests/GetVehicleData"; + public string TeslaTokenEncryptionKeyKey => "TeslaTokenEncryptionKey"; + public string FleetApiTokenUnauthorizedKey => "BackendTokenUnauthorized"; + public string FleetApiTokenExpirationTimeKey => "FleetApiTokenExpirationTime"; + public string FleetApiTokenStateKey => "FleetApiTokenState"; + public string BackendTokenStateKey => "BackendTokenState"; + public string IsBaseAppLicensedKey => "IsBaseAppLicensed"; + public string IsFleetApiLicensedKey => "IsFleetApiLicensed_"; public string GridPoleIcon => "power-pole"; } diff --git a/TeslaSolarCharger/Shared/Resources/Contracts/IConstants.cs b/TeslaSolarCharger/Shared/Resources/Contracts/IConstants.cs index cc131a389..251901a17 100644 --- a/TeslaSolarCharger/Shared/Resources/Contracts/IConstants.cs +++ b/TeslaSolarCharger/Shared/Resources/Contracts/IConstants.cs @@ -14,8 +14,7 @@ public interface IConstants int MinimumSocDifference { get; } string InstallationIdKey { get; } - string FleetApiTokenRequested { get; } - string TokenMissingScopes { get; } + string FleetApiTokenMissingScopes { get; } string NextAllowedTeslaApiRequest { get; } string BackupZipBaseFileName { get; } TimeSpan MaxTokenRequestWaitTime { get; } @@ -34,11 +33,15 @@ public interface IConstants string ChargeStartRequestUrl { get; } string ChargeStopRequestUrl { get; } string SetChargingAmpsRequestUrl { get; } - string SetScheduledChargingRequestUrl { get; } string SetChargeLimitRequestUrl { get; } - string SetSentryModeRequestUrl { get; } - string FlashHeadlightsRequestUrl { get; } string WakeUpRequestUrl { get; } string VehicleRequestUrl { get; } string VehicleDataRequestUrl { get; } + string TeslaTokenEncryptionKeyKey { get; } + string FleetApiTokenUnauthorizedKey { get; } + string FleetApiTokenExpirationTimeKey { get; } + string FleetApiTokenStateKey { get; } + string BackendTokenStateKey { get; } + string IsBaseAppLicensedKey { get; } + string IsFleetApiLicensedKey { get; } } diff --git a/TeslaSolarCharger/Shared/TeslaSolarCharger.Shared.csproj b/TeslaSolarCharger/Shared/TeslaSolarCharger.Shared.csproj index 6a6bb58f1..cd080f382 100644 --- a/TeslaSolarCharger/Shared/TeslaSolarCharger.Shared.csproj +++ b/TeslaSolarCharger/Shared/TeslaSolarCharger.Shared.csproj @@ -17,6 +17,7 @@ + diff --git a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs index b0addce06..33d5ffbc8 100644 --- a/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs +++ b/TeslaSolarCharger/Shared/Wrappers/ConfigurationWrapper.cs @@ -91,6 +91,14 @@ public string BaseConfigFileFullName() return Path.Combine(configFileDirectory, value); } + public int BackendPasswordDefaultLength() + { + var environmentVariableName = "BackendPasswordDefaultLength"; + var value = configuration.GetValue(environmentVariableName); + logger.LogTrace("Config value extracted: [{key}]: {value}", environmentVariableName, value); + return value; + } + public string ConfigFileDirectory() { var environmentVariableName = "ConfigFileLocation"; @@ -101,13 +109,6 @@ public string ConfigFileDirectory() return path; } - public string? GetFleetApiBaseUrl() - { - var environmentVariableName = "TeslaFleetApiBaseUrl"; - var value = configuration.GetValue(environmentVariableName); - return value; - } - public string GetAwattarBaseUrl() { var environmentVariableName = "AwattarBaseUrl";