Merge branch 'feature-DeviceRegistration' into Development

.gitignore

@@ -348,3 +348,6 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
+
+# Project specific
+*.sqlite*

src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/NewFile.txt

@@ -0,0 +1 @@
+

src/Elektrifikatsiya/Elektrifikatsiya/Components/Protected.razor

@@ -0,0 +1,42 @@
+@using Elektrifikatsiya.Models
+@inject Services.IAuthorizationService AuthorizationService
+
+@if (IsAuthorized)
+{
+	@Authorized
+}
+else if (!loaded && UseLoadingScreen)
+{
+	@Loading
+}
+else if (loaded)
+{
+	@NotAuthorized
+}
+
+@code {
+	[Parameter]
+	public RenderFragment? Authorized { get; set; }
+
+	[Parameter]
+	public RenderFragment? NotAuthorized { get; set; }
+
+	[Parameter]
+	public RenderFragment? Loading { get; set; }
+
+	[Parameter]
+	public Role RequiredRole { get; set; }
+
+	[Parameter]
+	public bool UseLoadingScreen { get; set; }
+
+	public bool IsAuthorized { get; set; }
+	private bool loaded;
+
+	protected override async Task OnParametersSetAsync()
+	{
+		IsAuthorized = (await AuthorizationService.IsAuthorized(RequiredRole)).ValueOrDefault;
+		StateHasChanged();
+		loaded = true;
+	}
+}

src/Elektrifikatsiya/Elektrifikatsiya/Database/DeviceManagementDatabaseContext.cs

@@ -1,14 +0,0 @@
-using Elektrifikatsiya.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Elektrifikatsiya.Database
-{
-    public class DeviceManagmentDatabaseContext : DbContext
-    {
-        public DbSet<Device> Devices { get; set; }
-
-        public DeviceManagmentDatabaseContext(DbContextOptions<DeviceManagmentDatabaseContext> options) : base(options)
-        {
-        }
-    }
-}

src/Elektrifikatsiya/Elektrifikatsiya/Database/MainDatabaseContext.cs

@@ -4,11 +4,13 @@ using Microsoft.EntityFrameworkCore;
 
 namespace Elektrifikatsiya.Database;
 
-public class UserDatabaseContext : DbContext
+public class MainDatabaseContext : DbContext
 {
-    public UserDatabaseContext(DbContextOptions<UserDatabaseContext> dbContextOptions) : base(dbContextOptions)
+    public MainDatabaseContext(DbContextOptions<MainDatabaseContext> dbContextOptions) : base(dbContextOptions)
     {
     }
 
     public DbSet<User> Users { get; set; }
+    public DbSet<Device> Devices { get; set; }
+	public DbSet<Event> Events { get; set; }
 }

src/Elektrifikatsiya/Elektrifikatsiya/Elektrifikatsiya.csproj

@@ -40,10 +40,14 @@
 		<PackageReference Include="Blazorise.Material" Version="1.2.0" />
 		<PackageReference Include="Blazorise.Icons.Material" Version="1.2.0" />
 		<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
-		<PackageReference Include="FluentResults" Version="3.15.1" />
+		<PackageReference Include="FluentResults" Version="3.15.2" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.2" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.4" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.2" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
-		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
 		<PackageReference Include="Tmds.MDns" Version="0.7.1" />
 	</ItemGroup>
 

src/Elektrifikatsiya/Elektrifikatsiya/Layouts/LoginLayout.razor

@@ -1,18 +1,40 @@
 @using System.Diagnostics;
+@using FluentResults
+@inject Elektrifikatsiya.Services.IAuthenticationService AuthenticationService
+@inject NavigationManager NavigationManager
 @inherits LayoutComponentBase
 <Image Source="logo.png" Width="Width.Is50" Height="Height.Is50"> </Image>
 <Card Width="Width.Is50" Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Padding="Padding.Is5">
     <Field Width="Width.Is25" Position="Position.Relative.Top.Is50.Start.Is50.Translate.Middle">
-        <TextEdit Placeholder="Username" />
+        <TextEdit @bind-Text="username" Placeholder="Username" />
     </Field>
     <Field  Width="Width.Is25" Position="Position.Relative.Top.Is50.Start.Is50.Translate.Middle">
-        <TextEdit Role="TextRole.Password" Placeholder="Password" />
+        <TextEdit @bind-Text="password" Role="TextRole.Password" Placeholder="Password" />
     </Field>
-    <Button Width="Width.Is25"  Color="Color.Primary" Clicked="Clicked" Position="Position.Relative.Bottom.Is50.Start.Is50.Translate.MiddleX" >Login</Button>
+    <Button Width="Width.Is25" Disabled="disabled"  Color="color" Clicked="Clicked" Position="Position.Relative.Bottom.Is50.Start.Is50.Translate.MiddleX" >Login</Button>
 </Card>
 @code {
-    private void Clicked()
+	private string username = string.Empty;
+	private string password = string.Empty;
+	private Color color = Color.Primary;
+	private bool disabled;
+    private async Task Clicked()
     {
-        Debug.WriteLine("Button was clicked!");
+	    color = Color.Primary;
+	    disabled = true;
+		
+	    Result loginResult = await AuthenticationService.LoginUserAsync(username, password);
+
+	    if (loginResult.IsSuccess)
+	    {
+            NavigationManager.NavigateTo("/", true);
+	    }
+	    else
+	    {
+		    color = Color.Danger;
+		    disabled = false;
 	    }
     }
+}
+
+<!-- TODO: Put this into the Component once we are merging and refactoring -->

src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor

@@ -1,6 +1,10 @@
-@using Elektrifikatsiya.Components.Layout
+@using Elektrifikatsiya.Components
+@using Elektrifikatsiya.Components.Layout
+@using Elektrifikatsiya.Models
 @inherits LayoutComponentBase
-
+@inject NavigationManager NavigationManager
+<Protected RequiredRole="Role.User">
+	<Authorized>
 		<Layout Sider>
 			<LayoutSider>
 				<LayoutSiderContent>
@@ -13,3 +17,10 @@
 				</LayoutContent>
 			</Layout>
 		</Layout>
+	</Authorized>
+	<NotAuthorized>
+		@{
+			NavigationManager.NavigateTo("/login");
+		}
+	</NotAuthorized>
+</Protected>

src/Elektrifikatsiya/Elektrifikatsiya/Migrations/20230322092207_fix foreign keys.Designer.cs

@@ -0,0 +1,96 @@
+// <auto-generated />
+using System;
+using Elektrifikatsiya.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Elektrifikatsiya.Migrations
+{
+    [DbContext(typeof(MainDatabaseContext))]
+    [Migration("20230322092207_fix foreign keys")]
+    partial class fixforeignkeys
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.4");
+
+            modelBuilder.Entity("Elektrifikatsiya.Models.Device", b =>
+                {
+                    b.Property<string>("MacAddress")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IpAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Room")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("MacAddress");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Devices");
+                });
+
+            modelBuilder.Entity("Elektrifikatsiya.Models.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastLoginDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PasswordHash")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SessionToken")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Elektrifikatsiya.Models.Device", b =>
+                {
+                    b.HasOne("Elektrifikatsiya.Models.User", "User")
+                        .WithMany("Devices")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Elektrifikatsiya.Models.User", b =>
+                {
+                    b.Navigation("Devices");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Elektrifikatsiya/Elektrifikatsiya/Migrations/20230322092207_fix foreign keys.cs

@@ -0,0 +1,68 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Elektrifikatsiya.Migrations
+{
+    /// <inheritdoc />
+    public partial class fixforeignkeys : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Users",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    Name = table.Column<string>(type: "TEXT", nullable: false),
+                    PasswordHash = table.Column<string>(type: "TEXT", nullable: false),
+                    Role = table.Column<int>(type: "INTEGER", nullable: false),
+                    SessionToken = table.Column<string>(type: "TEXT", nullable: true),
+                    LastLoginDate = table.Column<DateTime>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Users", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Devices",
+                columns: table => new
+                {
+                    MacAddress = table.Column<string>(type: "TEXT", nullable: false),
+                    Name = table.Column<string>(type: "TEXT", nullable: false),
+                    IpAddress = table.Column<string>(type: "TEXT", nullable: false),
+                    UserId = table.Column<int>(type: "INTEGER", nullable: false),
+                    Room = table.Column<string>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Devices", x => x.MacAddress);
+                    table.ForeignKey(
+                        name: "FK_Devices_Users_UserId",
+                        column: x => x.UserId,
+                        principalTable: "Users",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Devices_UserId",
+                table: "Devices",
+                column: "UserId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Devices");
+
+            migrationBuilder.DropTable(
+                name: "Users");
+        }
+    }
+}

src/Elektrifikatsiya/Elektrifikatsiya/Migrations/MainDatabaseContextModelSnapshot.cs

@@ -0,0 +1,93 @@
+// <auto-generated />
+using System;
+using Elektrifikatsiya.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Elektrifikatsiya.Migrations
+{
+    [DbContext(typeof(MainDatabaseContext))]
+    partial class MainDatabaseContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "7.0.4");
+
+            modelBuilder.Entity("Elektrifikatsiya.Models.Device", b =>
+                {
+                    b.Property<string>("MacAddress")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IpAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Room")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("MacAddress");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Devices");
+                });
+
+            modelBuilder.Entity("Elektrifikatsiya.Models.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastLoginDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PasswordHash")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SessionToken")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Elektrifikatsiya.Models.Device", b =>
+                {
+                    b.HasOne("Elektrifikatsiya.Models.User", "User")
+                        .WithMany("Devices")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Elektrifikatsiya.Models.User", b =>
+                {
+                    b.Navigation("Devices");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Elektrifikatsiya/Elektrifikatsiya/Models/Device.cs

@@ -19,7 +19,7 @@ public class Device
     public User User { get; set; }
 
     [NotMapped]
-    public int PowerUsage { get; set; }
+    public double PowerUsage { get; set; }
 
     public string Room { get; set; }
 

src/Elektrifikatsiya/Elektrifikatsiya/Models/Event.cs

@@ -1,7 +1,13 @@
-namespace Elektrifikatsiya.Models
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace Elektrifikatsiya.Models
 {
 	public class Event
 	{
+		[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+		[Key]
+		public int Id { get; private set; }
 		public string EventName { get; set; }
 		public string Description { get; set; }
 		public DateTime Date { get; set; }

src/Elektrifikatsiya/Elektrifikatsiya/Models/PrometheusQueryResult.cs

@@ -1,4 +1,6 @@
-using System.Text.Json.Serialization;
+using System.Diagnostics;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Mvc.Diagnostics;
 
 namespace Elektrifikatsiya.Models;
 
@@ -24,6 +26,8 @@ public class PrometheusQueryResult
     public string? Error { get; set; }
     public List<string>? Warnings { get; set; }
 
+    public PrometheusDataWrapper? Data { get; set; }
+
     public PrometheusQueryResult(Status status, string? errorType, string? error, List<string>? warnings)
     {
         Status = status;
@@ -33,7 +37,7 @@ public class PrometheusQueryResult
     }
 }
 
-internal class PrometheusDataWrapper
+public class PrometheusDataWrapper
 {
     public ResultType ResultType { get; set; }
     public List<PrometheusData> Result { get; set; }
@@ -43,9 +47,52 @@ internal class PrometheusDataWrapper
         ResultType = resultType;
         Result = result;
     }
+    
+    public FluentResults.Result<List<(double, double)>> MatrixTypeToTimestampFloatTuple()
+    {
+	    if (ResultType != ResultType.Matrix)
+	    {
+		    return FluentResults.Result.Fail("The response did not have the Matrix Type");
 	    }
 
-internal class PrometheusDataMetric
+        List<(double, double)> result = new List<(double, double)>();
+
+        if (Result.Count == 0 || Result[0]?.Values is null || Result[0]?.Values?[0] is null)
+        {
+	        return FluentResults.Result.Fail("There was no result in the Response Body");
+        }
+
+        foreach (object value in Result[0]!.Values!)
+	    {
+
+		    string[] segment = value.ToString()!.Split(",");
+
+            result.Add((Convert.ToDouble(segment[0][2..^1]), Convert.ToDouble(segment[1][1..^2])));
+	    }
+        Debug.WriteLine(result);
+        return result;
+    }
+
+    public FluentResults.Result<(double, double)> VectorTypeToTimestampFloatTuple()
+    {
+	    if (ResultType != ResultType.Vector)
+	    {
+		    return FluentResults.Result.Fail("The response did not have the Vector Type");
+	    }
+
+	    string[]? segment = Result.FirstOrDefault()?.Value.ToString()?.Split(",") ?? null;
+
+	    if (segment is null)
+	    {
+		    return FluentResults.Result.Fail("There was no result in the Response Body");
+	    }
+
+	    return((Convert.ToDouble(segment[0][2..^1]), Convert.ToDouble(segment[1][1..^2])));
+    }
+}
+
+
+public class PrometheusDataMetric
 {
     [JsonPropertyName("__name__")] public string Name { get; set; }
 
@@ -60,14 +107,9 @@ internal class PrometheusDataMetric
     }
 }
 
-internal class PrometheusData
+public class PrometheusData
 {
-    public PrometheusDataMetric Metric { get; set; }
+    public PrometheusDataMetric? Metric { get; set; } = null;
-    public object Value { get; set; }
+    public object? Value { get; set; } = null;
-
+    public List<object>? Values { get; set; } = null;
-    public PrometheusData(PrometheusDataMetric metric, object value)
-    {
-        Metric = metric;
-        Value = value;
-    }
 }

src/Elektrifikatsiya/Elektrifikatsiya/Models/User.cs

@@ -9,11 +9,20 @@ public class User
     [Key]
     public int Id { get; private set; }
 
+    [Required]
     public string Name { get; private set; }
+
+    [Required]
     public string PasswordHash { get; private set; }
+
+    [Required]
+    public Role Role { get; set; }
+
     public string? SessionToken { get; set; }
     public DateTime LastLoginDate { get; set; }
-    public Role Role { get; set; }
+
+    [Required]
+    public List<Device> Devices { get; set; } = new();
 
     public User(string name, string passwordHash, Role role)
     {

src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor

@@ -5,9 +5,11 @@
 @using Elektrifikatsiya.Services
 @using Elektrifikatsiya.Services.Implementations
 @using Elektrifikatsiya.Utilities
+@using FluentResults;
 @inject IVersionProvider VersionProvider
 @inject IDeviceManagmentService DeviceManagmentService
 @inject IAuthenticationService AuthenticationService
+@inject IMessageService MessageService
 
 <Div>
     <Row Style="height:50%; width:100%" Padding="Padding.Is3.OnDesktop.Is0">
@@ -42,7 +44,7 @@
                                     </Row>
                                 </Column>
                                 <Column ColumnSize="ColumnSize.Is4.Is2.WithOffset">
-							<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Clicked="@(async () => await DeviceManagmentService.RegisterDevice(context.Item,(await AuthenticationService.GetUserAsync()).ValueOrDefault))" Outline>
+                                    <Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Clicked="@(()=>RegisterDevice(context.Item))" Outline>
                                         <BarIcon IconName="IconName.Add" />
                                     </Button>
                                 </Column>
@@ -71,13 +73,21 @@
                 <ListGroup Style="width:100%; border-radius: 0px 0px">
                     <ListGroupItem Color="Color.Default">
                         <Form>
+                            <Validation @ref="ipValidation" Validator="ValidateIPv4">
                                 <Field Horizontal>
                                     <FieldBody ColumnSize="ColumnSize.Is12">
-									<TextEdit Placeholder="Enter the Device IP here" />
+                                        <TextEdit @bind-Text="ipText" Placeholder="Enter the Device IP here">
+                                            <Feedback>
+                                                <ValidationNone>Please enter a ip address.</ValidationNone>
+                                                <ValidationSuccess>Ip address is valid.</ValidationSuccess>
+                                                <ValidationError>Ip address is not valid!</ValidationError>
+                                            </Feedback>
+                                        </TextEdit>
                                         <br>
-									<Button style="background-color:#1a237e; color:white" Type="ButtonType.Submit" PreventDefaultOnSubmit>CONNECT</Button>
+                                        <Button style="background-color:#1a237e; color:white" Type="ButtonType.Submit" Disabled="ipValidation?.Status != ValidationStatus.Success" Clicked="@(async (_)=> await RegisterDevice(IPAddress.Parse(ipText!)))" PreventDefaultOnSubmit>CONNECT</Button>
                                     </FieldBody>
                                 </Field>
+                            </Validation>
                         </Form>
                     </ListGroupItem>
                 </ListGroup>
@@ -90,13 +100,55 @@
 @code {
     List<IPAddress> ipAddresses = new List<IPAddress>();
 
+    Validation? ipValidation;
+
+    string ipText = null!;
+
     protected override void OnInitialized()
     {
-		ipAddresses.AddRange(MdnsDiscovery.GetChachedDevices());
+        MdnsDiscovery.OnDeviceFound += async ipAddress =>
-		MdnsDiscovery.OnDeviceFound += address =>
         {
-			ipAddresses.Add(address);
+            if (!ipAddresses.Contains(ipAddress))
-			InvokeAsync(StateHasChanged);
+            {
+                ipAddresses.Add(ipAddress);
+                await InvokeAsync(StateHasChanged);
+            }
         };
+
+        MdnsDiscovery.FetchChachedDevices();
+    }
+
+    private async Task RegisterDevice(IPAddress ipAddress)
+    {
+        Result<Device> result = await DeviceManagmentService.RegisterDevice(ipAddress, (await AuthenticationService.GetUserAsync()).ValueOrDefault);
+
+        if (result.IsSuccess)
+        {
+            await MessageService.Success("Device added!");
+        }
+        else
+        {
+            await MessageService.Error(string.Join(',', result.Errors.Select(e => e.Message)), "Adding device failed!");
+        }
+    }
+
+    public void ValidateIPv4(ValidatorEventArgs e)
+    {
+        string? input = Convert.ToString(e.Value);
+
+        if (string.IsNullOrWhiteSpace(input))
+        {
+            e.Status = ValidationStatus.None;
+            return;
+        }
+
+        string[] splitValues = input.Split('.');
+        if (splitValues.Length != 4)
+        {
+            e.Status = ValidationStatus.Error;
+            return;
+        }
+
+        e.Status = splitValues.All(r => byte.TryParse(r, out _)) ? ValidationStatus.Success : ValidationStatus.Error;
     }
 }

src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor

@@ -2,8 +2,11 @@
 @using Blazorise.Components;
 @using Elektrifikatsiya.Models;
 @using System.Net
+@using Elektrifikatsiya.Services
+@using Elektrifikatsiya.Utilities
+@using System.Diagnostics
 @inject IVersionProvider VersionProvider
-
+@inject IDeviceStatusService DeviceStatusService
 <Row Padding="Padding.Is3">
 	<Div Display="Display.Flex.Row.OnDesktop" Margin="Margin.Is3.FromBottom" Width="Width.Is100">
 		<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
@@ -91,10 +94,20 @@
 	//TODO: insert new event here if plug produces one
 	List<Event> events = new List<Event>() { new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now) };
 	//TODO: insert new Device here if user adds one
-	List<Device> plugs = new List<Device>() { new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "Josne", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), };
+	List<Device> plugs = new List<Device>();
 	//code for graph
 	LineChart<double> lineChart;
 
+	protected override void OnInitialized()
+	{
+		plugs = DeviceStatusService.GetDevices().ValueOrDefault ?? new List<Device>();
+
+		DeviceStatusService.OnDeviceStatusChanged += (_, e) =>
+		{
+			InvokeAsync(StateHasChanged);
+		};
+	}
+
 	protected override async Task OnAfterRenderAsync(bool firstRender)
 	{
 		if (firstRender)
@@ -105,41 +118,47 @@
 
 	async Task HandleRedraw()
 	{
+		labels.Clear();
 		await lineChart.Clear();
-
+		await lineChart.AddLabelsDatasetsAndUpdate(labels, await GetLineChartDataset());
-		await lineChart.AddLabelsDatasetsAndUpdate(Labels, GetLineChartDataset());
 	}
 
 	//TODO: insert dataset of current and last voltage usages
-	LineChartDataset<double> GetLineChartDataset()
+	async Task<LineChartDataset<double>> GetLineChartDataset()
 	{
 		return new LineChartDataset<double>
 			{
-				Label = "# of random number in thousands",
+				Label = "Wattage",
-				Data = RandomizeData(),
+				Data = await RandomizeData(),
-				BackgroundColor = backgroundColors,
-				BorderColor = borderColors,
 				Fill = true,
 				PointRadius = 3,
 				CubicInterpolationMode = "monotone",
 			};
 	}
 
-	string[] Labels = { "Red", "Blue", "Yellow", "Green", "Purple", "Orange" };
+	List<string> labels = new List<string>();
-	List<string> backgroundColors = new List<string> { ChartColor.FromRgba(255, 99, 132, 0.2f), ChartColor.FromRgba(54, 162, 235, 0.2f), ChartColor.FromRgba(255, 206, 86, 0.2f), ChartColor.FromRgba(75, 192, 192, 0.2f), ChartColor.FromRgba(153, 102, 255, 0.2f), ChartColor.FromRgba(255, 159, 64, 0.2f) };
-	List<string> borderColors = new List<string> { ChartColor.FromRgba(255, 99, 132, 1f), ChartColor.FromRgba(54, 162, 235, 1f), ChartColor.FromRgba(255, 206, 86, 1f), ChartColor.FromRgba(75, 192, 192, 1f), ChartColor.FromRgba(153, 102, 255, 1f), ChartColor.FromRgba(255, 159, 64, 1f) };
 
-	List<double> RandomizeData()
+	async Task<List<double>> RandomizeData()
 	{
+		PrometheusQuery promQueryer = new PrometheusQuery("http://localhost:9090");
+
+		string plugnames = "";
+		foreach (Device device in plugs)
+		{
+			plugnames += $"shellyplug-s-{device.MacAddress}/relay/0|";
+		}
+		plugnames = plugnames[0..^1];
+
+		Debug.WriteLine($$"""sum(power{sensor=~"{{plugnames}}"})[1h:1m]""");
+
+		PrometheusDataWrapper? deviceData = (await promQueryer.Query($$"""sum(power{sensor=~"{{plugnames}}"})[1h:1m]"""))?.Data;
+
 		var r = new Random(DateTime.Now.Millisecond);
 
-		return new List<double> {
+		return deviceData?.MatrixTypeToTimestampFloatTuple().ValueOrDefault?.Select(x =>
-		r.Next( 3, 50 ) * r.NextDouble(),
+		{
-		r.Next( 3, 50 ) * r.NextDouble(),
+			labels.Add(DateTimeOffset.FromUnixTimeSeconds(long.Parse($"1{x.Item1}0")).UtcDateTime.ToLocalTime().ToShortTimeString());
-		r.Next( 3, 50 ) * r.NextDouble(),
+			return x.Item2;
-		r.Next( 3, 50 ) * r.NextDouble(),
+		}).ToList() ?? new List<double>();
-		r.Next( 3, 50 ) * r.NextDouble(),
-		r.Next( 3, 50 ) * r.NextDouble() };
 	}
 }
-

src/Elektrifikatsiya/Elektrifikatsiya/Program.cs

@@ -22,8 +22,7 @@ builder.Services.AddTransient<IDeviceManagmentService, DeviceManagmentService>()
 builder.Services.AddScoped<IAuthenticationService, AuthenticationService>();
 builder.Services.AddScoped<IAuthorizationService, AuthorizationService>();
 builder.Services.AddScoped<ICookieService, CookieService>();
-builder.Services.AddDbContext<UserDatabaseContext>(options => options.UseSqlite("Data Source=./UserDatabase.sqlite"));
+builder.Services.AddDbContext<MainDatabaseContext>(options => options.UseSqlite("Data Source=./MainDatabase.sqlite"));
-builder.Services.AddDbContext<DeviceManagmentDatabaseContext>((options) => options.UseSqlite("Data Source=./DeviceManagement.sqlite"));
 builder.Services.AddBootstrapProviders();
 builder.Services.AddHttpClient<IDeviceManagmentService, DeviceManagmentService>();
 builder.Services.AddBlazorise(options =>
@@ -53,10 +52,16 @@ app.MapFallbackToPage("/_Host");
 app.MapControllers();
 
 IServiceScope serviceScope = app.Services.GetRequiredService<IServiceScopeFactory>().CreateScope();
-serviceScope.ServiceProvider.GetRequiredService<UserDatabaseContext>().Database.EnsureCreated();
 
-AsyncServiceScope scope = app.Services.CreateAsyncScope();
+MainDatabaseContext mainDatabase = serviceScope.ServiceProvider.GetRequiredService<MainDatabaseContext>();
-scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>().Database.EnsureCreated();
+mainDatabase.Database.EnsureCreated();
+
+IAuthenticationService authenticationService = serviceScope.ServiceProvider.GetRequiredService<IAuthenticationService>();
+
+if (!mainDatabase.Users.Any())
+{
+	authenticationService.RegisterUserAsync("admin", "admin", Role.Admin);
+}
 
 app.Run();
 

src/Elektrifikatsiya/Elektrifikatsiya/Properties/launchSettings.json

@@ -7,7 +7,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "dotnetRunMessages": true,
-      "applicationUrl": "https://localhost:56656;http://localhost:5255"
+      "applicationUrl": "https://localhost:56656;http://localhost:55552"
     },
     "IIS Express": {
       "commandName": "IISExpress",

src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/AuthenticationService.cs

@@ -12,13 +12,13 @@ namespace Elektrifikatsiya.Services.Implementations;
 
 public class AuthenticationService : IAuthenticationService
 {
-    private readonly UserDatabaseContext userDatabaseContext;
+    private readonly MainDatabaseContext mainDatabaseContext;
     private readonly IHttpContextAccessor httpContextAccessor;
     private readonly ICookieService cookieService;
 
-    public AuthenticationService(UserDatabaseContext userDatabaseContext, IHttpContextAccessor httpContextAccessor, ICookieService cookieService)
+    public AuthenticationService(MainDatabaseContext mainDatabaseContext, IHttpContextAccessor httpContextAccessor, ICookieService cookieService)
     {
-        this.userDatabaseContext = userDatabaseContext;
+        this.mainDatabaseContext = mainDatabaseContext;
         this.httpContextAccessor = httpContextAccessor;
         this.cookieService = cookieService;
     }
@@ -32,8 +32,8 @@ public class AuthenticationService : IAuthenticationService
             return getUserResult.ToResult();
         }
 
-        _ = userDatabaseContext.Users.Remove(getUserResult.Value);
+        _ = mainDatabaseContext.Users.Remove(getUserResult.Value);
-        return (await Result.Try(() => userDatabaseContext.SaveChangesAsync())).ToResult();
+        return (await Result.Try(() => mainDatabaseContext.SaveChangesAsync())).ToResult();
     }
 
     public async Task<Result<User>> GetUserAsync()
@@ -45,7 +45,7 @@ public class AuthenticationService : IAuthenticationService
             return Result.Fail("Token is not valid!");
         }
 
-        User? user = await userDatabaseContext.Users.FirstOrDefaultAsync(u => u.SessionToken == token);
+        User? user = await mainDatabaseContext.Users.FirstOrDefaultAsync(u => u.SessionToken == token);
 
         if (user is null || DateTime.UtcNow - user.LastLoginDate > TimeSpan.FromDays(7))
         {
@@ -62,7 +62,7 @@ public class AuthenticationService : IAuthenticationService
 
     public async Task<Result> LoginUserAsync(string name, string password)
     {
-        User? user = await userDatabaseContext.Users.FirstOrDefaultAsync(u => u.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
+        User? user = await mainDatabaseContext.Users.FirstOrDefaultAsync(u => u.Name == name);
 
         if (user is null)
         {
@@ -79,7 +79,7 @@ public class AuthenticationService : IAuthenticationService
         user.LastLoginDate = DateTime.UtcNow;
         user.SessionToken = newToken;
 
-        _ = await userDatabaseContext.SaveChangesAsync();
+        _ = await mainDatabaseContext.SaveChangesAsync();
 
         await cookieService.WriteCookieAsync("token", newToken, 7);
 
@@ -97,7 +97,7 @@ public class AuthenticationService : IAuthenticationService
             return Result.Ok();
         }
 
-        User? user = await userDatabaseContext.Users.FirstOrDefaultAsync(u => u.SessionToken == token);
+        User? user = await mainDatabaseContext.Users.FirstOrDefaultAsync(u => u.SessionToken == token);
 
         if (user is null)
         {
@@ -106,7 +106,7 @@ public class AuthenticationService : IAuthenticationService
 
         user.SessionToken = null;
 
-        _ = await userDatabaseContext.SaveChangesAsync();
+        _ = await mainDatabaseContext.SaveChangesAsync();
 
         return Result.Ok();
     }
@@ -121,14 +121,14 @@ public class AuthenticationService : IAuthenticationService
         }
 
         User user = new User(name, BC.HashPassword(password), role);
-        _ = userDatabaseContext.Users.Add(user);
+        _ = mainDatabaseContext.Users.Add(user);
 
-        return (await Result.Try(() => userDatabaseContext.SaveChangesAsync())).ToResult();
+        return (await Result.Try(() => mainDatabaseContext.SaveChangesAsync())).ToResult();
     }
 
     public Task<Result<bool>> UserExistsAsync(string name)
     {
         return Result.Try(() =>
-            userDatabaseContext.Users.AnyAsync(u => u.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase)));
+            mainDatabaseContext.Users.AnyAsync(u => u.Name == name));
     }
 }

src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/DeviceManagmentService.cs

@@ -5,6 +5,7 @@ using FluentResults;
 
 using System.Net;
 using System.Net.NetworkInformation;
+using Microsoft.EntityFrameworkCore;
 
 namespace Elektrifikatsiya.Services.Implementations;
 
@@ -81,7 +82,7 @@ public class DeviceManagmentService : IDeviceManagmentService
     public async Task<Result<Device>> RegisterDevice(IPAddress ip, User user, string? name = null, string room = "default")
     {
         using IServiceScope scope = serviceScopeFactory.CreateScope();
-		DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
+        MainDatabaseContext mainDatabaseContext = scope.ServiceProvider.GetRequiredService<MainDatabaseContext>();
 
         ShellyResponse? shellyResponse = null;
 
@@ -108,8 +109,10 @@ public class DeviceManagmentService : IDeviceManagmentService
 
         Device device = new Device(mac, name ?? mac, ip, user, room);
 
-		_ = deviceManagmentDatabaseContext.Add(device);
+        mainDatabaseContext.Entry(user).State = EntityState.Unchanged;
-		Result saveDatabaseChangesResult = await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
+
+        _ = mainDatabaseContext.Add(device);
+        Result saveDatabaseChangesResult = await Result.Try(Task () => mainDatabaseContext.SaveChangesAsync());
 
         if (saveDatabaseChangesResult.IsFailed)
         {
@@ -122,7 +125,7 @@ public class DeviceManagmentService : IDeviceManagmentService
     public async Task<Result> UnregisterDevice(string macAdress)
     {
         using IServiceScope scope = serviceScopeFactory.CreateScope();
-		DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
+        MainDatabaseContext mainDatabaseContext = scope.ServiceProvider.GetRequiredService<MainDatabaseContext>();
 
         Result<Device> getDeviceResult = GetDevice(macAdress);
 
@@ -138,15 +141,15 @@ public class DeviceManagmentService : IDeviceManagmentService
             return untrackDeviceResult;
         }
 
-		_ = deviceManagmentDatabaseContext.Remove(getDeviceResult.Value);
+        _ = mainDatabaseContext.Remove(getDeviceResult.Value);
 
-		return await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
+        return await Result.Try(Task () => mainDatabaseContext.SaveChangesAsync());
     }
 
     public async Task<Result> UpdateDevice(Device device)
     {
         using IServiceScope scope = serviceScopeFactory.CreateScope();
-		DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
+        MainDatabaseContext mainDatabaseContext = scope.ServiceProvider.GetRequiredService<MainDatabaseContext>();
 
         Result result = deviceStatusService.UpdateDeviceStatus(device);
 
@@ -155,8 +158,8 @@ public class DeviceManagmentService : IDeviceManagmentService
             return result;
         }
 
-		_ = deviceManagmentDatabaseContext.Update(device);
+        _ = mainDatabaseContext.Update(device);
 
-		return await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
+        return await Result.Try(Task () => mainDatabaseContext.SaveChangesAsync());
     }
 }

src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/UpdateService.cs

@@ -1,8 +1,9 @@
 using Elektrifikatsiya.Database;
 using Elektrifikatsiya.Models;
+using Elektrifikatsiya.Utilities;
 using FluentResults;
+
 using Microsoft.EntityFrameworkCore;
-using System.Threading.Tasks;
 
 namespace Elektrifikatsiya.Services.Implementations;
 
@@ -23,21 +24,21 @@ public class UpdateService : IHostedService, IDisposable
 	public async Task StartAsync(CancellationToken cancellationToken)
 	{
 		IServiceScope serviceScope = serviceScopeFactory.CreateScope();
-		DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = serviceScope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
+		MainDatabaseContext mainDatabaseContext = serviceScope.ServiceProvider.GetRequiredService<MainDatabaseContext>();
 
 		logger.LogInformation("Starting update service...");
 
-        foreach (Device device in await deviceManagmentDatabaseContext.Devices.AsNoTracking().ToListAsync(cancellationToken))
+		foreach (Device device in await mainDatabaseContext.Devices.Include(d=>d.User).AsNoTracking().ToListAsync(cancellationToken))
 		{
 			_ = deviceStatusService.TrackDevice(device);
 		}
 
-        timer = new Timer(async (_) => await Update(), null, TimeSpan.Zero, TimeSpan.FromSeconds(15));
+		timer = new Timer((_) => Update(), null, TimeSpan.Zero, TimeSpan.FromSeconds(15));
 
 		logger.LogInformation("Update service started.");
 	}
 
-    private async Task Update()
+	private async void Update()
 	{
 		Result<List<Device>> getDeviceStatusResult = deviceStatusService.GetDevices();
 
@@ -45,10 +46,16 @@ public class UpdateService : IHostedService, IDisposable
 		{
 			logger.LogError("Updating devices failed!");
 		}
-
+		PrometheusQuery promQueryer = new PrometheusQuery("http://localhost:9090");
 		foreach (Device device in getDeviceStatusResult.Value)
 		{
-            //TODO: Some update magic
+			PrometheusDataWrapper? deviceData = (await promQueryer.Query($"power{{sensor=\"shellyplug-s-{device.MacAddress}/relay/0\"}}"))?.Data;
+
+			if (deviceData is not null)
+			{
+				device.PowerUsage = deviceData.VectorTypeToTimestampFloatTuple()?.ValueOrDefault.Item2 ?? 0;
+                deviceStatusService.UpdateDeviceStatus(device);
+            }
         }
 	}
 

src/Elektrifikatsiya/Elektrifikatsiya/Utilities/MdnsDiscovery.cs

@@ -1,4 +1,8 @@
-using System.Net;
+using Elektrifikatsiya.Models;
+
+using Microsoft.Extensions.Caching.Memory;
+
+using System.Net;
 
 using Tmds.MDns;
 
@@ -9,17 +13,56 @@ public static class MdnsDiscovery
     public static event Action<IPAddress> OnDeviceFound = null!;
 
     private static readonly ServiceBrowser serviceBrowser = new ServiceBrowser();
+    private static readonly HttpClient client = new();
+    private static readonly MemoryCache memoryCache = new MemoryCache(new MemoryCacheOptions());
 
     static MdnsDiscovery()
     {
         serviceBrowser.StartBrowse("_http._tcp");
-        serviceBrowser.ServiceAdded += (_, eventArgs) => OnDeviceFound?.Invoke(eventArgs.Announcement.Addresses.First());
+        serviceBrowser.ServiceAdded += async (_, eventArgs) => await AddDevice(eventArgs.Announcement);
-        serviceBrowser.ServiceChanged += (_, eventArgs) => OnDeviceFound?.Invoke(eventArgs.Announcement.Addresses.First());
+        serviceBrowser.ServiceChanged += async (_, eventArgs) => await AddDevice(eventArgs.Announcement);
-        serviceBrowser.ServiceRemoved += (_, eventArgs) => OnDeviceFound?.Invoke(eventArgs.Announcement.Addresses.First());
+        serviceBrowser.ServiceRemoved += async (_, eventArgs) => await AddDevice(eventArgs.Announcement);
     }
 
-    public static IEnumerable<IPAddress> GetChachedDevices()
+    public static void FetchChachedDevices()
     {
-        return serviceBrowser.Services.Select(s => s.Addresses.First());
+        serviceBrowser.Services.ToList().ForEach(async d => await AddDevice(d));
+    }
+
+    private static async Task AddDevice(ServiceAnnouncement announcement)
+    {
+	    IPAddress ipAddress = announcement.Addresses.First();
+
+        if (!memoryCache.TryGetValue(ipAddress.ToString(), out bool isShellyDevice))
+        {
+            isShellyDevice = await IsShellyDevice(ipAddress);
+            _ = memoryCache.Set(ipAddress.ToString(), isShellyDevice, TimeSpan.FromHours(1));
+        }
+
+        if (isShellyDevice)
+        {
+            OnDeviceFound?.Invoke(ipAddress);
+        }
+    }
+
+    private static async Task<bool> IsShellyDevice(IPAddress ipAddress)
+    {
+        ShellyResponse? shellyResponse;
+
+        try
+        {
+            shellyResponse = await client.GetFromJsonAsync<ShellyResponse>($"http://{ipAddress}/shelly");
+        }
+        catch (HttpRequestException)
+        {
+            return false;
+        }
+
+        if (shellyResponse is null || shellyResponse.Type != "SHPLG-S")
+        {
+            return false;
+        }
+
+        return true;
     }
 }

src/Elektrifikatsiya/Elektrifikatsiya/Utilities/PrometheusQuery.cs

@@ -2,6 +2,7 @@
 using System.Net.Sockets;
 using System.Text.Encodings.Web;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using Elektrifikatsiya.Models;
 using FluentResults;
 
@@ -20,6 +21,14 @@ public class PrometheusQuery
 
     public  Task<PrometheusQueryResult?> Query(string query)
     {
-        return client.GetFromJsonAsync<PrometheusQueryResult>($"/v1/query?{UrlEncoder.Create().Encode(query)}");
+	    var res = client.GetStringAsync($"/api/v1/query?query={UrlEncoder.Create().Encode(query)}").Result;
+        return client.GetFromJsonAsync<PrometheusQueryResult>($"/api/v1/query?query={UrlEncoder.Create().Encode(query)}", new JsonSerializerOptions() 
+        {
+            PropertyNameCaseInsensitive = true,
+            Converters =
+            {
+                new JsonStringEnumConverter()
+            }
+        });
     }
 }

src/Elektrifikatsiya/docker-compose.dcproj

@@ -9,9 +9,6 @@
     <DockerServiceName>elektrifikatsiya</DockerServiceName>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="docker-compose.override.yml">
-      <DependentUpon>docker-compose.yml</DependentUpon>
-    </None>
     <None Include="docker-compose.yml" />
     <None Include=".dockerignore" />
   </ItemGroup>

src/Elektrifikatsiya/docker-compose.override.yml

@@ -1,13 +0,0 @@
-version: '3.4'
-
-services:
-  elektrifikatsiya:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=https://+:443;http://+:80
-    ports:
-      - "80"
-      - "443"
-    volumes:
-      - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro
-      - ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:ro

src/Elektrifikatsiya/docker-compose.yml

@@ -1,10 +1,15 @@
 version: '3.4'
 
 services:
-  elektrifikatsiya:
+  #elektrifikatsiya:
-    build:
+  #  build:
-      context: .
+  #    context: .
-      dockerfile: Elektrifikatsiya/Dockerfile
+  #    dockerfile: Elektrifikatsiya/Dockerfile
+  #  ports: 
+  #   - target: 5353
+  #     published: 5353
+  #     protocol: udp
+  #     mode: host
   prometheus:
     image: prom/prometheus:latest
     volumes: