Fixed namespaces in Application logic and optimistic concurrency tests

oskardudycz · May 1, 2024 · 810da4d · 810da4d
1 parent f0d18a1
commit 810da4d
Show file tree

Hide file tree

Showing 44 changed files with 239 additions and 243 deletions.
diff --git a/EventSourcing.NetCore.sln b/EventSourcing.NetCore.sln
@@ -455,6 +455,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "08-ApplicationLogic.Marten"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "08-ApplicationLogic.Marten.Tests", "Workshops\IntroductionToEventSourcing\Solved\08-ApplicationLogic.Marten.Tests\08-ApplicationLogic.Marten.Tests.csproj", "{9A07F586-2D4B-46F4-AF8F-AF8290AE4A73}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "10-OptimisticConcurrency.Marten.Tests", "Workshops\IntroductionToEventSourcing\10-OptimisticConcurrency.Marten.Tests\10-OptimisticConcurrency.Marten.Tests.csproj", "{E03F9212-A1C3-4E3A-8DB6-C2FE05130C03}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1009,6 +1011,10 @@ Global
 		{9A07F586-2D4B-46F4-AF8F-AF8290AE4A73}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9A07F586-2D4B-46F4-AF8F-AF8290AE4A73}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A07F586-2D4B-46F4-AF8F-AF8290AE4A73}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E03F9212-A1C3-4E3A-8DB6-C2FE05130C03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E03F9212-A1C3-4E3A-8DB6-C2FE05130C03}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E03F9212-A1C3-4E3A-8DB6-C2FE05130C03}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E03F9212-A1C3-4E3A-8DB6-C2FE05130C03}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1194,6 +1200,7 @@ Global
 		{F71C0ED1-0BC5-4B51-A979-605ADF9104AB} = {14C7B928-9D6C-441A-8A1F-0C49173E73EB}
 		{62FE6E28-7226-4CFB-A9F7-1B532FDEE6F9} = {65F6E2BE-B2D4-4E56-B0CB-3062C4882B9E}
 		{9A07F586-2D4B-46F4-AF8F-AF8290AE4A73} = {65F6E2BE-B2D4-4E56-B0CB-3062C4882B9E}
+		{E03F9212-A1C3-4E3A-8DB6-C2FE05130C03} = {14C7B928-9D6C-441A-8A1F-0C49173E73EB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A5F55604-2FF3-43B7-B657-4F18E6E95D3B}

diff --git a/Sample/Helpdesk.Wolverine/Helpdesk.Api/Program.cs b/Sample/Helpdesk.Wolverine/Helpdesk.Api/Program.cs
@@ -4,17 +4,11 @@
 using Helpdesk.Api.Core.Kafka;
 using Helpdesk.Api.Core.SignalR;
 using Helpdesk.Api.Incidents;
-using Helpdesk.Api.Incidents.GettingCustomerIncidents;
-using Helpdesk.Api.Incidents.GettingCustomerIncidentsSummary;
-using Helpdesk.Api.Incidents.GettingDetails;
-using Helpdesk.Api.Incidents.GettingHistory;
-using Helpdesk.Api.Incidents.ResolutionBatch;
 using JasperFx.CodeGeneration;
 using Marten;
 using Marten.Events.Daemon.Resiliency;
 using Marten.Events.Projections;
 using Marten.Exceptions;
-using Marten.Services.Json;
 using Microsoft.AspNetCore.Http.Json;
 using Microsoft.AspNetCore.SignalR;
 using Oakton;

diff --git a/...rcing/08-ApplicationLogic.Marten.Tests/ShoppingCarts/AddProductItemToShoppingCartTests.cs b/...rcing/08-ApplicationLogic.Marten.Tests/ShoppingCarts/AddProductItemToShoppingCartTests.cs
@@ -1,13 +1,12 @@
-using System.Net;
 using ApplicationLogic.Marten.Immutable.ShoppingCarts;
 using Bogus;
 using Ogooreck.API;
 using Xunit;
 using static Ogooreck.API.ApiSpecification;
-using static ApplicationLogic.Marten.Tests.Incidents.Scenarios;
-using static ApplicationLogic.Marten.Tests.Incidents.Fixtures;
+using static ApplicationLogic.Marten.Tests.ShoppingCarts.Scenarios;
+using static ApplicationLogic.Marten.Tests.ShoppingCarts.Fixtures;
 
-namespace ApplicationLogic.Marten.Tests.Incidents;
+namespace ApplicationLogic.Marten.Tests.ShoppingCarts;
 
 public class AddProductItemToShoppingCartTests(ApiSpecification<Program> api):
     IClassFixture<ApiSpecification<Program>>
@@ -22,7 +21,7 @@ public class AddProductItemToShoppingCartTests(ApiSpecification<Program> api):
         api.Given()
             .When(
                 POST,
-                URI(ShoppingCartProductItems(apiPrefix, ClientId, NotExistingShoppingCartId)),
+                URI(ShoppingCartProductItemsUrl(apiPrefix, ClientId, NotExistingShoppingCartId)),
                 BODY(new AddProductRequest(ProductItem))
             )
             .Then(NOT_FOUND);
@@ -37,7 +36,7 @@ public class AddProductItemToShoppingCartTests(ApiSpecification<Program> api):
         api.Given(OpenedShoppingCart(apiPrefix, ClientId))
             .When(
                 POST,
-                URI(ctx => ShoppingCartProductItems(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())),
+                URI(ctx => ShoppingCartProductItemsUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())),
                 BODY(new AddProductRequest(ProductItem))
             )
             .Then(NO_CONTENT);
@@ -55,7 +54,7 @@ public class AddProductItemToShoppingCartTests(ApiSpecification<Program> api):
             )
             .When(
                 POST,
-                URI(ctx => ShoppingCartProductItems(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())),
+                URI(ctx => ShoppingCartProductItemsUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())),
                 BODY(new AddProductRequest(ProductItem))
             )
             .Then(NO_CONTENT);
@@ -74,7 +73,7 @@ public class AddProductItemToShoppingCartTests(ApiSpecification<Program> api):
             )
             .When(
                 POST,
-                URI(ctx => ShoppingCartProductItems(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())),
+                URI(ctx => ShoppingCartProductItemsUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())),
                 BODY(new AddProductRequest(ProductItem))
             )
             .Then(CONFLICT);
@@ -93,7 +92,7 @@ public class AddProductItemToShoppingCartTests(ApiSpecification<Program> api):
             )
             .When(
                 POST,
-                URI(ctx => ShoppingCartProductItems(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())),
+                URI(ctx => ShoppingCartProductItemsUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())),
                 BODY(new AddProductRequest(ProductItem))
             )
             .Then(CONFLICT);
@@ -109,7 +108,7 @@ public class AddProductItemToShoppingCartTests(ApiSpecification<Program> api):
                 OpenedShoppingCart(apiPrefix, ClientId),
                 WithProductItem(apiPrefix, ClientId, ProductItem)
             )
-            .When(GET, URI(ctx => ShoppingCart(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())))
+            .When(GET, URI(ctx => ShoppingCartUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())))
             .Then(OK);
 
     private static readonly Faker Faker = new();

diff --git a/...ToEventSourcing/08-ApplicationLogic.Marten.Tests/ShoppingCarts/CancelShoppingCartTests.cs b/...ToEventSourcing/08-ApplicationLogic.Marten.Tests/ShoppingCarts/CancelShoppingCartTests.cs
@@ -1,13 +1,12 @@
-using System.Net;
 using ApplicationLogic.Marten.Immutable.ShoppingCarts;
 using Bogus;
 using Ogooreck.API;
 using Xunit;
 using static Ogooreck.API.ApiSpecification;
-using static ApplicationLogic.Marten.Tests.Incidents.Scenarios;
-using static ApplicationLogic.Marten.Tests.Incidents.Fixtures;
+using static ApplicationLogic.Marten.Tests.ShoppingCarts.Scenarios;
+using static ApplicationLogic.Marten.Tests.ShoppingCarts.Fixtures;
 
-namespace ApplicationLogic.Marten.Tests.Incidents;
+namespace ApplicationLogic.Marten.Tests.ShoppingCarts;
 
 public class CancelShoppingCartTests(ApiSpecification<Program> api):
     IClassFixture<ApiSpecification<Program>>
@@ -22,7 +21,7 @@ public class CancelShoppingCartTests(ApiSpecification<Program> api):
         api.Given()
             .When(
                 DELETE,
-                URI(ShoppingCart(apiPrefix, ClientId, NotExistingShoppingCartId))
+                URI(ShoppingCartUrl(apiPrefix, ClientId, NotExistingShoppingCartId))
             )
             .Then(NOT_FOUND);
 
@@ -39,7 +38,7 @@ public class CancelShoppingCartTests(ApiSpecification<Program> api):
             )
             .When(
                 DELETE,
-                URI(ctx => ShoppingCart(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
+                URI(ctx => ShoppingCartUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
             )
             .Then(NO_CONTENT);
 
@@ -57,7 +56,7 @@ public class CancelShoppingCartTests(ApiSpecification<Program> api):
             )
             .When(
                 DELETE,
-                URI(ctx => ShoppingCart(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
+                URI(ctx => ShoppingCartUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
             )
             .Then(CONFLICT);
 
@@ -75,7 +74,7 @@ public class CancelShoppingCartTests(ApiSpecification<Program> api):
             )
             .When(
                 DELETE,
-                URI(ctx => ShoppingCart(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
+                URI(ctx => ShoppingCartUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
             )
             .Then(CONFLICT);
 
@@ -91,7 +90,7 @@ public class CancelShoppingCartTests(ApiSpecification<Program> api):
                 WithProductItem(apiPrefix, ClientId, ProductItem),
                 ThenCanceled(apiPrefix, ClientId)
             )
-            .When(GET, URI(ctx => ShoppingCart(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())))
+            .When(GET, URI(ctx => ShoppingCartUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())))
             .Then(OK);
 
     private static readonly Faker Faker = new();

diff --git a/...oEventSourcing/08-ApplicationLogic.Marten.Tests/ShoppingCarts/ConfirmShoppingCartTests.cs b/...oEventSourcing/08-ApplicationLogic.Marten.Tests/ShoppingCarts/ConfirmShoppingCartTests.cs
@@ -1,13 +1,12 @@
-using System.Net;
 using ApplicationLogic.Marten.Immutable.ShoppingCarts;
 using Bogus;
 using Ogooreck.API;
 using Xunit;
 using static Ogooreck.API.ApiSpecification;
-using static ApplicationLogic.Marten.Tests.Incidents.Scenarios;
-using static ApplicationLogic.Marten.Tests.Incidents.Fixtures;
+using static ApplicationLogic.Marten.Tests.ShoppingCarts.Scenarios;
+using static ApplicationLogic.Marten.Tests.ShoppingCarts.Fixtures;
 
-namespace ApplicationLogic.Marten.Tests.Incidents;
+namespace ApplicationLogic.Marten.Tests.ShoppingCarts;
 
 public class ConfirmShoppingCartTests(ApiSpecification<Program> api):
     IClassFixture<ApiSpecification<Program>>
@@ -22,7 +21,7 @@ public class ConfirmShoppingCartTests(ApiSpecification<Program> api):
         api.Given()
             .When(
                 POST,
-                URI(ConfirmShoppingCart(apiPrefix, ClientId, NotExistingShoppingCartId))
+                URI(ConfirmShoppingCartUrl(apiPrefix, ClientId, NotExistingShoppingCartId))
             )
             .Then(NOT_FOUND);
 
@@ -36,7 +35,7 @@ public class ConfirmShoppingCartTests(ApiSpecification<Program> api):
         api.Given(OpenedShoppingCart(apiPrefix, ClientId))
             .When(
                 POST,
-                URI(ctx => ConfirmShoppingCart(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
+                URI(ctx => ConfirmShoppingCartUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
             )
             .Then(CONFLICT);
 
@@ -53,7 +52,7 @@ public class ConfirmShoppingCartTests(ApiSpecification<Program> api):
             )
             .When(
                 POST,
-                URI(ctx => ConfirmShoppingCart(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
+                URI(ctx => ConfirmShoppingCartUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
             )
             .Then(NO_CONTENT);
 
@@ -71,7 +70,7 @@ public class ConfirmShoppingCartTests(ApiSpecification<Program> api):
             )
             .When(
                 POST,
-                URI(ctx => ConfirmShoppingCart(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
+                URI(ctx => ConfirmShoppingCartUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
             )
             .Then(CONFLICT);
 
@@ -89,7 +88,7 @@ public class ConfirmShoppingCartTests(ApiSpecification<Program> api):
             )
             .When(
                 POST,
-                URI(ctx => ConfirmShoppingCart(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
+                URI(ctx => ConfirmShoppingCartUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>()))
             )
             .Then(CONFLICT);
 
@@ -105,7 +104,7 @@ public class ConfirmShoppingCartTests(ApiSpecification<Program> api):
                 WithProductItem(apiPrefix, ClientId, ProductItem),
                 ThenConfirmed(apiPrefix, ClientId)
             )
-            .When(GET, URI(ctx => ShoppingCart(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())))
+            .When(GET, URI(ctx => ShoppingCartUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())))
             .Then(OK);
 
     private static readonly Faker Faker = new();

diff --git a/...ps/IntroductionToEventSourcing/08-ApplicationLogic.Marten.Tests/ShoppingCarts/Fixtures.cs b/...ps/IntroductionToEventSourcing/08-ApplicationLogic.Marten.Tests/ShoppingCarts/Fixtures.cs
@@ -2,50 +2,50 @@
 using Ogooreck.API;
 using static Ogooreck.API.ApiSpecification;
 
-namespace ApplicationLogic.Marten.Tests.Incidents;
+namespace ApplicationLogic.Marten.Tests.ShoppingCarts;
 
 public static class Fixtures
 {
-    public static string Clients(string apiPrefix, Guid clientId) => $"/api/{apiPrefix}/clients/{clientId}/";
+    public static string ClientsUrl(string apiPrefix, Guid clientId) => $"/api/{apiPrefix}/clients/{clientId}/";
 
-    public static string ShoppingCarts(string apiPrefix, Guid clientId) =>
-        $"{Clients(apiPrefix, clientId)}shopping-carts/";
+    public static string ShoppingCartsUrl(string apiPrefix, Guid clientId) =>
+        $"{ClientsUrl(apiPrefix, clientId)}shopping-carts/";
 
-    public static string ShoppingCart(string apiPrefix, Guid clientId, Guid shoppingCartId) =>
-        $"{ShoppingCarts(apiPrefix, clientId)}{shoppingCartId}/";
+    public static string ShoppingCartUrl(string apiPrefix, Guid clientId, Guid shoppingCartId) =>
+        $"{ShoppingCartsUrl(apiPrefix, clientId)}{shoppingCartId}/";
 
-    public static string ConfirmShoppingCart(string apiPrefix, Guid clientId, Guid shoppingCartId) =>
-        $"{ShoppingCart(apiPrefix, clientId, shoppingCartId)}confirm";
+    public static string ConfirmShoppingCartUrl(string apiPrefix, Guid clientId, Guid shoppingCartId) =>
+        $"{ShoppingCartUrl(apiPrefix, clientId, shoppingCartId)}confirm";
 
-    public static string ShoppingCartProductItems(string apiPrefix, Guid clientId, Guid shoppingCartId) =>
-        $"{ShoppingCart(apiPrefix, clientId, shoppingCartId)}product-items/";
+    public static string ShoppingCartProductItemsUrl(string apiPrefix, Guid clientId, Guid shoppingCartId) =>
+        $"{ShoppingCartUrl(apiPrefix, clientId, shoppingCartId)}product-items/";
 
-    public static string ShoppingCartProductItem(string apiPrefix, Guid clientId, Guid shoppingCartId, Guid productId,
+    public static string ShoppingCartProductItemUrl(string apiPrefix, Guid clientId, Guid shoppingCartId, Guid productId,
         int quantity = 1, decimal unitPrice = 100) =>
-        $"{ShoppingCartProductItems(apiPrefix, clientId, shoppingCartId)}{productId}?unitPrice={unitPrice}&quantity={quantity}";
+        $"{ShoppingCartProductItemsUrl(apiPrefix, clientId, shoppingCartId)}{productId}?unitPrice={unitPrice}&quantity={quantity}";
 }
 
 public static class Scenarios
 {
     public static RequestDefinition OpenedShoppingCart(string apiPrefix, Guid clientId) =>
-        SEND(POST, URI(Fixtures.ShoppingCarts(apiPrefix, clientId)));
+        SEND(POST, URI(Fixtures.ShoppingCartsUrl(apiPrefix, clientId)));
 
     public static RequestDefinition WithProductItem(string apiPrefix, Guid clientId, ProductItemRequest productItem) =>
         SEND(
             POST,
-            URI(ctx => Fixtures.ShoppingCartProductItems(apiPrefix, clientId, ctx.GetCreatedId<Guid>())),
+            URI(ctx => Fixtures.ShoppingCartProductItemsUrl(apiPrefix, clientId, ctx.GetCreatedId<Guid>())),
             BODY(new AddProductRequest(productItem))
         );
 
     public static RequestDefinition ThenConfirmed(string apiPrefix, Guid clientId) =>
         SEND(
             POST,
-            URI(ctx => Fixtures.ConfirmShoppingCart(apiPrefix, clientId, ctx.GetCreatedId<Guid>()))
+            URI(ctx => Fixtures.ConfirmShoppingCartUrl(apiPrefix, clientId, ctx.GetCreatedId<Guid>()))
         );
 
     public static RequestDefinition ThenCanceled(string apiPrefix, Guid clientId) =>
         SEND(
             DELETE,
-            URI(ctx => Fixtures.ShoppingCart(apiPrefix, clientId, ctx.GetCreatedId<Guid>()))
+            URI(ctx => Fixtures.ShoppingCartUrl(apiPrefix, clientId, ctx.GetCreatedId<Guid>()))
         );
 }
diff --git a/...onToEventSourcing/08-ApplicationLogic.Marten.Tests/ShoppingCarts/OpenShoppingCartTests.cs b/...onToEventSourcing/08-ApplicationLogic.Marten.Tests/ShoppingCarts/OpenShoppingCartTests.cs
@@ -1,10 +1,10 @@
 using Ogooreck.API;
 using Xunit;
 using static Ogooreck.API.ApiSpecification;
-using static ApplicationLogic.Marten.Tests.Incidents.Scenarios;
-using static ApplicationLogic.Marten.Tests.Incidents.Fixtures;
+using static ApplicationLogic.Marten.Tests.ShoppingCarts.Scenarios;
+using static ApplicationLogic.Marten.Tests.ShoppingCarts.Fixtures;
 
-namespace ApplicationLogic.Marten.Tests.Incidents;
+namespace ApplicationLogic.Marten.Tests.ShoppingCarts;
 
 public class OpenShoppingCartTests(ApiSpecification<Program> api):
     IClassFixture<ApiSpecification<Program>>
@@ -17,8 +17,8 @@ public class OpenShoppingCartTests(ApiSpecification<Program> api):
     [InlineData("mixed")]
     public Task OpensShoppingCart(string apiPrefix) =>
         api.Given()
-            .When(POST, URI(ShoppingCarts(apiPrefix, ClientId)))
-            .Then(CREATED_WITH_DEFAULT_HEADERS(locationHeaderPrefix: ShoppingCarts(apiPrefix, ClientId)));
+            .When(POST, URI(ShoppingCartsUrl(apiPrefix, ClientId)))
+            .Then(CREATED_WITH_DEFAULT_HEADERS(locationHeaderPrefix: ShoppingCartsUrl(apiPrefix, ClientId)));
 
 
     [Theory]
@@ -28,7 +28,7 @@ public class OpenShoppingCartTests(ApiSpecification<Program> api):
     [InlineData("mixed")]
     public Task ReturnsOpenedShoppingCart(string apiPrefix) =>
         api.Given(OpenedShoppingCart(apiPrefix, ClientId))
-            .When(GET, URI(ctx => ShoppingCart(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())))
+            .When(GET, URI(ctx => ShoppingCartUrl(apiPrefix, ClientId, ctx.GetCreatedId<Guid>())))
             .Then(OK);
 
     private readonly Guid ClientId = Guid.NewGuid();