Merge pull request #1003 from pkuehnel/feat/InstallationId

feat(Index.razor): Display installation Id

TeslaSolarCharger.Model/Contracts/ITeslaSolarChargerContext.cs

@@ -16,5 +16,6 @@ public interface ITeslaSolarChargerContext
     DatabaseFacade Database { get; }
     DbSet<SpotPrice> SpotPrices { get; set; }
     DbSet<TeslaToken> TeslaTokens { get; set; }
+    DbSet<TscConfiguration> TscConfigurations { get; set; }
     void RejectChanges();
 }

TeslaSolarCharger.Model/Entities/TeslaSolarCharger/TscConfiguration.cs

@@ -0,0 +1,8 @@
+namespace TeslaSolarCharger.Model.Entities.TeslaSolarCharger;
+
+public class TscConfiguration
+{
+    public int Id { get; set; }
+    public string Key { get; set; }
+    public string? Value { get; set; }
+}

TeslaSolarCharger.Model/EntityFramework/TeslaSolarChargerContext.cs

@@ -13,6 +13,7 @@ public class TeslaSolarChargerContext : DbContext, ITeslaSolarChargerContext
     public DbSet<PowerDistribution> PowerDistributions { get; set; } = null!;
     public DbSet<SpotPrice> SpotPrices { get; set; } = null!;
     public DbSet<TeslaToken> TeslaTokens { get; set; } = null!;
+    public DbSet<TscConfiguration> TscConfigurations { get; set; } = null!;
 
     // ReSharper disable once UnassignedGetOnlyAutoProperty
     public string DbPath { get; }

TeslaSolarCharger.Model/Migrations/20231201103452_AddTscConfigurations.cs

@@ -0,0 +1,35 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace TeslaSolarCharger.Model.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddTscConfigurations : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "TscConfigurations",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    Key = table.Column<string>(type: "TEXT", nullable: false),
+                    Value = table.Column<string>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TscConfigurations", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "TscConfigurations");
+        }
+    }
+}

TeslaSolarCharger.Model/Migrations/TeslaSolarChargerContextModelSnapshot.cs

@@ -184,6 +184,24 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("TeslaTokens");
                 });
 
+            modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.TscConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TscConfigurations");
+                });
+
             modelBuilder.Entity("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.PowerDistribution", b =>
                 {
                     b.HasOne("TeslaSolarCharger.Model.Entities.TeslaSolarCharger.HandledCharge", "HandledCharge")

TeslaSolarCharger.SharedBackend/Contracts/IConstants.cs

@@ -10,4 +10,6 @@ public interface IConstants
     /// Soc Difference needs to be higher than this value
     /// </summary>
     int MinimumSocDifference { get; }
+
+    string InstallationIdKey { get; }
 }

TeslaSolarCharger.SharedBackend/Values/Constants.cs

@@ -9,4 +9,6 @@ public class Constants : IConstants
     public int MinSocLimit => 50;
     public int DefaultOverage => -1000000;
     public int MinimumSocDifference => 2;
+
+    public string InstallationIdKey => "InstallationId";
 }

TeslaSolarCharger/Client/Pages/Index.razor

@@ -358,6 +358,7 @@ else
         {
             <p><em>Version: <a href="https://github.com/pkuehnel/TeslaSolarCharger/releases/tag/v@_version" target="_blank">@_version</a></em></p>
         }
+        <div>@_installationId</div>
     </div>
 
 
@@ -394,6 +395,7 @@ else
     private string? _serverTimeZoneDisplayName;
     private bool? _shouldDisplayApiRequestCounter;
     private int? _apiRequestCount;
+    private string _installationId = "";
 
     private Timer? _timer;
 
@@ -410,6 +412,7 @@ else
         var dtoSolarChargerInstallation = await HttpClient.GetFromJsonAsync<DtoValue<bool>>("api/Hello/IsSolarEdgeInstallation").ConfigureAwait(false);
         _isSolarEdgeInstallation = dtoSolarChargerInstallation?.Value;
         _version = await HttpClient.GetStringAsync("api/Hello/ProductVersion").ConfigureAwait(false);
+        _installationId = await HttpClient.GetStringAsync("api/Hello/GetInstallationId").ConfigureAwait(false);
         foreach (var carBaseState in _carBaseStates!)
         {
             _collapsedCarDetails.Add(carBaseState.CarId);

TeslaSolarCharger/Server/Contracts/ICoreService.cs

@@ -19,4 +19,5 @@ public interface ICoreService
     DtoValue<int> TeslaApiRequestsSinceStartup();
     DtoValue<bool> ShouldDisplayApiRequestCounter();
     Task<IEnumerable<Price>> GetPriceData(DateTimeOffset from, DateTimeOffset to);
+    Task<string> GetInstallationId();
 }

TeslaSolarCharger/Server/Controllers/HelloController.cs

@@ -53,5 +53,8 @@ public HelloController(ICoreService coreService)
 
         [HttpGet]
         public Task<IEnumerable<Price>> GetPriceData(DateTimeOffset from, DateTimeOffset to) => _coreService.GetPriceData(from, to);
+
+        [HttpGet]
+        public Task<string> GetInstallationId() => _coreService.GetInstallationId();
     }
 }

TeslaSolarCharger/Server/Program.cs

@@ -5,6 +5,7 @@
 using TeslaSolarCharger.Server;
 using TeslaSolarCharger.Server.Contracts;
 using TeslaSolarCharger.Server.Scheduling;
+using TeslaSolarCharger.Server.Services.Contracts;
 using TeslaSolarCharger.Shared.Contracts;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -70,6 +71,10 @@
     var teslaSolarChargerContext = app.Services.GetRequiredService<ITeslaSolarChargerContext>();
     await teslaSolarChargerContext.Database.MigrateAsync().ConfigureAwait(false);
 
+    var tscConfigurationService = app.Services.GetRequiredService<ITscConfigurationService>();
+    var installationId = await tscConfigurationService.GetInstallationId().ConfigureAwait(false);
+    logger.LogTrace("Installation Id: {installationId}", installationId);
+
     var chargingCostService = app.Services.GetRequiredService<IChargingCostService>();
     await chargingCostService.DeleteDuplicatedHandleCharges().ConfigureAwait(false);
 

TeslaSolarCharger/Server/ServiceCollectionExtensions.cs

@@ -95,6 +95,7 @@ public static IServiceCollection AddMyDependencies(this IServiceCollection servi
             .AddTransient<IChargeTimeCalculationService, ChargeTimeCalculationService>()
             .AddTransient<ITeslaFleetApiService, TeslaFleetApiService>()
             .AddTransient<ITeslamateApiService, TeslamateApiService>()
+            .AddTransient<ITscConfigurationService, TscConfigurationService>()
             .AddSharedBackendDependencies();
         if (useFleetApi)
         {

TeslaSolarCharger/Server/Services/Contracts/ITscConfigurationService.cs

@@ -0,0 +1,6 @@
+namespace TeslaSolarCharger.Server.Services.Contracts;
+
+public interface ITscConfigurationService
+{
+    Task<Guid> GetInstallationId();
+}