DeviceTagService Test

src/AzureIoTHub.Portal.Server.Tests.Unit/Services/DeviceTagServiceTest.cs

@@ -194,5 +194,60 @@ public void GetAllTagsNamesShouldReturnAList()
 
             this.mockRepository.VerifyAll();
         }
+
+        [Test]
+        public void GetAllSearchableTagsNamesShouldReturnAList()
+        {
+            // Arrange
+            var deviceTagService = this.CreateDeviceTagService();
+            var boolList = new List<bool>() { true, false, true };
+            var returnedIndex = boolList.Count;
+
+            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(() =>
+                {
+                    var result = new TableEntity(DeviceTagService.DefaultPartitionKey, "test")
+                    {
+                        [nameof(DeviceTag.Searchable)] = boolList[returnedIndex],
+                    };
+
+                    return result;
+                });
+
+            _ = 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
+                {
+                    Name = Guid.NewGuid().ToString(),
+                    Label = "test",
+                    Required = true,
+                    Searchable = bool.Parse(entity[nameof(DeviceTag.Searchable)].ToString())
+                });
+
+            // Act
+            var result = deviceTagService.GetAllSearchableTagsNames();
+
+            // Assert
+            Assert.IsNotNull(result);
+            Assert.AreEqual(2, result.Count());
+            Assert.IsAssignableFrom<string>(result.First());
+
+            this.mockRepository.VerifyAll();
+        }
     }
 }

src/AzureIoTHub.Portal/Server/Services/ConfigService.cs

@@ -1,4 +1,4 @@
-// Copyright (c) CGI France. All rights reserved.
+// 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.Server.Services
@@ -62,7 +62,7 @@ public async Task RolloutDeviceConfiguration(string modelId, string modelName, D
             newConfiguration.TargetCondition = $"tags.modelId = '{modelId}'";
             newConfiguration.Content.DeviceContent = desiredProperties;
 
-            await this.registryManager.AddConfigurationAsync(newConfiguration);
+            _ = await this.registryManager.AddConfigurationAsync(newConfiguration);
         }
     }
 }

src/AzureIoTHub.Portal/Server/Services/DeviceService.cs

@@ -1,4 +1,4 @@
-// Copyright (c) CGI France. All rights reserved.
+// 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.Server.Services
@@ -28,7 +28,7 @@ public DeviceService(
         /// <returns>IEnumerable twin.</returns>
         public async Task<IEnumerable<Twin>> GetAllEdgeDevice()
         {
-            IQuery queryEdgeDevice = this.registryManager.CreateQuery("SELECT * FROM devices.modules WHERE devices.modules.moduleId = '$edgeHub' GROUP BY deviceId", 10);
+            var queryEdgeDevice = this.registryManager.CreateQuery("SELECT * FROM devices.modules WHERE devices.modules.moduleId = '$edgeHub' GROUP BY deviceId", 10);
 
             while (queryEdgeDevice.HasMoreResults)
             {
@@ -97,11 +97,11 @@ public async Task<Twin> GetDeviceTwin(string deviceId)
         /// <returns>Twin of the device.</returns>
         public async Task<Twin> GetDeviceTwinWithModule(string deviceId)
         {
-            IQuery devicesWithModules = this.registryManager.CreateQuery($"SELECT * FROM devices.modules WHERE devices.modules.moduleId = '$edgeAgent' AND deviceId in ['{deviceId}']");
+            var devicesWithModules = this.registryManager.CreateQuery($"SELECT * FROM devices.modules WHERE devices.modules.moduleId = '$edgeAgent' AND deviceId in ['{deviceId}']");
 
             while (devicesWithModules.HasMoreResults)
             {
-                IEnumerable<Twin> devicesTwins = await devicesWithModules.GetNextAsTwinAsync();
+                var devicesTwins = await devicesWithModules.GetNextAsTwinAsync();
 
                 return devicesTwins.ElementAt(0);
             }

src/AzureIoTHub.Portal/Server/Services/DeviceTagService.cs

@@ -1,13 +1,16 @@
-using Azure.Data.Tables;
-using AzureIoTHub.Portal.Server.Factories;
-using AzureIoTHub.Portal.Server.Mappers;
-using AzureIoTHub.Portal.Shared.Models.V10.Device;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+// 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.Server.Services
 {
+    using Azure.Data.Tables;
+    using AzureIoTHub.Portal.Server.Factories;
+    using AzureIoTHub.Portal.Server.Mappers;
+    using AzureIoTHub.Portal.Shared.Models.V10.Device;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+
     public class DeviceTagService : IDeviceTagService
     {
         /// <summary>
@@ -70,14 +73,14 @@ public async Task UpdateTags(List<DeviceTag> tags)
 
             foreach (var item in query)
             {
-                    await this.tableClientFactory
-                        .GetDeviceTagSettings()
-                        .DeleteEntityAsync(item.PartitionKey, item.RowKey);
+                _ = await this.tableClientFactory
+                    .GetDeviceTagSettings()
+                    .DeleteEntityAsync(item.PartitionKey, item.RowKey);
             }
 
-            foreach (DeviceTag tag in tags)
+            foreach (var tag in tags)
             {
-                TableEntity entity = new TableEntity()
+                var entity = new TableEntity()
                 {
                     PartitionKey = DefaultPartitionKey,
                     RowKey = tag.Name
@@ -95,7 +98,7 @@ await this.tableClientFactory
         private async Task SaveEntity(TableEntity entity, DeviceTag tag)
         {
             this.deviceTagMapper.UpdateTableEntity(entity, tag);
-            await this.tableClientFactory
+            _ = await this.tableClientFactory
                 .GetDeviceTagSettings()
                 .AddEntityAsync(entity);
         }