SqlConnection reuse / MultipleActiveResultSets=true kgrzybek#122

junmaqiang · Nov 14, 2020 · 8e8b76e · 8e8b76e
1 parent ac359f2
commit 8e8b76e
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 28 deletions.
diff --git a/runIntegrationTests.cmd b/runIntegrationTests.cmd
@@ -14,7 +14,7 @@ TIMEOUT 30
 docker cp ./src/Database/CompanyName.MyMeetings.Database/Scripts/CreateDatabase_Linux.sql myMeetings-integration-db:/
 docker exec -i myMeetings-integration-db sh -c "/opt/mssql-tools/bin/sqlcmd -d master -i /CreateDatabase_Linux.sql -U sa -P 61cD4gE6!"
 dotnet build src/ --configuration Release --no-restore
-SETX ASPNETCORE_MyMeetings_IntegrationTests_ConnectionString "Server=localhost,1439;Database=MyMeetings;User=sa;Password=61cD4gE6!"
+SET ASPNETCORE_MyMeetings_IntegrationTests_ConnectionString=Server=localhost,1439;Database=MyMeetings;User=sa;Password=61cD4gE6!
 dotnet "src/Database/DatabaseMigrator/bin/Release/netcoreapp3.1/DatabaseMigrator.dll" %ASPNETCORE_MyMeetings_IntegrationTests_ConnectionString% "src/Database/CompanyName.MyMeetings.Database/Scripts/Migrations"
 dotnet test --configuration Release --no-build --verbosity normal src/Modules/Administration/Tests/IntegrationTests/CompanyName.MyMeetings.Modules.Administration.IntegrationTests.csproj
 dotnet test --configuration Release --no-build --verbosity normal src/Modules/Payments/Tests/IntegrationTests/CompanyName.MyMeetings.Modules.Payments.IntegrationTests.csproj

diff --git a/src/BuildingBlocks/EventBus/InMemoryEventBus.cs b/src/BuildingBlocks/EventBus/InMemoryEventBus.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using CompanyName.MyMeetings.BuildingBlocks.Infrastructure.EventBus;
 
 namespace CompanyName.MyMeetings.BuildingBlocks.EventBus
@@ -25,7 +26,7 @@ public void Subscribe<T>(IIntegrationEventHandler<T> handler)
             _handlers.Add(new HandlerSubscription(handler, typeof(T).FullName));
         }
 
-        public void Publish<T>(T @event)
+        public async Task Publish<T>(T @event)
             where T : IntegrationEvent
         {
             var eventType = @event.GetType();
@@ -36,7 +37,7 @@ public void Publish<T>(T @event)
             {
                 if (integrationEventHandler.Handler is IIntegrationEventHandler<T> handler)
                 {
-                    handler.Handle(@event);
+                    await handler.Handle(@event);
                 }
             }
         }

diff --git a/src/BuildingBlocks/EventBus/InMemoryEventBusClient.cs b/src/BuildingBlocks/EventBus/InMemoryEventBusClient.cs
@@ -1,4 +1,5 @@
-using CompanyName.MyMeetings.BuildingBlocks.Infrastructure.EventBus;
+using System.Threading.Tasks;
+using CompanyName.MyMeetings.BuildingBlocks.Infrastructure.EventBus;
 using Serilog;
 
 namespace CompanyName.MyMeetings.BuildingBlocks.EventBus
@@ -16,11 +17,11 @@ public void Dispose()
         {
         }
 
-        public void Publish<T>(T @event)
+        public async Task Publish<T>(T @event)
             where T : IntegrationEvent
         {
             _logger.Information("Publishing {Event}", @event.GetType().FullName);
-            InMemoryEventBus.Instance.Publish(@event);
+            await InMemoryEventBus.Instance.Publish(@event);
         }
 
         public void Subscribe<T>(IIntegrationEventHandler<T> handler)

diff --git a/src/BuildingBlocks/Infrastructure/EventBus/IEventsBus.cs b/src/BuildingBlocks/Infrastructure/EventBus/IEventsBus.cs
@@ -1,10 +1,11 @@
 using System;
+using System.Threading.Tasks;
 
 namespace CompanyName.MyMeetings.BuildingBlocks.Infrastructure.EventBus
 {
     public interface IEventsBus : IDisposable
     {
-        void Publish<T>(T @event)
+        Task Publish<T>(T @event)
             where T : IntegrationEvent;
 
         void Subscribe<T>(IIntegrationEventHandler<T> handler)

diff --git a/src/Modules/Administration/Application/Members/NewUserRegisteredIntegrationEventHandler.cs b/src/Modules/Administration/Application/Members/NewUserRegisteredIntegrationEventHandler.cs
@@ -16,9 +16,9 @@ internal NewUserRegisteredIntegrationEventHandler(ICommandsScheduler commandsSch
             _commandsScheduler = commandsScheduler;
         }
 
-        public Task Handle(NewUserRegisteredIntegrationEvent notification, CancellationToken cancellationToken)
+        public async Task Handle(NewUserRegisteredIntegrationEvent notification, CancellationToken cancellationToken)
         {
-            _commandsScheduler.EnqueueAsync(new
+            await _commandsScheduler.EnqueueAsync(new
                 CreateMemberCommand(
                     Guid.NewGuid(),
                     notification.UserId,
@@ -27,8 +27,6 @@ public Task Handle(NewUserRegisteredIntegrationEvent notification, CancellationT
                     notification.FirstName,
                     notification.LastName,
                     notification.Name));
-
-            return Task.CompletedTask;
         }
     }
 }
diff --git a/...dministration/Infrastructure/Configuration/Processing/Inbox/ProcessInboxCommandHandler.cs b/...dministration/Infrastructure/Configuration/Processing/Inbox/ProcessInboxCommandHandler.cs
@@ -58,7 +58,7 @@ public async Task<Unit> Handle(ProcessInboxCommand command, CancellationToken ca
                     throw;
                 }
 
-                await connection.ExecuteAsync(sqlUpdateProcessedDate, new
+                await connection.ExecuteScalarAsync(sqlUpdateProcessedDate, new
                 {
                     Date = DateTime.UtcNow,
                     message.Id

diff --git a/...les/Meetings/Application/Members/CreateMember/NewUserRegisteredIntegrationEventHandler.cs b/...les/Meetings/Application/Members/CreateMember/NewUserRegisteredIntegrationEventHandler.cs
@@ -16,9 +16,9 @@ public NewUserRegisteredIntegrationEventHandler(ICommandsScheduler commandsSched
             _commandsScheduler = commandsScheduler;
         }
 
-        public Task Handle(NewUserRegisteredIntegrationEvent notification, CancellationToken cancellationToken)
+        public async Task Handle(NewUserRegisteredIntegrationEvent notification, CancellationToken cancellationToken)
         {
-            _commandsScheduler.EnqueueAsync(new
+            await _commandsScheduler.EnqueueAsync(new
                 CreateMemberCommand(
                     Guid.NewGuid(),
                     notification.UserId,
@@ -27,8 +27,6 @@ public Task Handle(NewUserRegisteredIntegrationEvent notification, CancellationT
                     notification.FirstName,
                     notification.LastName,
                     notification.Name));
-
-            return Task.CompletedTask;
         }
     }
 }
diff --git a/...ules/Meetings/Infrastructure/Configuration/Processing/Inbox/ProcessInboxCommandHandler.cs b/...ules/Meetings/Infrastructure/Configuration/Processing/Inbox/ProcessInboxCommandHandler.cs
@@ -3,7 +3,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using CompanyName.MyMeetings.BuildingBlocks.Application.Data;
-using CompanyName.MyMeetings.BuildingBlocks.Infrastructure;
 using CompanyName.MyMeetings.Modules.Meetings.Application.Configuration.Commands;
 using Dapper;
 using MediatR;
@@ -57,7 +56,7 @@ public async Task<Unit> Handle(ProcessInboxCommand command, CancellationToken ca
                     throw;
                 }
 
-                await connection.ExecuteAsync(sqlUpdateProcessedDate, new
+                await connection.ExecuteScalarAsync(sqlUpdateProcessedDate, new
                 {
                     Date = DateTime.UtcNow,
                     message.Id

diff --git a/...dules/Payments/Application/Payers/CreatePayer/NewUserRegisteredIntegrationEventHandler.cs b/...dules/Payments/Application/Payers/CreatePayer/NewUserRegisteredIntegrationEventHandler.cs
@@ -16,9 +16,9 @@ internal NewUserRegisteredIntegrationEventHandler(ICommandsScheduler commandsSch
             _commandsScheduler = commandsScheduler;
         }
 
-        public Task Handle(NewUserRegisteredIntegrationEvent notification, CancellationToken cancellationToken)
+        public async Task Handle(NewUserRegisteredIntegrationEvent notification, CancellationToken cancellationToken)
         {
-            _commandsScheduler.EnqueueAsync(new
+            await _commandsScheduler.EnqueueAsync(new
                 CreatePayerCommand(
                     Guid.NewGuid(),
                     notification.UserId,
@@ -27,8 +27,6 @@ public Task Handle(NewUserRegisteredIntegrationEvent notification, CancellationT
                     notification.FirstName,
                     notification.LastName,
                     notification.Name));
-
-            return Task.CompletedTask;
         }
     }
 }
diff --git a/...ules/Payments/Infrastructure/Configuration/Processing/Inbox/ProcessInboxCommandHandler.cs b/...ules/Payments/Infrastructure/Configuration/Processing/Inbox/ProcessInboxCommandHandler.cs
@@ -49,15 +49,15 @@ public async Task<Unit> Handle(ProcessInboxCommand command, CancellationToken ca
 
                 try
                 {
-                    await _mediator.Publish((INotification)request, cancellationToken);
+                    await _mediator.Publish((INotification) request, cancellationToken);
                 }
                 catch (Exception e)
                 {
                     Console.WriteLine(e);
                     throw;
                 }
 
-                await connection.ExecuteAsync(sqlUpdateProcessedDate, new
+                await connection.ExecuteScalarAsync(sqlUpdateProcessedDate, new
                 {
                     Date = DateTime.UtcNow,
                     message.Id

diff --git a/...ess/Application/UserRegistrations/RegisterNewUser/NewUserRegisteredPublishEventHandler.cs b/...ess/Application/UserRegistrations/RegisterNewUser/NewUserRegisteredPublishEventHandler.cs
@@ -15,9 +15,9 @@ public NewUserRegisteredPublishEventHandler(IEventsBus eventsBus)
             _eventsBus = eventsBus;
         }
 
-        public Task Handle(NewUserRegisteredNotification notification, CancellationToken cancellationToken)
+        public async Task Handle(NewUserRegisteredNotification notification, CancellationToken cancellationToken)
         {
-            _eventsBus.Publish(new NewUserRegisteredIntegrationEvent(
+            await _eventsBus.Publish(new NewUserRegisteredIntegrationEvent(
                 notification.Id,
                 notification.DomainEvent.OccurredOn,
                 notification.DomainEvent.UserRegistrationId.Value,
@@ -26,8 +26,6 @@ public Task Handle(NewUserRegisteredNotification notification, CancellationToken
                 notification.DomainEvent.FirstName,
                 notification.DomainEvent.LastName,
                 notification.DomainEvent.Name));
-
-            return Task.CompletedTask;
         }
     }
 }