Updated hexagonal Architecture

dhelper · dhelper · commit 2e43bae0bbcf · 2024-07-31T12:43:15.000+03:00
diff --git a/dotnet-test-samples/hexagonal-architecture/src/GetStock/Adapters/StockDynamoDb.cs b/dotnet-test-samples/hexagonal-architecture/src/GetStock/Adapters/StockDynamoDb.cs
@@ -28,7 +28,7 @@ public async Task<StockData> GetStockValueAsync(string stockId)
             }
             var jsonString = document.ToJson();
 
-            return JsonSerializer.Deserialize<StockData>(jsonString);
+            return JsonSerializer.Deserialize<StockData>(jsonString)!;
         }
 
     }
diff --git a/dotnet-test-samples/hexagonal-architecture/src/GetStock/Functions.cs b/dotnet-test-samples/hexagonal-architecture/src/GetStock/Functions.cs
@@ -44,7 +44,7 @@ private static ServiceProvider InitializeServiceProvider()
 
 public class Functions
 {
-    private readonly IHttpHandler? _handler;
+    private readonly IHttpHandler _handler;
 
     public Functions()
     {
diff --git a/dotnet-test-samples/hexagonal-architecture/src/GetStock/GetStock.csproj b/dotnet-test-samples/hexagonal-architecture/src/GetStock/GetStock.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -11,13 +11,13 @@
     <PublishReadyToRun>true</PublishReadyToRun>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.6.0" />
-    <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.8.6" />
-    <PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />
-    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.3.1" />
-    <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.0.1" />
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.102.22" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Amazon.Lambda.APIGatewayEvents" Version="2.7.0" />
+    <PackageReference Include="Amazon.Lambda.RuntimeSupport" Version="1.10.0" />
+    <PackageReference Include="Amazon.Lambda.Core" Version="2.2.0" />
+    <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.3" />
+    <PackageReference Include="AWS.Lambda.Powertools.Logging" Version="1.5.1" />
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.400.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Adapters\Exceptions\" />
diff --git a/dotnet-test-samples/hexagonal-architecture/template.yaml b/dotnet-test-samples/hexagonal-architecture/template.yaml
@@ -5,7 +5,7 @@ Globals:
   Function:
     MemorySize: 1024
     Architectures: [arm64]
-    Runtime: dotnet6
+    Runtime: dotnet8
     Timeout: 30
     Tracing: Active
 
diff --git a/dotnet-test-samples/hexagonal-architecture/tests/GetStock.IntegrationTest/Adapters/StockDynamoDbTests.cs b/dotnet-test-samples/hexagonal-architecture/tests/GetStock.IntegrationTest/Adapters/StockDynamoDbTests.cs
@@ -7,13 +7,8 @@
 
 namespace GetStock.IntegrationTest.Adapters;
 
-public class StockDynamoDbTests : DynamoDbTestBase
+public class StockDynamoDbTests(DynamoDbFixture fixture) : DynamoDbTestBase(fixture)
 {
-    public StockDynamoDbTests(DynamoDbFixture fixture)
-        : base("test-stocks", fixture)
-    {
-    }
-
     [Fact]
     public async Task GetStockValue_With_StockNotInDb_Should_ThrowStockNotFoundException()
     {
diff --git a/dotnet-test-samples/hexagonal-architecture/tests/GetStock.IntegrationTest/Fixtures/DynamoDbTestBase.cs b/dotnet-test-samples/hexagonal-architecture/tests/GetStock.IntegrationTest/Fixtures/DynamoDbTestBase.cs
@@ -5,27 +5,49 @@ namespace GetStock.IntegrationTest.Fixtures
 {
     public class DynamoDbTestBase : IClassFixture<DynamoDbFixture>, IDisposable
     {
-        private const string _tableNamePrefix = "test-stocks";
+        private const string TableNamePrefix = "test-stocks";
         protected string TableName { get; }
         protected IAmazonDynamoDB Client { get; }
 
-        public DynamoDbTestBase(string tableNamePrefix, DynamoDbFixture fixture)
+        protected DynamoDbTestBase(DynamoDbFixture fixture)
         {
-            TableName = $"{_tableNamePrefix}{Guid.NewGuid()}";
+            TableName = $"{TableNamePrefix}{Guid.NewGuid()}";
             Client = fixture.Client;
 
             var request = new CreateTableRequest
             {
                 TableName = TableName,
-                AttributeDefinitions = new List<AttributeDefinition>
-                {
-                    new("StockId", "S")
-                },
-                KeySchema = new List<KeySchemaElement> { new("StockId", Amazon.DynamoDBv2.KeyType.HASH) },
+                AttributeDefinitions = [new AttributeDefinition("StockId", "S")],
+                KeySchema = [new KeySchemaElement("StockId", KeyType.HASH)],
                 ProvisionedThroughput = new ProvisionedThroughput { ReadCapacityUnits = 1, WriteCapacityUnits = 1 }
             };
 
             Client.CreateTableAsync(request).Wait();
+            
+            WaitUntilDynamoDbActive().Wait();
+        }
+
+        private async Task WaitUntilDynamoDbActive()
+        {
+            int sleepDuration = 2000;
+
+            var describeTableRequest = new DescribeTableRequest
+            {
+                TableName = TableName
+            };
+
+            TableStatus status;
+            
+            do
+            {
+                Thread.Sleep(sleepDuration);
+
+                var describeTableResponse = await Client.DescribeTableAsync(describeTableRequest);
+                status = describeTableResponse.Table.TableStatus;
+
+                Console.Write(".");
+            }
+            while (status != TableStatus.ACTIVE);
         }
 
         public void Dispose()
diff --git a/dotnet-test-samples/hexagonal-architecture/tests/GetStock.IntegrationTest/GetStock.IntegrationTest.csproj b/dotnet-test-samples/hexagonal-architecture/tests/GetStock.IntegrationTest/GetStock.IntegrationTest.csproj
@@ -1,26 +1,26 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.10.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.102.22" />
+    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.400.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/dotnet-test-samples/hexagonal-architecture/tests/GetStock.UnitTest/GetStock.UnitTest.csproj b/dotnet-test-samples/hexagonal-architecture/tests/GetStock.UnitTest/GetStock.UnitTest.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -11,15 +11,15 @@
   <ItemGroup>
     <PackageReference Include="Amazon.Lambda.TestUtilities" Version="2.0.0" />
     <PackageReference Include="Autofac.Extras.FakeItEasy" Version="7.0.0" />
-    <PackageReference Include="FakeItEasy" Version="7.3.1" />
-    <PackageReference Include="FluentAssertions" Version="6.10.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="FakeItEasy" Version="8.3.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public async Task<StockData> GetStockValueAsync(string stockId)`
`28`	`28`	`}`
`29`	`29`	`var jsonString = document.ToJson();`
`30`	`30`
`31`		`- return JsonSerializer.Deserialize<StockData>(jsonString);`
	`31`	`+ return JsonSerializer.Deserialize<StockData>(jsonString)!;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ private static ServiceProvider InitializeServiceProvider()`
`44`	`44`
`45`	`45`	`public class Functions`
`46`	`46`	`{`
`47`		`- private readonly IHttpHandler? _handler;`
	`47`	`+ private readonly IHttpHandler _handler;`
`48`	`48`
`49`	`49`	`public Functions()`
`50`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,8 @@`
`7`	`7`
`8`	`8`	`namespace GetStock.IntegrationTest.Adapters;`
`9`	`9`
`10`		`-public class StockDynamoDbTests : DynamoDbTestBase`
	`10`	`+public class StockDynamoDbTests(DynamoDbFixture fixture) : DynamoDbTestBase(fixture)`
`11`	`11`	`{`
`12`		`- public StockDynamoDbTests(DynamoDbFixture fixture)`
`13`		`- : base("test-stocks", fixture)`
`14`		`- {`
`15`		`- }`
`16`		`-`
`17`	`12`	`[Fact]`
`18`	`13`	`public async Task GetStockValue_With_StockNotInDb_Should_ThrowStockNotFoundException()`
`19`	`14`	`{`