Fixed ECommerce Marten sample

Author: oskardudycz

Core.Marten/MartenConfig.cs

@@ -101,9 +101,8 @@ private static StoreOptions SetStoreOptions(
         options.Events.DatabaseSchemaName = schemaName ?? martenConfig.WriteModelSchema;
         options.DatabaseSchemaName = schemaName ?? martenConfig.ReadModelSchema;
 
-        options.UseNewtonsoftForSerialization(
-            EnumStorage.AsString,
-            nonPublicMembersStorage: NonPublicMembersStorage.All
+        options.UseSystemTextJsonForSerialization(
+            EnumStorage.AsString
         );
 
         options.Events.StreamIdentity = StreamIdentity.AsString;

Core.Testing/TestWebApplicationFactory.cs

@@ -21,14 +21,6 @@ public class TestWebApplicationFactory<TProject>: WebApplicationFactory<TProject
 
     protected override IHost CreateHost(IHostBuilder builder)
     {
-        builder.ConfigureAppConfiguration((_, config) =>
-        {
-            config.AddInMemoryCollection(new Dictionary<string, string?>
-            {
-                ["ConnectionStrings:kafka"] = "localhost:9092"
-            });
-        });
-
         builder.ConfigureServices(services =>
         {
             services
@@ -45,7 +37,7 @@ protected override IHost CreateHost(IHostBuilder builder)
                 .AddSingleton<IExternalEventConsumer, DummyExternalEventConsumer>();
         });
 
-
+        Environment.SetEnvironmentVariable("ConnectionStrings__kafka", "localhost:9092");
         Environment.SetEnvironmentVariable("SchemaName", schemaName);
 
         return Policy.Handle<Exception>()

Sample/ECommerce/Carts/Carts/ShoppingCarts/GettingCartById/ShoppingCartDetails.cs

@@ -80,7 +80,7 @@ public void Apply(ShoppingCartCanceled @event) =>
             .SingleOrDefault(pi => pi.MatchesProductAndPrice(productItem));
 }
 
-public class CartDetailsProjection : SingleStreamProjection<ShoppingCartDetails, string>
+public class CartDetailsProjection : SingleStreamProjection<ShoppingCartDetails, Guid>
 {
     public CartDetailsProjection()
     {

Sample/ECommerce/Carts/Carts/ShoppingCarts/GettingCarts/ShoppingCartShortInfo.cs

@@ -43,7 +43,7 @@ public void Apply(ShoppingCartCanceled @event)
     }
 }
 
-public class CartShortInfoProjection : SingleStreamProjection<ShoppingCartShortInfo, string>
+public class CartShortInfoProjection : SingleStreamProjection<ShoppingCartShortInfo, Guid>
 {
     public CartShortInfoProjection()
     {

Sample/ECommerce/Carts/Carts/ShoppingCarts/Products/PricedProductItem.cs

@@ -1,3 +1,5 @@
+using System.Text.Json.Serialization;
+
 namespace Carts.ShoppingCarts.Products;
 
 public record PricedProductItem
@@ -11,6 +13,7 @@ public record PricedProductItem
     public decimal TotalPrice => Quantity * UnitPrice;
     public ProductItem ProductItem { get; }
 
+    [JsonConstructor]
     private PricedProductItem(ProductItem productItem, decimal unitPrice)
     {
         ProductItem = productItem;

Sample/ECommerce/Carts/Carts/ShoppingCarts/Products/ProductItem.cs

@@ -1,3 +1,5 @@
+using System.Text.Json.Serialization;
+
 namespace Carts.ShoppingCarts.Products;
 
 public record ProductItem
@@ -6,6 +8,7 @@ public record ProductItem
 
     public int Quantity { get; }
 
+    [JsonConstructor]
     private ProductItem(Guid productId, int quantity)
     {
         ProductId = productId;

Sample/ECommerce/Carts/Carts/ShoppingCarts/ShoppingCart.cs

@@ -12,37 +12,21 @@ namespace Carts.ShoppingCarts;
 
 public class ShoppingCart: Aggregate
 {
-    public Guid ClientId { get; private set; }
+    public Guid ClientId { get; set; }
 
-    public ShoppingCartStatus Status { get; private set; }
+    public ShoppingCartStatus Status { get; set; }
 
-    public IList<PricedProductItem> ProductItems { get; private set; } = null!;
+    public IList<PricedProductItem> ProductItems { get; set; } = new List<PricedProductItem>();
 
     public decimal TotalPrice => ProductItems.Sum(pi => pi.TotalPrice);
 
-    public static ShoppingCart Open(Guid cartId, Guid clientId) => new(cartId, clientId);
-
-    public ShoppingCart(){}
-
-    private ShoppingCart(
-        Guid id,
-        Guid clientId)
+    public static ShoppingCart Open(Guid cartId, Guid clientId)
     {
-        var @event = ShoppingCartOpened.Create(
-            id,
-            clientId
-        );
+        var shoppingCart = new ShoppingCart();
 
-        Enqueue(@event);
-        Apply(@event);
-    }
+        shoppingCart.Enqueue(ShoppingCartOpened.Create(cartId, clientId));
 
-    public void Apply(ShoppingCartOpened @event)
-    {
-        Id = @event.CartId;
-        ClientId = @event.ClientId;
-        ProductItems = new List<PricedProductItem>();
-        Status = ShoppingCartStatus.Pending;
+        return shoppingCart;
     }
 
     public void AddProduct(
@@ -54,28 +38,7 @@ public void AddProduct(
 
         var pricedProductItem = productPriceCalculator.Calculate(productItem).Single();
 
-        var @event = ProductAdded.Create(Id, pricedProductItem);
-
-        Enqueue(@event);
-        Apply(@event);
-    }
-
-    public void Apply(ProductAdded @event)
-    {
-        var newProductItem = @event.ProductItem;
-
-        var existingProductItem = FindProductItemMatchingWith(newProductItem);
-
-        if (existingProductItem is null)
-        {
-            ProductItems.Add(newProductItem);
-            return;
-        }
-
-        ProductItems.Replace(
-            existingProductItem,
-            existingProductItem.MergeWith(newProductItem)
-        );
+        Enqueue(ProductAdded.Create(Id, pricedProductItem));
     }
 
     public void RemoveProduct(
@@ -92,31 +55,7 @@ public void RemoveProduct(
         if(!existingProductItem.HasEnough(productItemToBeRemoved.Quantity))
             throw new InvalidOperationException($"Cannot remove {productItemToBeRemoved.Quantity} items of Product with id `{productItemToBeRemoved.ProductId}` as there are only ${existingProductItem.Quantity} items in card");
 
-        var @event = ProductRemoved.Create(Id, productItemToBeRemoved);
-
-        Enqueue(@event);
-        Apply(@event);
-    }
-
-    public void Apply(ProductRemoved @event)
-    {
-        var productItemToBeRemoved = @event.ProductItem;
-
-        var existingProductItem = FindProductItemMatchingWith(@event.ProductItem);
-
-        if (existingProductItem == null)
-            return;
-
-        if (existingProductItem.HasTheSameQuantity(productItemToBeRemoved))
-        {
-            ProductItems.Remove(existingProductItem);
-            return;
-        }
-
-        ProductItems.Replace(
-            existingProductItem,
-            existingProductItem.Subtract(productItemToBeRemoved)
-        );
+        Enqueue(ProductRemoved.Create(Id, productItemToBeRemoved));
     }
 
     public void Confirm()
@@ -127,30 +66,52 @@ public void Confirm()
         if (ProductItems.Count == 0)
             throw new InvalidOperationException($"Confirming empty cart is not allowed.");
 
-        var @event = ShoppingCartConfirmed.Create(Id, DateTime.UtcNow);
-
-        Enqueue(@event);
-        Apply(@event);
-    }
-
-    public void Apply(ShoppingCartConfirmed @event)
-    {
-        Status = ShoppingCartStatus.Confirmed;
+        Enqueue(ShoppingCartConfirmed.Create(Id, DateTime.UtcNow));
     }
 
     public void Cancel()
     {
         if(Status != ShoppingCartStatus.Pending)
             throw new InvalidOperationException($"Canceling cart in '{Status}' status is not allowed.");
 
-        var @event = ShoppingCartCanceled.Create(Id, DateTime.UtcNow);
-
-        Enqueue(@event);
-        Apply(@event);
+        Enqueue(ShoppingCartCanceled.Create(Id, DateTime.UtcNow));
     }
 
-    public void Apply(ShoppingCartCanceled @event) =>
-        Status = ShoppingCartStatus.Canceled;
+    public override void Apply(object @event)
+    {
+        switch (@event)
+        {
+            case ShoppingCartOpened opened:
+                Id = opened.CartId;
+                ClientId = opened.ClientId;
+                ProductItems = new List<PricedProductItem>();
+                Status = ShoppingCartStatus.Pending;
+                break;
+            case ProductAdded productAdded:
+                var newProductItem = productAdded.ProductItem;
+                var existing = FindProductItemMatchingWith(newProductItem);
+                if (existing is null)
+                    ProductItems.Add(newProductItem);
+                else
+                    ProductItems.Replace(existing, existing.MergeWith(newProductItem));
+                break;
+            case ProductRemoved productRemoved:
+                var toRemove = productRemoved.ProductItem;
+                var found = FindProductItemMatchingWith(toRemove);
+                if (found == null) break;
+                if (found.HasTheSameQuantity(toRemove))
+                    ProductItems.Remove(found);
+                else
+                    ProductItems.Replace(found, found.Subtract(toRemove));
+                break;
+            case ShoppingCartConfirmed:
+                Status = ShoppingCartStatus.Confirmed;
+                break;
+            case ShoppingCartCanceled:
+                Status = ShoppingCartStatus.Canceled;
+                break;
+        }
+    }
 
     private PricedProductItem? FindProductItemMatchingWith(PricedProductItem productItem) =>
         ProductItems

Sample/ECommerce/Orders/Orders.Api.Tests/Orders/InitializingOrder/InitializeOrderTests.cs

@@ -14,7 +14,7 @@ public class InitializeOrderTests
 
     [Fact]
     [Trait("Category", "Acceptance")]
-    public Task InitializeOrder_ShouldReturn_CreatedStatus_With_OrderId() =>
+    public Task InitializeOrder_ShouldReturn_CreatedStatuudes_With_OrderId() =>
         API.Given()
             .When(
                 POST,

Sample/ECommerce/Orders/Orders/Orders/GettingOrderStatus/OrderDetails.cs

@@ -68,7 +68,7 @@ public static EventsWrapper From(IEvent @event) =>
         new((int)@event.Version, @event.EventTypeName, @event.Data, @event.Timestamp);
 }
 
-public class OrderDetailsProjection: SingleStreamProjection<OrderDetails, string>
+public class OrderDetailsProjection: SingleStreamProjection<OrderDetails, Guid>
 {
     public void Apply(IEvent<OrderInitiated> envelope, OrderDetails details) =>
         details.Apply(envelope);

Sample/ECommerce/Orders/Orders/Orders/GettingPendingOrders/PendingOrder.cs

@@ -14,7 +14,7 @@ public void Apply(OrderInitiated @event) =>
 }
 
 
-public class PendingOrdersProjection: SingleStreamProjection<PendingOrder, string>
+public class PendingOrdersProjection: SingleStreamProjection<PendingOrder, Guid>
 {
     public PendingOrdersProjection()
     {