288 Fix IoT Edge configuration page

src/AzureIoTHub.Portal.Server.Tests/Controllers/v1.0/EdgeConfigurationsControllerTests.cs

@@ -1,5 +1,4 @@
 using AzureIoTHub.Portal.Server.Controllers.V10;
-using AzureIoTHub.Portal.Server.Interfaces;
 using AzureIoTHub.Portal.Server.Services;
 using Microsoft.Azure.Devices;
 using Moq;
@@ -17,14 +16,14 @@ public class EdgeConfigurationsControllerTests
     {
         private MockRepository mockRepository;
 
-        private Mock<IConfigs> mockConfigsServices;
+        private Mock<IConfigService> mockConfigsServices;
 
         [SetUp]
         public void SetUp()
         {
             this.mockRepository = new MockRepository(MockBehavior.Strict);
 
-            this.mockConfigsServices = this.mockRepository.Create<IConfigs>();
+            this.mockConfigsServices = this.mockRepository.Create<IConfigService>();
         }
 
         private EdgeConfigurationsController CreateEdgeConfigurationsController()

src/AzureIoTHub.Portal.Server.Tests/Services/ConfigsServicesTests.cs

@@ -22,9 +22,9 @@ public void SetUp()
             this.mockRegistryManager = this.mockRepository.Create<RegistryManager>();
         }
 
-        private ConfigsServices CreateConfigsServices()
+        private ConfigService CreateConfigsServices()
         {
-            return new ConfigsServices(this.mockRegistryManager.Object);
+            return new ConfigService(this.mockRegistryManager.Object);
         }
 
         [Test]

src/AzureIoTHub.Portal/Server/Controllers/v1.0/EdgeConfigurationsController.cs

@@ -8,7 +8,7 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     using System.Linq;
     using System.Threading.Tasks;
     using AzureIoTHub.Portal.Server.Helpers;
-    using AzureIoTHub.Portal.Server.Interfaces;
+    using AzureIoTHub.Portal.Server.Services;
     using AzureIoTHub.Portal.Shared.Models.V10;
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;
@@ -21,9 +21,9 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     [ApiExplorerSettings(GroupName = "IoT Edge")]
     public class EdgeConfigurationsController : ControllerBase
     {
-        private readonly IConfigs configService;
+        private readonly IConfigService configService;
 
-        public EdgeConfigurationsController(IConfigs configService)
+        public EdgeConfigurationsController(IConfigService configService)
         {
             this.configService = configService;
         }

src/AzureIoTHub.Portal/Server/Helpers/ConfigHelper.cs

@@ -13,19 +13,19 @@ public static class ConfigHelper
     {
         /// <summary>
         /// Checks if the specific metric (targeted/applied/success/failure) exists within the device,
-        /// Returns the corresponding value if so, else returns -1 as an error code.
+        /// Returns the corresponding value if so, else returns 0.
         /// </summary>
         /// <param name="item">Configuration item to convert into a ConfigListItem.</param>
         /// <param name="metricName">Metric to retrieve (targetedCount, appliedCount, reportedSuccessfulCount or reportedFailedCount). </param>
-        /// <returns>Corresponding metric value, or -1 if it doesn't exist.</returns>
+        /// <returns>Corresponding metric value, or 0 if it doesn't exist.</returns>
         public static long RetrieveMetricValue(Configuration item, string metricName)
         {
             if (item.SystemMetrics.Results.TryGetValue(metricName, out long result))
             {
                 return result;
             }
 
-            return -1;
+            return 0;
         }
 
         /// <summary>

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

@@ -5,14 +5,13 @@ namespace AzureIoTHub.Portal.Server.Services
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;
-    using AzureIoTHub.Portal.Server.Interfaces;
     using Microsoft.Azure.Devices;
 
-    public class ConfigsServices : IConfigs
+    public class ConfigService : IConfigService
     {
         private readonly RegistryManager registryManager;
 
-        public ConfigsServices(
+        public ConfigService(
             RegistryManager registry)
         {
             this.registryManager = registry;

src/AzureIoTHub.Portal/Server/Interfaces/IConfigs.cs → src/AzureIoTHub.Portal/Server/Services/IConfigServices.cs

@@ -1,16 +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.Server.Interfaces
-{
-    using System.Collections.Generic;
-    using System.Threading.Tasks;
-    using Microsoft.Azure.Devices;
+using Microsoft.Azure.Devices;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
-    public interface IConfigs
+namespace AzureIoTHub.Portal.Server.Services
+{
+    public interface IConfigService
     {
         Task<IEnumerable<Configuration>> GetAllConfigs();
-
         Task<Configuration> GetConfigItem(string id);
     }
-}
+}

src/AzureIoTHub.Portal/Server/Startup.cs

@@ -110,7 +110,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddTransient<IDeviceModelMapper<DeviceModel, DeviceModel>, DeviceModelMapper>();
             services.AddTransient<IDeviceModelMapper<DeviceModel, LoRaDeviceModel>, LoRaDeviceModelMapper>();
 
-            services.AddTransient<ConfigsServices>();
+            services.AddTransient<IConfigService, ConfigService>();
 
             services.AddMudServices();