Removed the usage of IConnectionFactory and cleaned up the connection handling

Author: jgauffin

src/Server/Coderr.Server.App.Tests/Core/Accounts/CommandHandlers/RegisterAccountHandlerTests.cs

@@ -45,7 +45,7 @@ public async Task Should_inform_the_rest_of_the_system_about_the_new_account()
             await sut.HandleAsync(context, cmd);
 
             await context.Received().SendAsync(Arg.Any<AccountRegistered>());
-            context.Method("PublishAsync").Arg<AccountRegistered>().AccountId.Should().Be(3);
+            context.Method("SendAsync").Arg<AccountRegistered>().AccountId.Should().Be(3);
         }
 
         [Fact]

src/Server/Coderr.Server.App.Tests/Core/Applications/Commands/InviteUserHandlerTests.cs

@@ -66,24 +66,24 @@ public void Regular_user_should_not_be_able_to_invite()
             var cmd = new InviteUser(1, "[email protected]") { UserId = 1 };
             var members = new[] { new ApplicationTeamMember(1, 3, "karl") };
             _applicationRepository.GetTeamMembersAsync(1).Returns(members);
-            _context.Principal.Returns(CreateAdminPrincipal());
+            _context.Principal.Returns(CreateUserPrincipal());
 
             Func<Task> actual = async () => await _sut.HandleAsync(_context, cmd);
 
             actual.ShouldThrow<SecurityException>();
         }
 
         [Fact]
-        public void Sysadmin_should_be_able_To_invite_users()
+        public async Task Sysadmin_should_be_able_To_invite_users()
         {
             var cmd = new InviteUser(1, "[email protected]") { UserId = 1 };
             var members = new[] { new ApplicationTeamMember(3, 3, "karl") };
             _applicationRepository.GetTeamMembersAsync(1).Returns(members);
             _context.Principal.Returns(CreateAdminPrincipal());
 
-            Func<Task> actual = async () => await _sut.HandleAsync(_context, cmd);
+            await _sut.HandleAsync(_context, cmd);
 
-            actual.ShouldThrow<SecurityException>();
+            await _context.Received().SendAsync(Arg.Any<UserInvitedToApplication>());
         }
 
         [Fact]
@@ -156,5 +156,14 @@ private ClaimsPrincipal CreateAdminPrincipal()
             var identity = new ClaimsIdentity(claims);
             return new ClaimsPrincipal(identity);
         }
+
+        private ClaimsPrincipal CreateUserPrincipal()
+        {
+            var claims = new List<Claim>
+            {
+            };
+            var identity = new ClaimsIdentity(claims);
+            return new ClaimsPrincipal(identity);
+        }
     }
 }

src/Server/Coderr.Server.Infrastructure/Configuration/Database/DatabaseStore.cs

@@ -16,9 +16,9 @@ namespace codeRR.Server.Infrastructure.Configuration.Database
     public class DatabaseStore : ConfigurationStore
     {
         private readonly Dictionary<Type, Wrapper> _items = new Dictionary<Type, Wrapper>();
-        private readonly IConnectionFactory _connectionFactory;
+        private readonly Func<IDbConnection> _connectionFactory;
 
-        public DatabaseStore(IConnectionFactory connectionFactory)
+        public DatabaseStore(Func<IDbConnection> connectionFactory)
         {
             _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
         }
@@ -105,7 +105,7 @@ public override void Store(IConfigurationSection section)
         /// <returns>open connection</returns>
         protected virtual IDbConnection OpenConnectionFor<T>()
         {
-            return _connectionFactory.Open();
+            return OpenConnectionFor(typeof(T));
         }
 
         /// <summary>
@@ -116,7 +116,7 @@ protected virtual IDbConnection OpenConnectionFor<T>()
         protected virtual IDbConnection OpenConnectionFor(Type configClassType)
         {
             if (configClassType == null) throw new ArgumentNullException(nameof(configClassType));
-            return _connectionFactory.Open();
+            return _connectionFactory();
         }
 
         private void SetCache(IConfigurationSection section)

src/Server/Coderr.Server.Infrastructure/ConnectionFactory.cs

@@ -10,52 +10,14 @@ namespace codeRR.Server.Infrastructure
     /// <summary>
     ///     Generates SQL connections
     /// </summary>
-    public class Net452ConnectionFactory : IConnectionFactory
+    public class DbConnectionFactory
     {
-        private static Func<IDbConnection> _customFactory;
-
-        /// <inheritdoc />
-        public IDbConnection Open()
-        {
-            return Create("Db");
-        }
-
-        /// <inheritdoc />
-        public IDbConnection Open(string connectionStringName)
-        {
-            return Create(connectionStringName);
-        }
-
-        /// <inheritdoc />
-        public IDbConnection TryOpen(string connectionStringName)
-        {
-            return Create(connectionStringName, false);
-        }
-
-
         /// <summary>
-        ///     For integration tests etc.
-        /// </summary>
-        /// <param name="factoryMethod">factory method</param>
-        /// <param name="caller"></param>
-        public static void SetConnectionFactory(Func<IDbConnection> factoryMethod,
-            [CallerMemberName] string caller = "")
-        {
-            _customFactory = factoryMethod;
-        }
-
-        /// <summary>
-        ///     Creates a connection using the <c>web.config</c> connection string named <c>Db</c>.
+        ///     Opens a connection
         /// </summary>
         /// <returns>open connection</returns>
-        private static IDbConnection Create(string connectionStringName, bool throwIfMissing = true)
+        public static IDbConnection Open(string connectionStringName, bool throwIfMissing)
         {
-            if (_customFactory != null)
-            {
-                var con = _customFactory();
-                return con;
-            }
-
             var conStr = ConfigurationManager.ConnectionStrings[connectionStringName];
             if (conStr == null)
             {

src/Server/Coderr.Server.Infrastructure/IConnectionFactory.cs

@@ -10,11 +10,11 @@ namespace codeRR.Server.ReportAnalyzer
     /// </summary>
     public class AnalysisDbContext : IDisposable
     {
-        private readonly IConnectionFactory _connectionFactory;
+        private readonly Func<IDbConnection> _connectionFactory;
         private IDbConnection _con;
         private IAdoNetUnitOfWork _unitOfWork;
 
-        public AnalysisDbContext(IConnectionFactory connectionFactory)
+        public AnalysisDbContext(Func<IDbConnection> connectionFactory)
         {
             _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
         }
@@ -35,7 +35,7 @@ public IDbConnection Connection
                 if (_con != null)
                     return _con;
 
-                _con = _connectionFactory.Open();
+                _con = _connectionFactory();
                 return _con;
             }
         }

src/Server/Coderr.Server.ReportAnalyzer/AnalysisDbContext.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Threading.Tasks;
+using codeRR.Server.Api.Core.Feedback.Commands;
+using codeRR.Server.ReportAnalyzer.LibContracts;
+using DotNetCqs;
+using Griffin.Container;
+using log4net;
+using Newtonsoft.Json;
+
+namespace codeRR.Server.ReportAnalyzer.Handlers
+{
+    [Component]
+    public class ProcessFeedbackHandler : IMessageHandler<ProcessFeedback>
+    {
+        private readonly ILog _logger = LogManager.GetLogger(typeof(ProcessFeedbackHandler));
+
+        public async Task HandleAsync(IMessageContext context, ProcessFeedback message)
+        {
+            try
+            {
+                var submitCmd = new SubmitFeedback(message.ReportId, message.RemoteAddress)
+                {
+                    CreatedAtUtc = message.ReceivedAtUtc,
+                    Email = message.EmailAddress,
+                    Feedback = message.Description
+                };
+                await context.SendAsync(submitCmd);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error("Failed to process " + JsonConvert.SerializeObject(message), ex);
+            }
+        }
+    }
+}