Rafactored test classes and config

Removed duplicate ExceptionHandlingMiddleware Upgraded Marten
ritasker · Jul 20, 2021 · 87205ba · 87205ba
1 parent b8b901c
commit 87205ba
Show file tree

Hide file tree

Showing 47 changed files with 61 additions and 355 deletions.
diff --git a/CQRS.Tests/CQRS.Tests.csproj b/CQRS.Tests/CQRS.Tests.csproj
@@ -16,7 +16,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-rc.2" />
+        <PackageReference Include="Marten" Version="4.0.0-rc.3" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
         <PackageReference Include="MediatR" Version="9.0.0" />
         <PackageReference Include="SharpTestsEx" Version="2.0.0" />

diff --git a/Core.Marten/Config.cs b/Core.Marten/Config.cs
@@ -4,6 +4,7 @@
 using Marten.Events.Daemon.Resiliency;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Weasel.Core;
 using Weasel.Postgresql;
 
 namespace Core.Marten
@@ -41,10 +42,10 @@ public static IServiceCollection AddMarten(this IServiceCollection services, ICo
                 })
                 .InitializeStore();
 
-                if (martenConfig.ShouldRecreateDatabase)
-                    documentStore.Advanced.Clean.CompletelyRemoveAll();
+            if (martenConfig.ShouldRecreateDatabase)
+                documentStore.Advanced.Clean.CompletelyRemoveAll();
 
-                documentStore.Schema.ApplyAllConfiguredChangesToDatabase();
+            documentStore.Schema.ApplyAllConfiguredChangesToDatabase();
 
             return services;
         }

diff --git a/Core.Marten/Core.Marten.csproj b/Core.Marten/Core.Marten.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="Ardalis.GuardClauses" Version="3.2.0" />
-        <PackageReference Include="Marten" Version="4.0.0-rc.2" />
+        <PackageReference Include="Marten" Version="4.0.0-rc.3" />
         <PackageReference Include="MediatR" Version="9.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />

diff --git a/Core.Tests/Core.Tests.csproj b/Core.Tests/Core.Tests.csproj
@@ -20,7 +20,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-rc.2" />
+        <PackageReference Include="Marten" Version="4.0.0-rc.3" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
         <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
         <PackageReference Include="SharpTestsEx" Version="2.0.0" />

diff --git a/EventSourcing.Integration.Tests/EventSourcing.Integration.Tests.csproj b/EventSourcing.Integration.Tests/EventSourcing.Integration.Tests.csproj
@@ -16,7 +16,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-rc.2" />
+        <PackageReference Include="Marten" Version="4.0.0-rc.3" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
         <PackageReference Include="MediatR" Version="9.0.0" />
         <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />

diff --git a/Marten.Integration.Tests/Marten.Integration.Tests.csproj b/Marten.Integration.Tests/Marten.Integration.Tests.csproj
@@ -20,7 +20,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-rc.2" />
+        <PackageReference Include="Marten" Version="4.0.0-rc.3" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
         <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />

diff --git a/MediatR.Tests/MediatR.Tests.csproj b/MediatR.Tests/MediatR.Tests.csproj
@@ -19,7 +19,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-rc.2" />
+        <PackageReference Include="Marten" Version="4.0.0-rc.3" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
         <PackageReference Include="MediatR" Version="9.0.0" />
         <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />

diff --git a/Sample/AsyncProjections/SmartHome.Api/Exceptions/ExceptionHandlingMiddleware.cs b/Sample/AsyncProjections/SmartHome.Api/Exceptions/ExceptionHandlingMiddleware.cs
diff --git a/Sample/AsyncProjections/SmartHome.Api/Exceptions/ExceptionToHttpStatusMapper.cs b/Sample/AsyncProjections/SmartHome.Api/Exceptions/ExceptionToHttpStatusMapper.cs
diff --git a/Sample/AsyncProjections/SmartHome.Api/Exceptions/HttpExceptionWrapper.cs b/Sample/AsyncProjections/SmartHome.Api/Exceptions/HttpExceptionWrapper.cs
diff --git a/Sample/AsyncProjections/SmartHome.Api/SmartHome.Api.csproj b/Sample/AsyncProjections/SmartHome.Api/SmartHome.Api.csproj
@@ -12,6 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\..\..\Core.WebApi\Core.WebApi.csproj" />
       <ProjectReference Include="..\SmartHome.Temperature\SmartHome.Temperature.csproj" />
     </ItemGroup>
 

diff --git a/Sample/AsyncProjections/SmartHome.Api/Startup.cs b/Sample/AsyncProjections/SmartHome.Api/Startup.cs
@@ -1,12 +1,12 @@
 using Core;
+using Core.WebApi.Middlewares.ExceptionHandling;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
 using Newtonsoft.Json.Converters;
-using SmartHome.Api.Exceptions;
 using SmartHome.Temperature;
 
 namespace SmartHome.Api

diff --git a/.../ECommerce/Payments/Payments.Api.Tests/Payments/RequestingPayment/RequestPaymentsTests.cs b/.../ECommerce/Payments/Payments.Api.Tests/Payments/RequestingPayment/RequestPaymentsTests.cs
@@ -39,7 +39,7 @@ public RequestPaymentsTestsTests(RequestPaymentsTestsFixture fixture)
 
         [Fact]
         [Trait("Category", "Acceptance")]
-        public async Task CreateCommand_ShouldReturn_CreatedStatus_With_PaymentId()
+        public async Task RequestPayment_ShouldReturn_CreatedStatus_With_PaymentId()
         {
             var commandResponse = fixture.CommandResponse;
             commandResponse.EnsureSuccessStatusCode();
@@ -52,7 +52,7 @@ public async Task CreateCommand_ShouldReturn_CreatedStatus_With_PaymentId()
 
         [Fact]
         [Trait("Category", "Acceptance")]
-        public async Task CreateCommand_ShouldPublish_PaymentInitializedEvent()
+        public async Task RequestPayment_ShouldPublish_PaymentInitializedEvent()
         {
             var createdId = await fixture.CommandResponse.GetResultFromJson<Guid>();
 
@@ -68,7 +68,7 @@ public async Task CreateCommand_ShouldPublish_PaymentInitializedEvent()
 
         // [Fact]
         // [Trait("Category", "Acceptance")]
-        // public async Task CreateCommand_ShouldCreate_Payment()
+        // public async Task RequestPayment_ShouldCreate_Payment()
         // {
         //     var createdId = await fixture.CommandResponse.GetResultFromJSON<Guid>();
         //

diff --git a/Sample/ECommerce/Shipments/Shipments.Api.Tests/Packages/SendPackageTests.cs b/Sample/ECommerce/Shipments/Shipments.Api.Tests/Packages/SendPackageTests.cs
@@ -16,13 +16,13 @@ namespace Shipments.Api.Tests.Packages
 {
     public class SendPackageFixture: ApiFixture<Startup>
     {
-        protected override string ApiUrl { get; } = "/api/Shipments";
+        protected override string ApiUrl => "/api/Shipments";
 
         public readonly Guid OrderId = Guid.NewGuid();
 
         public readonly DateTime TimeBeforeSending = DateTime.UtcNow;
 
-        public readonly List<ProductItem> ProductItems = new List<ProductItem>
+        public readonly List<ProductItem> ProductItems = new()
         {
             new ProductItem
             {

diff --git a/Sample/ECommerce/Shipments/Shipments.Api/appsettings.Development.json b/Sample/ECommerce/Shipments/Shipments.Api/appsettings.Development.json
@@ -6,8 +6,5 @@
             "System": "Information",
             "Microsoft": "Information"
         }
-    },
-    "ConnectionStrings": {
-        "ClientsDatabase": "PORT = 5432; HOST = localhost; TIMEOUT = 15; POOLING = True; MINPOOLSIZE = 1; MAXPOOLSIZE = 100; COMMANDTIMEOUT = 20; DATABASE = 'postgres'; PASSWORD = 'Password12!'; USER ID = 'postgres'"
     }
 }
diff --git a/Sample/ECommerce/Shipments/Shipments/Config.cs b/Sample/ECommerce/Shipments/Shipments/Config.cs
@@ -21,13 +21,17 @@ public static IServiceCollection AddShipmentsModule(this IServiceCollection serv
         private static IServiceCollection AddEntityFramework(this IServiceCollection services, IConfiguration config)
         {
             return services.AddDbContext<ShipmentsDbContext>(
-                options => options.UseNpgsql(config.GetConnectionString("ShipmentsDatabase")));
+                options => options.UseNpgsql("name=ConnectionStrings:ShipmentsDatabase"));
         }
 
         public static void ConfigureShipmentsModule(this IServiceProvider serviceProvider)
         {
-            // Kids, don't try this at production
-            serviceProvider.GetRequiredService<ShipmentsDbContext>().Database.Migrate();
+            var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Development";
+
+            if (environment == "Development")
+            {
+                serviceProvider.GetRequiredService<ShipmentsDbContext>().Database.Migrate();
+            }
         }
     }
 }
diff --git a/Sample/ECommerce/Shipments/Shipments/Shipments.csproj b/Sample/ECommerce/Shipments/Shipments/Shipments.csproj
@@ -6,6 +6,10 @@
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 
+    <ItemGroup>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
+
     <ItemGroup>
       <ProjectReference Include="..\..\..\..\Core\Core.csproj" />
     </ItemGroup>
@@ -17,9 +21,13 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.7" />
         <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.7" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...pments/Storage/ClientsDbContextFactory.cs → ...ents/Storage/ShipmentsDbContextFactory.cs b/...pments/Storage/ClientsDbContextFactory.cs → ...ents/Storage/ShipmentsDbContextFactory.cs
@@ -2,13 +2,12 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.Extensions.Configuration;
-using Shipments.Storage;
 
-namespace EventSourcing.Sample.Clients.Storage
+namespace Shipments.Storage
 {
-    internal class ClientsDbContextFactory: IDesignTimeDbContextFactory<ShipmentsDbContext>
+    internal class ShipmentsDbContextFactory: IDesignTimeDbContextFactory<ShipmentsDbContext>
     {
-        public ClientsDbContextFactory()
+        public ShipmentsDbContextFactory()
         {
         }
 
@@ -27,9 +26,9 @@ public ShipmentsDbContext CreateDbContext(string[] args)
                     .SetBasePath(AppContext.BaseDirectory)
                     .AddJsonFile("appsettings.json")
                     .AddJsonFile($"appsettings.{environmentName}.json", optional: true, reloadOnChange: false)
-                    //.AddEnvironmentVariables()
+                    .AddEnvironmentVariables()
                     .Build()
-                    .GetConnectionString("ClientsDatabase");
+                    .GetConnectionString("ShipmentsDatabase");
 
             optionsBuilder.UseNpgsql(connectionString);
 

diff --git a/Sample/MeetingsManagement/MeetingsManagement.Api/MeetingsManagement.Api.csproj b/Sample/MeetingsManagement/MeetingsManagement.Api/MeetingsManagement.Api.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Marten" Version="4.0.0-rc.2" />
+        <PackageReference Include="Marten" Version="4.0.0-rc.3" />
         <PackageReference Include="MediatR" Version="9.0.0" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.7" />

diff --git a/...Management/MeetingsManagement.IntegrationTests/MeetingsManagement.IntegrationTests.csproj b/...Management/MeetingsManagement.IntegrationTests/MeetingsManagement.IntegrationTests.csproj
@@ -17,7 +17,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-rc.2" />
+        <PackageReference Include="Marten" Version="4.0.0-rc.3" />
         <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
@@ -37,10 +37,4 @@
         <ProjectReference Include="..\MeetingsManagement.Api\MeetingsManagement.Api.csproj" />
         <ProjectReference Include="..\MeetingsManagement\MeetingsManagement.csproj" />
     </ItemGroup>
-
-    <ItemGroup>
-        <Content Update="appsettings.json">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </Content>
-    </ItemGroup>
 </Project>
diff --git a/Sample/MeetingsManagement/MeetingsManagement.IntegrationTests/appsettings.json b/Sample/MeetingsManagement/MeetingsManagement.IntegrationTests/appsettings.json
diff --git a/Sample/MeetingsManagement/MeetingsManagement/MeetingsManagement.csproj b/Sample/MeetingsManagement/MeetingsManagement/MeetingsManagement.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="JsonNet.PrivateSettersContractResolvers" Version="1.0.0" />
-        <PackageReference Include="Marten" Version="4.0.0-rc.2" />
+        <PackageReference Include="Marten" Version="4.0.0-rc.3" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />