TransactionProcessing · StuartFerguson · Nov 13, 2019 · Nov 13, 2019 · Nov 13, 2019 · Nov 13, 2019
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+*.[Dd]evelopment.json
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

diff --git a/EstateManagement.BusinessLogic/CommandHandlers/EstateCommandHandler.cs b/EstateManagement.BusinessLogic/CommandHandlers/EstateCommandHandler.cs
@@ -1,5 +1,6 @@
 namespace EstateManagement.BusinessLogic.CommandHandlers
 {
+    using System;
     using System.Threading;
     using System.Threading.Tasks;
     using Commands;
@@ -45,7 +46,15 @@ private async Task HandleCommand(CreateEstateCommand command,
 
             estateAggregate.Register(command.Name);
 
-            await this.EstateAggregateRepository.SaveChanges(estateAggregate, cancellationToken);
+            try
+            {
+                await this.EstateAggregateRepository.SaveChanges(estateAggregate, cancellationToken);
+            }
+            catch(Exception e)
+            {
+                throw;
+            }
+
         }
 
         #endregion

diff --git a/EstateManagement.BusinessLogic/EstateManagement.BusinessLogic.csproj b/EstateManagement.BusinessLogic/EstateManagement.BusinessLogic.csproj
@@ -10,8 +10,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared" Version="0.0.2" />
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="0.0.2" />
+    <PackageReference Include="Shared" Version="0.0.3.1" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="0.0.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/EstateManagement.Client/EstateManagement.Client.csproj b/EstateManagement.Client/EstateManagement.Client.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="0.0.2" />
+    <PackageReference Include="ClientProxyBase" Version="0.0.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/EstateManagement.Estate.DomainEvents/EstateManagement.Estate.DomainEvents.csproj b/EstateManagement.Estate.DomainEvents/EstateManagement.Estate.DomainEvents.csproj
@@ -5,6 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="0.0.2" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="0.0.3.1" />
   </ItemGroup>
 </Project>
diff --git a/EstateManagement.EstateAggregate.Tests/EstateManagement.EstateAggregate.Tests.csproj b/EstateManagement.EstateAggregate.Tests/EstateManagement.EstateAggregate.Tests.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
-    <PackageReference Include="Shared.EventStore" Version="0.0.2" />
+    <PackageReference Include="Shared.EventStore" Version="0.0.3.1" />
     <PackageReference Include="Shouldly" Version="3.0.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">

diff --git a/EstateManagement.EstateAggregate/EstateAggregate.cs b/EstateManagement.EstateAggregate/EstateAggregate.cs
@@ -84,6 +84,18 @@ public void Register(String estateName)
             this.ApplyAndPend(estateCreatedEvent);
         }
 
+        /// <summary>
+        /// Gets the metadata.
+        /// </summary>
+        /// <returns></returns>
+        protected override Object GetMetadata()
+        {
+            return new
+                   {
+                       EstateId = this.AggregateId
+                   };
+        }
+
         /// <summary>
         /// Plays the event.
         /// </summary>

diff --git a/EstateManagement.EstateAggregate/EstateManagement.EstateAggregate.csproj b/EstateManagement.EstateAggregate/EstateManagement.EstateAggregate.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared" Version="0.0.2" />
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="0.0.2" />
-    <PackageReference Include="Shared.EventStore" Version="0.0.2" />
+    <PackageReference Include="Shared" Version="0.0.3.1" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="0.0.3.1" />
+    <PackageReference Include="Shared.EventStore" Version="0.0.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/EstateManagement.IntegrationTests/EstateManagement.IntegrationTests.csproj b/EstateManagement.IntegrationTests/EstateManagement.IntegrationTests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="0.0.2" />
+    <PackageReference Include="ClientProxyBase" Version="0.0.3.1" />
     <PackageReference Include="Ductus.FluentDocker" Version="2.7.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />

diff --git a/EstateManagement.Tests/Common/EstateManagementWebFactory.cs b/EstateManagement.Tests/Common/EstateManagementWebFactory.cs
@@ -22,10 +22,10 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
 
             builder.ConfigureServices((builderContext, services) =>
             {
-                if (commandRouterMock != null)
-                {
-                    services.AddSingleton(commandRouterMock.Object);
-                }
+                //if (commandRouterMock != null)
+                //{
+                //    services.AddSingleton(commandRouterMock.Object);
+                //}
 
                 services.AddMvc(options =>
                 {

diff --git a/EstateManagement.Tests/ControllerTests/EstateControllerTests.cs b/EstateManagement.Tests/ControllerTests/EstateControllerTests.cs
@@ -9,7 +9,11 @@
     using DataTransferObjects.Requests;
     using DataTransferObjects.Responses;
     using EstateManagement.Testing;
+    using Lamar;
+    using Microsoft.Extensions.DependencyInjection;
+    using Moq;
     using Newtonsoft.Json;
+    using Shared.DomainDrivenDesign.CommandHandling;
     using Shouldly;
     using Xunit;
 
@@ -32,11 +36,21 @@ public EstateControllerTests(EstateManagementWebFactory<Startup> webApplicationF
             this.WebApplicationFactory = webApplicationFactory;
         }
 
-        [Fact(Skip = "Lamar")]
+        [Fact(Skip="Issue with Lamar")]
         public async Task GolfClubAdministratorController_POST_GolfClubAdministrator_GolfClubAdministratorIsReturned()
         {
             // 1. Arrange
             HttpClient client = this.WebApplicationFactory.CreateClient();
+            var container = Startup.Container;
+
+            Mock<ICommandRouter> commandRouterMock = new Mock<ICommandRouter>(MockBehavior.Strict);
+
+            commandRouterMock.Setup(c => c.Route(It.IsAny<ICommand>(), It.IsAny<CancellationToken>())).Returns(Task.CompletedTask);
+
+            ServiceCollection services = new ServiceCollection();
+            services.AddSingleton(commandRouterMock.Object);
+
+            container.Configure(services);
 
             CreateEstateRequest createEstateRequest = TestData.CreateEstateRequest;
             String uri = "api/estates/";

diff --git a/EstateManagement/Controllers/EstateController.cs b/EstateManagement/Controllers/EstateController.cs
@@ -50,7 +50,7 @@ public class EstateController : ControllerBase
         /// <param name="commandRouter">The command router.</param>
         /// <param name="estateManagmentManager">The estate managment manager.</param>
         /// <param name="modelFactory">The model factory.</param>
-        public EstateController(CommandRouter commandRouter,
+        public EstateController(ICommandRouter commandRouter,
                                 IEstateManagmentManager estateManagmentManager,
                                 IModelFactory modelFactory)
         {

diff --git a/EstateManagement/Startup.cs b/EstateManagement/Startup.cs
@@ -133,10 +133,10 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
 
             ConfigurationReader.Initialise(Startup.Configuration);
 
-            app.AddExceptionHandler();
             app.AddRequestLogging();
             app.AddResponseLogging();
-
+            app.AddExceptionHandler();
+
             app.UseRouting();
 
             app.UseAuthorization();

diff --git a/README.md b/README.md
@@ -12,3 +12,7 @@
 ## Code Coverage Results
 
 [![Coverage Status](https://coveralls.io/repos/github/StuartFerguson/EstateManagement/badge.svg)](https://coveralls.io/github/StuartFerguson/EstateManagement)
+
+## Code Quality Results
+
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/5bcb33c3c68e473193a872f0d3375f61)](https://www.codacy.com/manual/stuart_ferguson1/EstateManagement?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=StuartFerguson/EstateManagement&amp;utm_campaign=Badge_Grade)