Set device tags on device create/details screens

src/AzureIoTHub.Portal.Server.Tests.Unit/Controllers/v1.0/DeviceModelCommandsControllerTests.cs

@@ -150,6 +150,52 @@ public void When_Model_NotExists_Get_Should_Return_404()
             this.mockRepository.VerifyAll();
         }
 
+        [Test]
+        public void Get_Should_Return_Device_Model_Commands()
+        {
+            // Arrange
+            var deviceModel = SetupMockDeviceModel();
+            var deviceModelId = deviceModel.RowKey;
+            var deviceModelCommandsController = this.CreateDeviceModelCommandsController();
+            var mockResponse = this.mockRepository.Create<Response>();
+
+            this.mockCommandsTableClient.Setup(c => c.Query<TableEntity>(
+                It.Is<string>(x => x == $"PartitionKey eq '{ deviceModelId }'"),
+                It.IsAny<int?>(),
+                It.IsAny<IEnumerable<string>>(),
+                It.IsAny<CancellationToken>()))
+                .Returns(Pageable<TableEntity>.FromPages(new[]
+                {
+                    Page<TableEntity>.FromValues(new[]
+                    {
+                        new TableEntity(deviceModelId, Guid.NewGuid().ToString())
+                    }, null, mockResponse.Object)
+                }));
+
+            this.mockTableClientFactory.Setup(c => c.GetDeviceCommands())
+                .Returns(mockCommandsTableClient.Object);
+
+            this.mockDeviceModelCommandMapper.Setup(c => c.GetDeviceModelCommand(
+                It.Is<TableEntity>(x => x.PartitionKey == deviceModelId)))
+                .Returns(new DeviceModelCommand {  });
+
+            // Act
+            var response = deviceModelCommandsController.Get(deviceModelId);
+
+            // Assert
+            Assert.IsNotNull(response);
+            Assert.IsAssignableFrom<OkObjectResult>(response.Result);
+
+            var okResult = (OkObjectResult)response.Result;
+
+            Assert.IsNotNull(okResult);
+            Assert.IsAssignableFrom<DeviceModelCommand[]>(okResult.Value);
+
+            var result = (DeviceModelCommand[])okResult.Value;
+            Assert.IsNotNull(result);
+            Assert.AreEqual(1, result.Length);
+        }
+
         private TableEntity SetupMockDeviceModel()
         {
             var mockResponse = this.mockRepository.Create<Response<TableEntity>>();

src/AzureIoTHub.Portal.Server.Tests.Unit/Controllers/v1.0/DeviceTagSettingsControllerTest.cs

@@ -1,9 +1,10 @@
 using Azure;
 using Azure.Data.Tables;
-using AzureIoTHub.Portal.Server.Controllers.v10;
+using AzureIoTHub.Portal.Server.Controllers.V10;
 using AzureIoTHub.Portal.Server.Factories;
 using AzureIoTHub.Portal.Server.Mappers;
-using AzureIoTHub.Portal.Shared.Models.v10.Device;
+using AzureIoTHub.Portal.Server.Services;
+using AzureIoTHub.Portal.Shared.Models.V10.Device;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -23,29 +24,32 @@ public class DeviceTagSettingsControllerTest
     {
         private MockRepository mockRepository;
 
-        private Mock<IDeviceTagMapper> mockDeviceTagMapper;
-        private Mock<ITableClientFactory> mockTableClientFactory;
-        private Mock<TableClient> mockDeviceTagTableClient;
+        //private Mock<IDeviceTagMapper> mockDeviceTagMapper;
+        //private Mock<ITableClientFactory> mockTableClientFactory;
+        //private Mock<TableClient> mockDeviceTagTableClient;
+        private Mock<IDeviceTagService> mockDeviceTagService;
         private Mock<ILogger<DeviceTagSettingsController>> mockLogger;
 
         [SetUp]
         public void SetUp()
         {
             this.mockRepository = new MockRepository(MockBehavior.Strict);
 
-            this.mockDeviceTagMapper = this.mockRepository.Create<IDeviceTagMapper>();
-            this.mockTableClientFactory = this.mockRepository.Create<ITableClientFactory>();
-            this.mockDeviceTagTableClient = this.mockRepository.Create<TableClient>();
+            //this.mockDeviceTagMapper = this.mockRepository.Create<IDeviceTagMapper>();
+            //this.mockTableClientFactory = this.mockRepository.Create<ITableClientFactory>();
+            //this.mockDeviceTagTableClient = this.mockRepository.Create<TableClient>();
+            this.mockDeviceTagService = this.mockRepository.Create<IDeviceTagService>();
             this.mockLogger = this.mockRepository.Create<ILogger<DeviceTagSettingsController>>();
         }
 
         private DeviceTagSettingsController CreateDeviceTagSettingsController()
         {
             return new DeviceTagSettingsController(
                 this.mockLogger.Object,
-                this.mockDeviceTagMapper.Object,
-                this.mockTableClientFactory.Object
-                );
+                //this.mockDeviceTagMapper.Object,
+                //this.mockTableClientFactory.Object,
+                this.mockDeviceTagService.Object
+           );
         }
 
         [Test]
@@ -62,54 +66,16 @@ public async Task Post_Should_Create_New_Entity()
                 Searchable = true
             };
 
-            var mockResponse = this.mockRepository.Create<Response>();
-
-            this.mockDeviceTagMapper.Setup(c => c.UpdateTableEntity(
-               It.Is<TableEntity>(x => x.RowKey == tag.Name && x.PartitionKey == DeviceTagSettingsController.DefaultPartitionKey),
-               It.Is<DeviceTag>(x => x == tag)));
-
-            this.mockDeviceTagTableClient.Setup(c => c.AddEntityAsync(
-                It.Is<TableEntity>(x => x.PartitionKey == DeviceTagSettingsController.DefaultPartitionKey && x.RowKey == tag.Name),
-                It.IsAny<CancellationToken>()))
-                .ReturnsAsync(mockResponse.Object);
-
-            this.mockDeviceTagTableClient.Setup(c => c.Query<TableEntity>(
-                It.Is<string>(x => true),
-                It.IsAny<int?>(),
-                It.IsAny<IEnumerable<string>>(),
-                It.IsAny<CancellationToken>()))
-                .Returns(Pageable<TableEntity>.FromPages(new[]                {
-                    Page<TableEntity>.FromValues(new[]
-                    {
-                        new TableEntity(DeviceTagSettingsController.DefaultPartitionKey,tag.Name)
-                    }, null, mockResponse.Object)
-                }));
-
-            this.mockDeviceTagTableClient.Setup(c => c.DeleteEntityAsync(
-                It.Is<string>(x => true),
-                It.IsAny<string>(),
-                It.IsAny<ETag>(),
-                It.IsAny<CancellationToken>()))
-                .ReturnsAsync(mockResponse.Object);
-
-            this.mockTableClientFactory.Setup(c => c.GetDeviceTagSettings())
-                .Returns(mockDeviceTagTableClient.Object);
+            this.mockDeviceTagService.Setup(c => c.UpdateTags(It.IsAny<List<DeviceTag>>()))
+                .Returns(Task.CompletedTask);
 
             // Act
             var result = await deviceTagSettingsController.Post(new List<DeviceTag>(new[] { tag }));
 
             // Assert
             Assert.IsNotNull(result);
             Assert.IsAssignableFrom<OkResult>(result);
-
-            this.mockTableClientFactory.Verify(c => c.GetDeviceTagSettings());
-
-            this.mockDeviceTagMapper.VerifyAll();
-
-            this.mockDeviceTagTableClient.Verify(c => c.AddEntityAsync(
-                It.Is<TableEntity>(x => x.RowKey == tag.Name && x.PartitionKey == DeviceTagSettingsController.DefaultPartitionKey),
-                It.IsAny<CancellationToken>()), Times.Once());
-
+            this.mockDeviceTagService.VerifyAll();
             this.mockRepository.VerifyAll();
         }
 
@@ -118,30 +84,8 @@ public void Get_Should_Return_A_List()
         {
             // Arrange
             var deviceTagSettingsController = this.CreateDeviceTagSettingsController();
-            var returnedIndex = 10;
-
-            var mockTable = this.mockRepository.Create<TableClient>();
-            var mockTableResponse = this.mockRepository.Create<Pageable<TableEntity>>();
-            var mockEnumerator = this.mockRepository.Create<IEnumerator<TableEntity>>();
-            mockEnumerator.Setup(x => x.Dispose()).Callback(() => { });
-            mockEnumerator.Setup(x => x.MoveNext()).Returns(() =>
-            {
-                return returnedIndex-- > 0;
-            });
-
-            mockEnumerator.Setup(x => x.Current)
-                .Returns(new TableEntity(DeviceTagSettingsController.DefaultPartitionKey, "test"));
-
-            mockTableResponse.Setup(x => x.GetEnumerator()).Returns(mockEnumerator.Object);
-
-            mockDeviceTagTableClient.Setup(c => c.Query<TableEntity>(It.IsAny<string>(), It.IsAny<int?>(), It.IsAny<IEnumerable<string>>(), It.IsAny<CancellationToken>()))
-                .Returns(mockTableResponse.Object);
-
-            mockTableClientFactory.Setup(c => c.GetDeviceTagSettings())
-                .Returns(mockDeviceTagTableClient.Object);
 
-            mockDeviceTagMapper.Setup(c => c.GetDeviceTag(It.IsAny<TableEntity>()))
-                .Returns((TableEntity entity) => new DeviceTag());
+            mockDeviceTagService.Setup(x => x.GetAllTags()).Returns(new DeviceTag[10].ToList());
 
             // Act
             var response = deviceTagSettingsController.Get();
@@ -157,6 +101,7 @@ public void Get_Should_Return_A_List()
             var result = okResponse.Value as IEnumerable<DeviceTag>;
             Assert.AreEqual(10, result.Count());
 
+            this.mockDeviceTagService.VerifyAll();
             this.mockRepository.VerifyAll();
         }
     }

src/AzureIoTHub.Portal.Server.Tests.Unit/Controllers/v1.0/DevicesControllerTests.cs

@@ -30,6 +30,7 @@ public class DevicesControllerTests
         private Mock<IDeviceProvisioningServiceManager> mockProvisioningServiceManager;
         private Mock<ILogger<DevicesController>> mockLogger;
         private Mock<IDeviceService> mockDeviceService;
+        private Mock<IDeviceTagService> mockDeviceTagService;
         private Mock<IDeviceTwinMapper<DeviceListItem, DeviceDetails>> mockDeviceTwinMapper;
         private Mock<ITableClientFactory> mockTableClientFactory;
 
@@ -41,6 +42,7 @@ public void SetUp()
             this.mockProvisioningServiceManager = this.mockRepository.Create<IDeviceProvisioningServiceManager>();
             this.mockLogger = this.mockRepository.Create<ILogger<DevicesController>>();
             this.mockDeviceService = this.mockRepository.Create<IDeviceService>();
+            this.mockDeviceTagService = this.mockRepository.Create<IDeviceTagService>();
             this.mockDeviceTwinMapper = this.mockRepository.Create<IDeviceTwinMapper<DeviceListItem, DeviceDetails>>();
             this.mockTableClientFactory = this.mockRepository.Create<ITableClientFactory>();
         }
@@ -50,6 +52,7 @@ private DevicesController CreateDevicesController()
             return new DevicesController(
                 this.mockLogger.Object,
                 this.mockDeviceService.Object,
+                this.mockDeviceTagService.Object,
                 this.mockProvisioningServiceManager.Object,
                 this.mockDeviceTwinMapper.Object,
                 this.mockTableClientFactory.Object);
@@ -98,12 +101,15 @@ public async Task GetItem_StateUnderTest_ExpectedBehavior()
             this.mockDeviceService.Setup(c => c.GetDeviceTwin(It.Is<string>(x => x == deviceID)))
                 .Returns<string>(x => Task.FromResult(new Twin(x)));
 
-            this.mockDeviceTwinMapper.Setup(c => c.CreateDeviceDetails(It.IsAny<Twin>()))
-                .Returns<Twin>(x => new DeviceDetails
+            this.mockDeviceTwinMapper.Setup(c => c.CreateDeviceDetails(It.IsAny<Twin>(), It.IsAny<IEnumerable<string>>()))
+                .Returns<Twin, IEnumerable<string>>((x, y) => new DeviceDetails
                 {
                     DeviceID = x.DeviceId
                 });
 
+            this.mockDeviceTagService.Setup(c => c.GetAllTagsNames())
+                .Returns(new List<string>());
+
             // Act
             var result = await devicesController.Get(deviceID);
 

src/AzureIoTHub.Portal.Server.Tests.Unit/Controllers/v1.0/EdgeDevicesControllerTests.cs

@@ -187,7 +187,7 @@ public async Task GetEnrollmentCredentials_Should_Return_Enrollment_Credentials(
             Assert.IsAssignableFrom<OkObjectResult>(response.Result);
 
             var okObjectResult = (OkObjectResult)response.Result;
-            Assert.IsNotNull(okObjectResult);  
+            Assert.IsNotNull(okObjectResult);
             Assert.AreEqual(mockRegistrationCredentials, okObjectResult.Value);
 
             this.mockRepository.VerifyAll();
@@ -344,12 +344,14 @@ public async Task DeleteDeviceAsync_StateUnderTest_ExpectedBehavior()
             this.mockDeviceService.Setup(c => c.DeleteDevice(It.Is<string>(x => x == deviceId)))
                 .Returns(Task.CompletedTask);
 
+            #nullable enable
             this.mockLogger.Setup(c => c.Log(
                 It.Is<LogLevel>(x => x == LogLevel.Information),
                 It.IsAny<EventId>(),
                 It.IsAny<It.IsAnyType>(),
                 It.IsAny<Exception>(),
                 It.IsAny<Func<It.IsAnyType, Exception?, string>>()));
+            #nullable disable
 
             // Act
             var result = await edgeDevicesController.DeleteDeviceAsync(deviceId);
@@ -374,12 +376,14 @@ public async Task ExecuteMethod_Should_Execute_C2D_Method(string methodName, str
 
             string deviceId = Guid.NewGuid().ToString();
 
+            #nullable enable
             this.mockLogger.Setup(c => c.Log(
                 It.Is<LogLevel>(x => x == LogLevel.Information),
                 It.IsAny<EventId>(),
                 It.IsAny<It.IsAnyType>(),
                 It.IsAny<Exception>(),
                 It.IsAny<Func<It.IsAnyType, Exception?, string>>()));
+            #nullable disable
 
             this.mockDeviceService.Setup(c => c.ExecuteC2DMethod(
                 It.Is<string>(x => x == deviceId),

src/AzureIoTHub.Portal.Server.Tests.Unit/Controllers/v1.0/LoRaWAN/LoRaWANDevicesControllerTests.cs

@@ -32,6 +32,7 @@ public class LoRaWANDevicesControllerTests
         private Mock<IDeviceProvisioningServiceManager> mockProvisioningServiceManager;
         private Mock<ILogger<LoRaWANDevicesController>> mockLogger;
         private Mock<IDeviceService> mockDeviceService;
+        private Mock<IDeviceTagService> mockDeviceTagService;
         private Mock<IDeviceTwinMapper<DeviceListItem, LoRaDeviceDetails>> mockDeviceTwinMapper;
         private Mock<ITableClientFactory> mockTableClientFactory;
         private Mock<ILoraDeviceMethodManager> mockLoraDeviceMethodManager;
@@ -46,10 +47,11 @@ public void SetUp()
             this.mockProvisioningServiceManager = this.mockRepository.Create<IDeviceProvisioningServiceManager>();
             this.mockLogger = this.mockRepository.Create<ILogger<LoRaWANDevicesController>>();
             this.mockDeviceService = this.mockRepository.Create<IDeviceService>();
+            this.mockDeviceTagService = this.mockRepository.Create<IDeviceTagService>();
             this.mockDeviceTwinMapper = this.mockRepository.Create<IDeviceTwinMapper<DeviceListItem, LoRaDeviceDetails>>();
             this.mockTableClientFactory = this.mockRepository.Create<ITableClientFactory>();
             this.mockLoraDeviceMethodManager = this.mockRepository.Create<ILoraDeviceMethodManager>();
-            this.mockDeviceModelCommandMapper = this.mockRepository.Create<IDeviceModelCommandMapper>(); 
+            this.mockDeviceModelCommandMapper = this.mockRepository.Create<IDeviceModelCommandMapper>();
             this.mockCommandsTableClient = this.mockRepository.Create<TableClient>();
 
         }
@@ -59,6 +61,7 @@ private LoRaWANDevicesController CreateLoRaWANDevicesController()
             return new LoRaWANDevicesController(
                 this.mockLogger.Object,
                 this.mockDeviceService.Object,
+                this.mockDeviceTagService.Object,
                 this.mockDeviceTwinMapper.Object,
                 this.mockTableClientFactory.Object,
                 this.mockLoraDeviceMethodManager.Object,
@@ -105,12 +108,14 @@ public async Task ExecuteCommand_StateUnderTest_ExpectedBehavior()
                 It.Is<DeviceModelCommand>(x => x.Name == commandId)))
                 .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK));
 
+            #nullable enable
             this.mockLogger.Setup(c => c.Log(
                 It.Is<LogLevel>(x => x == LogLevel.Information),
                 It.IsAny<EventId>(),
                 It.IsAny<It.IsAnyType>(),
                 It.IsAny<Exception>(),
-                It.IsAny<Func<It.IsAnyType, Exception?, string>>()));                
+                It.IsAny<Func<It.IsAnyType, Exception?, string>>()));
+            #nullable disable
 
             // Act
             var result = await loRaWANDevicesController.ExecuteCommand(deviceId, commandId);
@@ -161,12 +166,14 @@ public async Task ExecuteCommand_Failed_Should_Return_Http400()
                 It.Is<DeviceModelCommand>(x => x.Name == commandId)))
                 .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.InternalServerError));
 
+            #nullable enable
             this.mockLogger.Setup(c => c.Log(
                 It.Is<LogLevel>(x => x == LogLevel.Error),
                 It.IsAny<EventId>(),
                 It.IsAny<It.IsAnyType>(),
                 It.IsAny<Exception>(),
                 It.IsAny<Func<It.IsAnyType, Exception?, string>>()));
+            #nullable disable
 
             // Act
             var result = await loRaWANDevicesController.ExecuteCommand(deviceId, commandId);
@@ -221,15 +228,18 @@ public async Task GetItem_StateUnderTest_ExpectedBehavior()
             this.mockDeviceService.Setup(c => c.GetDeviceTwin(It.Is<string>(x => x == deviceID)))
                 .Returns<string>(x => Task.FromResult(new Twin(x)));
 
-            this.mockDeviceTwinMapper.Setup(c => c.CreateDeviceDetails(It.IsAny<Twin>()))
-                .Returns<Twin>(x => new LoRaDeviceDetails
+            this.mockDeviceTwinMapper.Setup(c => c.CreateDeviceDetails(It.IsAny<Twin>(), It.IsAny<IEnumerable<string>>()))
+                .Returns<Twin, IEnumerable<string>>((x, y) => new LoRaDeviceDetails
                 {
                     DeviceID = x.DeviceId,
                     AppEUI = Guid.NewGuid().ToString(),
                     AppKey = Guid.NewGuid().ToString(),
                     SensorDecoder = Guid.NewGuid().ToString(),
                 });
 
+            this.mockDeviceTagService.Setup(c => c.GetAllTagsNames())
+                .Returns(new List<string>());
+
             // Act
             var result = await devicesController.Get(deviceID);
 

src/AzureIoTHub.Portal.Server.Tests.Unit/Mappers/DeviceTagMapperTests.cs

@@ -1,6 +1,6 @@
 using Azure.Data.Tables;
 using AzureIoTHub.Portal.Server.Mappers;
-using AzureIoTHub.Portal.Shared.Models.v10.Device;
+using AzureIoTHub.Portal.Shared.Models.V10.Device;
 using Moq;
 using NUnit.Framework;
 using System;