Synchronize concentrators between Azure and DB (#1313)

* WIP * Fix typo in SyncConcentratorJobs * Add SynConcentratorsJobTests * Add migration * Add clientThumbprint property in SyncConcentratorJobTests * RetrieveClientThumbprintValue() moved to DeviceHelper
CGI-FR · Oct 7, 2022 · fecd9f5 · fecd9f5
1 parent 14c889a
commit fecd9f5
Show file tree

Hide file tree

Showing 34 changed files with 1,165 additions and 218 deletions.
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Migrations/20221005134349_Add Concentrator.Designer.cs b/src/AzureIoTHub.Portal.Infrastructure/Migrations/20221005134349_Add Concentrator.Designer.cs
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Migrations/20221005134349_Add Concentrator.cs b/src/AzureIoTHub.Portal.Infrastructure/Migrations/20221005134349_Add Concentrator.cs
@@ -0,0 +1,39 @@
+// Copyright (c) CGI France. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#nullable disable
+
+namespace AzureIoTHub.Portal.Infrastructure.Migrations
+{
+    using Microsoft.EntityFrameworkCore.Migrations;
+
+    public partial class AddConcentrator : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            _ = migrationBuilder.CreateTable(
+                name: "Concentrators",
+                columns: table => new
+                {
+                    Id = table.Column<string>(type: "text", nullable: false),
+                    Name = table.Column<string>(type: "text", nullable: false),
+                    LoraRegion = table.Column<string>(type: "text", nullable: false),
+                    DeviceType = table.Column<string>(type: "text", nullable: false),
+                    ClientThumbprint = table.Column<string>(type: "text", nullable: false),
+                    IsConnected = table.Column<bool>(type: "boolean", nullable: false),
+                    IsEnabled = table.Column<bool>(type: "boolean", nullable: false),
+                    Version = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    _ = table.PrimaryKey("PK_Concentrators", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            _ = migrationBuilder.DropTable(
+                name: "Concentrators");
+        }
+    }
+}
diff --git a/src/AzureIoTHub.Portal.Infrastructure/Migrations/PortalDbContextModelSnapshot.cs b/src/AzureIoTHub.Portal.Infrastructure/Migrations/PortalDbContextModelSnapshot.cs
@@ -22,6 +22,41 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
+            modelBuilder.Entity("AzureIoTHub.Portal.Domain.Entities.Concentrator", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClientThumbprint")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DeviceType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsConnected")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("LoraRegion")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Concentrators");
+                });
+
             modelBuilder.Entity("AzureIoTHub.Portal.Domain.Entities.Device", b =>
                 {
                     b.Property<string>("Id")

diff --git a/src/AzureIoTHub.Portal.Infrastructure/PortalDbContext.cs b/src/AzureIoTHub.Portal.Infrastructure/PortalDbContext.cs
@@ -3,13 +3,9 @@
 
 namespace AzureIoTHub.Portal.Infrastructure
 {
-    using AzureIoTHub.Portal.Domain;
     using AzureIoTHub.Portal.Domain.Entities;
-    using AzureIoTHub.Portal.Infrastructure.Seeds;
     using Microsoft.EntityFrameworkCore;
-    using Microsoft.EntityFrameworkCore.Infrastructure;
-    using Microsoft.Extensions.Logging;
-    using Newtonsoft.Json;
+
 
     public class PortalDbContext : DbContext
     {
@@ -22,6 +18,7 @@ public class PortalDbContext : DbContext
         public DbSet<DeviceTagValue> DeviceTagValues { get; set; }
         public DbSet<EdgeDeviceModel> EdgeDeviceModels { get; set; }
         public DbSet<EdgeDeviceModelCommand> EdgeDeviceModelCommands { get; set; }
+        public DbSet<Concentrator> Concentrators { get; set; }
 
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public PortalDbContext(DbContextOptions<PortalDbContext> options)

diff --git a/src/AzureIoTHub.Portal.Infrastructure/Repositories/ConcentratorRepository.cs b/src/AzureIoTHub.Portal.Infrastructure/Repositories/ConcentratorRepository.cs
@@ -0,0 +1,15 @@
+// Copyright (c) CGI France. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace AzureIoTHub.Portal.Infrastructure.Repositories
+{
+    using AzureIoTHub.Portal.Domain.Repositories;
+    using Domain.Entities;
+
+    public class ConcentratorRepository : GenericRepository<Concentrator>, IConcentratorRepository
+    {
+        public ConcentratorRepository(PortalDbContext context) : base(context)
+        {
+        }
+    }
+}
diff --git a/...IoTHub.Portal.Tests.Unit/Client/Pages/LoRaWan/Concentrator/ConcentratorDetailPageTests.cs b/...IoTHub.Portal.Tests.Unit/Client/Pages/LoRaWan/Concentrator/ConcentratorDetailPageTests.cs
@@ -54,7 +54,7 @@ public void ReturnButtonMustNavigateToPreviousPage()
         {
             // Arrange
             _ = this.mockLoRaWanConcentratorsClientService.Setup(service => service.GetConcentrator(this.mockDeviceId))
-                .ReturnsAsync(new Concentrator());
+                .ReturnsAsync(new ConcentratorDto());
 
             _ = this.mockLoRaWanConcentratorsClientService.Setup(service => service.GetFrequencyPlans())
                 .ReturnsAsync(new[]
@@ -98,7 +98,7 @@ public void ConcentratorDetailPageShouldProcessProblemDetailsExceptionWhenIssueO
         public void ClickOnSaveShouldPutConcentratorDetails()
         {
             // Arrange
-            var mockConcentrator = new Concentrator()
+            var mockConcentrator = new ConcentratorDto()
             {
                 DeviceId = "1234567890123456",
                 DeviceName = Guid.NewGuid().ToString(),
@@ -133,7 +133,7 @@ public void ClickOnSaveShouldPutConcentratorDetails()
         public void ConcentratorShouldNotBeUpdatedWhenModelIsNotValid()
         {
             // Arrange
-            var mockConcentrator = new Concentrator()
+            var mockConcentrator = new ConcentratorDto()
             {
                 DeviceId = string.Empty,
                 DeviceName = Guid.NewGuid().ToString(),
@@ -163,7 +163,7 @@ public void ConcentratorShouldNotBeUpdatedWhenModelIsNotValid()
         public void ClickOnSaveShouldProcessProblemDetailsExceptionWhenIssueOccursOnUpdatingConcentratorDetails()
         {
             // Arrange
-            var mockConcentrator = new Concentrator()
+            var mockConcentrator = new ConcentratorDto()
             {
                 DeviceId = "1234567890123456",
                 DeviceName = Guid.NewGuid().ToString(),

diff --git a/...reIoTHub.Portal.Tests.Unit/Client/Pages/LoRaWan/Concentrator/ConcentratorListPageTests.cs b/...reIoTHub.Portal.Tests.Unit/Client/Pages/LoRaWan/Concentrator/ConcentratorListPageTests.cs
@@ -50,9 +50,9 @@ public void ConcentratorListPageShouldLoadAndShowConcentrators()
 
             _ = this.mockLoRaWanConcentratorsClientService.Setup(service =>
                     service.GetConcentrators(It.Is<string>(s => expectedUri.Equals(s, StringComparison.Ordinal))))
-                .ReturnsAsync(new PaginationResult<Concentrator>
+                .ReturnsAsync(new PaginationResult<ConcentratorDto>
                 {
-                    Items = new List<Concentrator>
+                    Items = new List<ConcentratorDto>
                     {
                         new(),
                         new(),
@@ -100,9 +100,9 @@ public void ClickToItemShouldRedirectToConcentratorDetailsPage()
 
             _ = this.mockLoRaWanConcentratorsClientService.Setup(service =>
                     service.GetConcentrators(It.Is<string>(s => expectedUri.Equals(s, StringComparison.Ordinal))))
-                .ReturnsAsync(new PaginationResult<Concentrator>
+                .ReturnsAsync(new PaginationResult<ConcentratorDto>
                 {
-                    Items = new List<Concentrator>
+                    Items = new List<ConcentratorDto>
                     {
                         new()
                         {
@@ -130,9 +130,9 @@ public void ClickOnAddNewDeviceShouldNavigateToNewDevicePage()
 
             _ = this.mockLoRaWanConcentratorsClientService.Setup(service =>
                     service.GetConcentrators(It.Is<string>(s => expectedUri.Equals(s, StringComparison.Ordinal))))
-                .ReturnsAsync(new PaginationResult<Concentrator>
+                .ReturnsAsync(new PaginationResult<ConcentratorDto>
                 {
-                    Items = new List<Concentrator>
+                    Items = new List<ConcentratorDto>
                     {
                         new(),
                         new(),
@@ -159,9 +159,9 @@ public void ClickOnRefreshShouldReloadConcentrators()
 
             _ = this.mockLoRaWanConcentratorsClientService.Setup(service =>
                     service.GetConcentrators(It.Is<string>(s => expectedUri.Equals(s, StringComparison.Ordinal))))
-                .ReturnsAsync(new PaginationResult<Concentrator>
+                .ReturnsAsync(new PaginationResult<ConcentratorDto>
                 {
-                    Items = Array.Empty<Concentrator>()
+                    Items = Array.Empty<ConcentratorDto>()
                 });
 
             var cut = RenderComponent<ConcentratorListPage>();

diff --git a/...eIoTHub.Portal.Tests.Unit/Client/Pages/LoRaWan/Concentrator/CreateConcentratorPageTest.cs b/...eIoTHub.Portal.Tests.Unit/Client/Pages/LoRaWan/Concentrator/CreateConcentratorPageTest.cs
@@ -54,7 +54,7 @@ public override void Setup()
         public void ClickOnSaveShouldPostConcentratorDetails()
         {
             // Arrange
-            var mockConcentrator = new Concentrator
+            var mockConcentrator = new ConcentratorDto
             {
                 DeviceId = "1234567890123456",
                 DeviceName = Guid.NewGuid().ToString(),
@@ -68,7 +68,7 @@ public void ClickOnSaveShouldPostConcentratorDetails()
                 });
 
             _ = this.mockLoRaWanConcentratorsClientService.Setup(service =>
-                    service.CreateConcentrator(It.Is<Concentrator>(concentrator =>
+                    service.CreateConcentrator(It.Is<ConcentratorDto>(concentrator =>
                         mockConcentrator.DeviceId.Equals(concentrator.DeviceId, StringComparison.Ordinal))))
                 .Returns(Task.CompletedTask);
 
@@ -78,8 +78,8 @@ public void ClickOnSaveShouldPostConcentratorDetails()
             cut.WaitForAssertion(() => cut.Find("#saveButton"));
 
 
-            cut.Find($"#{nameof(Concentrator.DeviceId)}").Change(mockConcentrator.DeviceId);
-            cut.Find($"#{nameof(Concentrator.DeviceName)}").Change(mockConcentrator.DeviceName);
+            cut.Find($"#{nameof(ConcentratorDto.DeviceId)}").Change(mockConcentrator.DeviceId);
+            cut.Find($"#{nameof(ConcentratorDto.DeviceName)}").Change(mockConcentrator.DeviceName);
             cut.Instance.ChangeRegion(mockConcentrator.LoraRegion);
 
             // Act
@@ -94,7 +94,7 @@ public void ClickOnSaveShouldPostConcentratorDetails()
         public void ClickOnSaveShouldProcessProblemDetailsExceptionWhenIssueOccursOnCreatingConcentratorDetails()
         {
             // Arrange
-            var mockConcentrator = new Concentrator
+            var mockConcentrator = new ConcentratorDto
             {
                 DeviceId = "1234567890123456",
                 DeviceName = Guid.NewGuid().ToString(),
@@ -108,16 +108,16 @@ public void ClickOnSaveShouldProcessProblemDetailsExceptionWhenIssueOccursOnCrea
                 });
 
             _ = this.mockLoRaWanConcentratorsClientService.Setup(service =>
-                    service.CreateConcentrator(It.Is<Concentrator>(concentrator =>
+                    service.CreateConcentrator(It.Is<ConcentratorDto>(concentrator =>
                         mockConcentrator.DeviceId.Equals(concentrator.DeviceId, StringComparison.Ordinal))))
                 .ThrowsAsync(new ProblemDetailsException(new ProblemDetailsWithExceptionDetails()));
 
             var cut = RenderComponent<CreateConcentratorPage>();
             cut.WaitForAssertion(() => cut.Find("#saveButton"));
 
 
-            cut.Find($"#{nameof(Concentrator.DeviceId)}").Change(mockConcentrator.DeviceId);
-            cut.Find($"#{nameof(Concentrator.DeviceName)}").Change(mockConcentrator.DeviceName);
+            cut.Find($"#{nameof(ConcentratorDto.DeviceId)}").Change(mockConcentrator.DeviceId);
+            cut.Find($"#{nameof(ConcentratorDto.DeviceName)}").Change(mockConcentrator.DeviceName);
             cut.Instance.ChangeRegion(mockConcentrator.LoraRegion);
 
             // Act

diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Services/LoRaWanConcentratorsClientServiceTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Services/LoRaWanConcentratorsClientServiceTests.cs
@@ -36,9 +36,9 @@ public override void Setup()
         public async Task GetConcentratorsShouldReturnConcentrators()
         {
             // Arrange
-            var expectedConcentrators = new PaginationResult<Concentrator>
+            var expectedConcentrators = new PaginationResult<ConcentratorDto>
             {
-                Items = new List<Concentrator>()
+                Items = new List<ConcentratorDto>()
                 {
                     new ()
                 }
@@ -64,7 +64,7 @@ public async Task GetConcentratorShouldReturnConcentrator()
             // Arrange
             var deviceId = Fixture.Create<string>();
 
-            var expectedConcentrator = new Concentrator();
+            var expectedConcentrator = new ConcentratorDto();
 
             _ = MockHttpClient.When(HttpMethod.Get, $"/api/lorawan/concentrators/{deviceId}")
                 .RespondJson(expectedConcentrator);
@@ -82,13 +82,13 @@ public async Task GetConcentratorShouldReturnConcentrator()
         public async Task CreateConcentratorShouldCreateConcentrator()
         {
             // Arrange
-            var concentrator = new Concentrator();
+            var concentrator = new ConcentratorDto();
 
             _ = MockHttpClient.When(HttpMethod.Post, "/api/lorawan/concentrators")
                 .With(m =>
                 {
-                    _ = m.Content.Should().BeAssignableTo<ObjectContent<Concentrator>>();
-                    var body = m.Content as ObjectContent<Concentrator>;
+                    _ = m.Content.Should().BeAssignableTo<ObjectContent<ConcentratorDto>>();
+                    var body = m.Content as ObjectContent<ConcentratorDto>;
                     _ = body.Value.Should().BeEquivalentTo(concentrator);
                     return true;
                 })
@@ -106,13 +106,13 @@ public async Task CreateConcentratorShouldCreateConcentrator()
         public async Task UpdateConcentratorShouldUpdateConcentrator()
         {
             // Arrange
-            var concentrator = new Concentrator();
+            var concentrator = new ConcentratorDto();
 
             _ = MockHttpClient.When(HttpMethod.Put, "/api/lorawan/concentrators")
                 .With(m =>
                 {
-                    _ = m.Content.Should().BeAssignableTo<ObjectContent<Concentrator>>();
-                    var body = m.Content as ObjectContent<Concentrator>;
+                    _ = m.Content.Should().BeAssignableTo<ObjectContent<ConcentratorDto>>();
+                    var body = m.Content as ObjectContent<ConcentratorDto>;
                     _ = body.Value.Should().BeEquivalentTo(concentrator);
                     return true;
                 })

diff --git a/src/AzureIoTHub.Portal.Tests.Unit/Client/Validators/ConcentratorValidatorTests.cs b/src/AzureIoTHub.Portal.Tests.Unit/Client/Validators/ConcentratorValidatorTests.cs
@@ -15,7 +15,7 @@ public void ValidateValidConcentrator()
         {
             // Arrange
             var concentratorValidator = new ConcentratorValidator();
-            var concentrator = new Concentrator()
+            var concentrator = new ConcentratorDto()
             {
                 DeviceId = "0123456789abcdef",
                 DeviceName = Guid.NewGuid().ToString(),
@@ -39,7 +39,7 @@ public void ValidateMissingFieldShouldReturnError(
         {
             // Arrange
             var concentratorValidator = new ConcentratorValidator();
-            var concentrator = new Concentrator()
+            var concentrator = new ConcentratorDto()
             {
                 DeviceId = "0123456789abcdef",
                 DeviceName =DeviceNameValue,
@@ -60,7 +60,7 @@ public void ValidateMissingDeviceIdShouldReturnError()
         {
             // Arrange
             var concentratorValidator = new ConcentratorValidator();
-            var concentrator = new Concentrator()
+            var concentrator = new ConcentratorDto()
             {
                 DeviceId = "",
                 DeviceName = Guid.NewGuid().ToString(),
@@ -83,7 +83,7 @@ public void ValidateBadFormatDeviceIdShouldReturnError()
         {
             // Arrange
             var concentratorValidator = new ConcentratorValidator();
-            var concentrator = new Concentrator()
+            var concentrator = new ConcentratorDto()
             {
                 DeviceId = Guid.NewGuid().ToString(),
                 DeviceName = Guid.NewGuid().ToString(),
@@ -104,7 +104,7 @@ public void ValidateBadFormatClientThumbprintShouldReturnError()
         {
             // Arrange
             var concentratorValidator = new ConcentratorValidator();
-            var concentrator = new Concentrator()
+            var concentrator = new ConcentratorDto()
             {
                 DeviceId = "0123456789abcdef",
                 DeviceName = Guid.NewGuid().ToString(),
@@ -126,7 +126,7 @@ public void ValidateAllFieldsEmptyShouldReturnError()
         {
             // Arrange
             var concentratorValidator = new ConcentratorValidator();
-            var concentrator = new Concentrator();
+            var concentrator = new ConcentratorDto();
 
             // Act
             var concentratorValidation = concentratorValidator.Validate(concentrator);