Merge pull request #95 from TransactionProcessing/task/logconfigvaluesextension

Further logging formatting

Author: StuartFerguson

Shared.Tests/ConfigurationRootExtensionsTests.cs

@@ -3,11 +3,13 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using Castle.Components.DictionaryAdapter;
     using Extensions;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.Hosting;
     using Microsoft.Extensions.Hosting.Internal;
     using Microsoft.Extensions.Logging;
+    using Newtonsoft.Json;
     using Shouldly;
     using Xunit;
 
@@ -25,16 +27,19 @@ public class ConfigurationRootExtensionsTests
         /// The default application settings.
         /// </value>
         public static IReadOnlyDictionary<String, String> DefaultAppSettings { get; } = new Dictionary<String, String>
-                                                                                        {
-                                                                                            ["AppSettings:Test"] = "",
-                                                                                            ["AppSettings:Test1"] = null,
-                                                                                            ["AppSettings:ClientId"] = "clientId",
-                                                                                            ["AppSettings:ClientSecret"] = "Secret1",
-                                                                                            ["EventStoreSettings:ConnectionString"] = "https://192.168.1.133:2113",
-                                                                                            ["ConnectionStrings:HealthCheck"] =
-                                                                                                "server=192.168.1.133;database=master;user id=sa;password=Sc0tland"
-                                                                                        };
-
+        {
+            ["AppSettings:Test"] = "",
+            ["AppSettings:ClientId"] = "clientId",
+            ["AppSettings:ClientSecret"] = "Secret1",
+            ["EventStoreSettings:ConnectionString"] = "https://192.168.1.133:2113",
+            ["ConnectionStrings:HealthCheck"] =
+                                                                                                "server=192.168.1.133;database=master;user id=sa;password=Sc0tland",
+            ["AppSettings:EventHandlerConfiguration:ResponseReceivedFromEmailProviderEvent:0"] =
+                                                                                                "MessagingService.BusinessLogic.EventHandling.EmailDomainEventHandler, MessagingService.BusinessLogic",
+            ["AppSettings:EventHandlerConfiguration:ResponseReceivedFromSMSProviderEvent:0"] =
+                                                                                                "MessagingService.BusinessLogic.EventHandling.SMSDomainEventHandler, MessagingService.BusinessLogic"
+        };
+        
         #endregion
 
         #region Methods
@@ -45,7 +50,7 @@ public class ConfigurationRootExtensionsTests
         [Fact]
         public void ConfigurationRootExtensions_LogConfiguration_ConfigurationIsLogged()
         {
-            IConfigurationBuilder builder = new ConfigurationBuilder().AddInMemoryCollection(ConfigurationRootExtensionsTests.DefaultAppSettings).AddEnvironmentVariables();
+             IConfigurationBuilder builder = new ConfigurationBuilder().AddInMemoryCollection(ConfigurationRootExtensionsTests.DefaultAppSettings).AddEnvironmentVariables();
 
             IConfigurationRoot configuration = builder.Build();
 
@@ -55,9 +60,9 @@ public void ConfigurationRootExtensions_LogConfiguration_ConfigurationIsLogged()
             configuration.LogConfiguration(loggerAction);
 
             String[] loggedEntries = testLogger.GetLogEntries();
-            Int32 expectedCount = ConfigurationRootExtensionsTests.DefaultAppSettings.Count + 6; // 3 blank lines & 3 headers
+            Int32 expectedCount = ConfigurationRootExtensionsTests.DefaultAppSettings.Count + 7; // 3 blank lines & 4 headers
             loggedEntries.Length.ShouldBe(expectedCount);
-            loggedEntries.Where(l => l.Contains("No Value")).Count().ShouldBe(2);
+            loggedEntries.Where(l => l.Contains("No Value")).Count().ShouldBe(1);
         }
 
         /// <summary>

Shared/Extensions/ConfigurationRootExtensions.cs

@@ -3,6 +3,7 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using System.Text;
     using General;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.Hosting.Internal;
@@ -44,13 +45,20 @@ private static void LogConfigurationSettings(IConfigurationSection configSection
                 loggerAction($"Configuration Section: {configSection.Key}");
                 foreach (IConfigurationSection c in children)
                 {
-                    if (String.IsNullOrEmpty(c.Value))
+                    if (c.Value == null)
                     {
-                        loggerAction($"Key: {c.Key}  Value: No Value");
+                        IEnumerable<KeyValuePair<String, String>> g = c.AsEnumerable().Where(k => k.Value!= null);
+                        String stringToRemoveFromKey = $"{configSection.Key}:{c.Key}:";
+                        loggerAction($"\tConfiguration Section: {configSection.Key}:{c.Key}");
+                        foreach (KeyValuePair<String, String> keyValuePair in g)
+                        {
+                            loggerAction($"\t\tKey: {keyValuePair.Key.Replace(stringToRemoveFromKey,"")}  Value: {keyValuePair.Value}");
+                        }
+                        
                     }
                     else
                     {
-                        loggerAction($"Key: {c.Key}  Value: {c.Value}");
+                        loggerAction($"\tKey: {c.Key}  Value: {(c.Value == String.Empty? "No Value" : c.Value)}");
                     }
 
                 }