Added slimmed mutable aggregate solution

oskardudycz · May 3, 2024 · 2331165 · 2331165
1 parent ccea289
commit 2331165
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 95 deletions.
diff --git a/Workshops/IntroductionToEventSourcing/07-BusinessLogic.Slimmed/Mutable/ShoppingCart.cs b/Workshops/IntroductionToEventSourcing/07-BusinessLogic.Slimmed/Mutable/ShoppingCart.cs
@@ -98,7 +98,6 @@ private ShoppingCart(Guid id, Guid clientId, DateTimeOffset now)
         var @event = new ShoppingCartOpened(id, clientId, now);
 
         Enqueue(@event);
-        Apply(@event);
     }
 
     //just for default creation of empty object
@@ -126,7 +125,6 @@ DateTimeOffset now
         var @event = new ProductItemAddedToShoppingCart(Id, pricedProductItem, now);
 
         Enqueue(@event);
-        Apply(@event);
     }
 
     private void Apply(ProductItemAddedToShoppingCart productItemAdded)
@@ -160,7 +158,6 @@ public void RemoveProduct(PricedProductItem productItemToBeRemoved, DateTimeOffs
         var @event = new ProductItemRemovedFromShoppingCart(Id, productItemToBeRemoved, now);
 
         Enqueue(@event);
-        Apply(@event);
     }
 
     private bool HasEnough(PricedProductItem productItem)
@@ -202,7 +199,6 @@ public void Confirm(DateTimeOffset now)
         var @event = new ShoppingCartConfirmed(Id, now);
 
         Enqueue(@event);
-        Apply(@event);
     }
 
     private void Apply(ShoppingCartConfirmed confirmed)
@@ -220,7 +216,6 @@ public void Cancel(DateTimeOffset now)
         var @event = new ShoppingCartCanceled(Id, now);
 
         Enqueue(@event);
-        Apply(@event);
     }
 
     private void Apply(ShoppingCartCanceled canceled)

diff --git a/...troductionToEventSourcing/Solved/07-BusinessLogic.Slimmed/Immutable/BusinessLogicTests.cs b/...troductionToEventSourcing/Solved/07-BusinessLogic.Slimmed/Immutable/BusinessLogicTests.cs
@@ -1,4 +1,4 @@
-using IntroductionToEventSourcing.BusinessLogic.Slimmed.Immutable.Products;
+using IntroductionToEventSourcing.BusinessLogic.Slimmed.Immutable.Pricing;
 using Ogooreck.BusinessLogic;
 using Xunit;
 

diff --git a/...d/Immutable/Products/PricingCalculator.cs → ...ed/Immutable/Pricing/PricingCalculator.cs b/...d/Immutable/Products/PricingCalculator.cs → ...ed/Immutable/Pricing/PricingCalculator.cs
@@ -1,4 +1,4 @@
-namespace IntroductionToEventSourcing.BusinessLogic.Slimmed.Immutable.Products;
+namespace IntroductionToEventSourcing.BusinessLogic.Slimmed.Immutable.Pricing;
 
 public interface IProductPriceCalculator
 {

diff --git a/...limmed/Immutable/Products/ProductItems.cs → ...Slimmed/Immutable/Pricing/ProductItems.cs b/...limmed/Immutable/Products/ProductItems.cs → ...Slimmed/Immutable/Pricing/ProductItems.cs
@@ -1,7 +1,7 @@
 using System.Collections.Immutable;
 using IntroductionToEventSourcing.BusinessLogic.Slimmed.Tools;
 
-namespace IntroductionToEventSourcing.BusinessLogic.Slimmed.Immutable.Products;
+namespace IntroductionToEventSourcing.BusinessLogic.Slimmed.Immutable.Pricing;
 
 using ProductId = Guid;
 using ProductIdWithPrice = string;

diff --git a/...ops/IntroductionToEventSourcing/Solved/07-BusinessLogic.Slimmed/Immutable/ShoppingCart.cs b/...ops/IntroductionToEventSourcing/Solved/07-BusinessLogic.Slimmed/Immutable/ShoppingCart.cs
@@ -1,4 +1,4 @@
-using IntroductionToEventSourcing.BusinessLogic.Slimmed.Immutable.Products;
+using IntroductionToEventSourcing.BusinessLogic.Slimmed.Immutable.Pricing;
 
 namespace IntroductionToEventSourcing.BusinessLogic.Slimmed.Immutable;
 

diff --git a/...roductionToEventSourcing/Solved/07-BusinessLogic.Slimmed/Immutable/ShoppingCartService.cs b/...roductionToEventSourcing/Solved/07-BusinessLogic.Slimmed/Immutable/ShoppingCartService.cs
@@ -1,4 +1,4 @@
-using IntroductionToEventSourcing.BusinessLogic.Slimmed.Immutable.Products;
+using IntroductionToEventSourcing.BusinessLogic.Slimmed.Immutable.Pricing;
 
 namespace IntroductionToEventSourcing.BusinessLogic.Slimmed.Immutable;
 

diff --git a/...IntroductionToEventSourcing/Solved/07-BusinessLogic.Slimmed/Mutable/BusinessLogicTests.cs b/...IntroductionToEventSourcing/Solved/07-BusinessLogic.Slimmed/Mutable/BusinessLogicTests.cs
@@ -1,3 +1,4 @@
+using IntroductionToEventSourcing.BusinessLogic.Slimmed.Mutable.Pricing;
 using Ogooreck.BusinessLogic;
 using Xunit;
 
@@ -12,9 +13,9 @@ public class BusinessLogicTests
     public void OpensShoppingCart() =>
         Spec.Given([])
             .When(() =>
-                ShoppingCart.Open(shoppingCartId, clientId, now)
+                ShoppingCart.Open(clientId, now)
             )
-            .Then(new ShoppingCartOpened(shoppingCartId, clientId, now));
+            .Then(new Opened(clientId, now));
 
     // Add
     [Fact]
@@ -32,7 +33,7 @@ public class BusinessLogicTests
     [Fact]
     public void AddsProductItemToEmptyShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now)
+                new Opened(clientId, now)
             ])
             .When(state =>
                 state.AddProduct(
@@ -42,9 +43,7 @@ public class BusinessLogicTests
                 )
             )
             .Then(
-                new ProductItemAddedToShoppingCart(
-                    shoppingCartId,
-                    new PricedProductItem
+                new ProductItemAdded(new PricedProductItem
                     {
                         ProductId = ProductItem().ProductId, Quantity = ProductItem().Quantity, UnitPrice = Price
                     },
@@ -56,8 +55,8 @@ public class BusinessLogicTests
     [Fact]
     public void AddsProductItemToNonEmptyShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
-                new ProductItemAddedToShoppingCart(shoppingCartId, PricedProductItem(), now),
+                new Opened(clientId, now),
+                new ProductItemAdded(PricedProductItem(), now),
             ])
             .When(state =>
                 state.AddProduct(
@@ -67,9 +66,7 @@ public class BusinessLogicTests
                 )
             )
             .Then(
-                new ProductItemAddedToShoppingCart(
-                    shoppingCartId,
-                    new PricedProductItem
+                new ProductItemAdded(new PricedProductItem
                     {
                         ProductId = OtherProductItem().ProductId,
                         Quantity = OtherProductItem().Quantity,
@@ -82,9 +79,9 @@ public class BusinessLogicTests
     [Fact]
     public void CantAddProductItemToConfirmedShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
-                new ProductItemAddedToShoppingCart(shoppingCartId, PricedProductItem(), now),
-                new ShoppingCartConfirmed(shoppingCartId, now)
+                new Opened(clientId, now),
+                new ProductItemAdded(PricedProductItem(), now),
+                new Confirmed(now)
             ])
             .When(state =>
                 state.AddProduct(
@@ -98,9 +95,9 @@ public class BusinessLogicTests
     [Fact]
     public void CantAddProductItemToCanceledShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
-                new ProductItemAddedToShoppingCart(shoppingCartId, PricedProductItem(), now),
-                new ShoppingCartCanceled(shoppingCartId, now)
+                new Opened(clientId, now),
+                new ProductItemAdded(PricedProductItem(), now),
+                new Canceled(now)
             ])
             .When(state =>
                 state.AddProduct(
@@ -123,25 +120,23 @@ public class BusinessLogicTests
     [Fact]
     public void RemovesExistingProductItemFromShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
-                new ProductItemAddedToShoppingCart(shoppingCartId, PricedProductItem(), now),
+                new Opened(clientId, now),
+                new ProductItemAdded(PricedProductItem(), now),
             ])
             .When(state =>
                 state.RemoveProduct(PricedProductItemWithQuantity(1), now)
             )
             .Then(
-                new ProductItemRemovedFromShoppingCart(
-                    shoppingCartId,
-                    PricedProductItemWithQuantity(1),
+                new ProductItemRemoved(PricedProductItemWithQuantity(1),
                     now
                 )
             );
 
     [Fact]
     public void CantRemoveNonExistingProductItemFromNonEmptyShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
-                new ProductItemAddedToShoppingCart(shoppingCartId, OtherPricedProductItem(), now),
+                new Opened(clientId, now),
+                new ProductItemAdded(OtherPricedProductItem(), now),
             ])
             .When(state =>
                 state.RemoveProduct(PricedProductItemWithQuantity(1), now)
@@ -151,9 +146,9 @@ public class BusinessLogicTests
     [Fact]
     public void CantRemoveExistingProductItemFromCanceledShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
-                new ProductItemAddedToShoppingCart(shoppingCartId, PricedProductItem(), now),
-                new ShoppingCartConfirmed(shoppingCartId, now)
+                new Opened(clientId, now),
+                new ProductItemAdded(PricedProductItem(), now),
+                new Confirmed(now)
             ])
             .When(state =>
                 state.RemoveProduct(PricedProductItemWithQuantity(1), now)
@@ -163,9 +158,9 @@ public class BusinessLogicTests
     [Fact]
     public void CantRemoveExistingProductItemFromConfirmedShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
-                new ProductItemAddedToShoppingCart(shoppingCartId, PricedProductItem(), now),
-                new ShoppingCartCanceled(shoppingCartId, now)
+                new Opened(clientId, now),
+                new ProductItemAdded(PricedProductItem(), now),
+                new Canceled(now)
             ])
             .When(state =>
                 state.RemoveProduct(PricedProductItemWithQuantity(1), now)
@@ -185,7 +180,7 @@ public class BusinessLogicTests
     [Trait("Category", "SkipCI")]
     public void CantConfirmEmptyShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
+                new Opened(clientId, now),
             ])
             .When(state =>
                 state.Confirm(now)
@@ -195,22 +190,22 @@ public class BusinessLogicTests
     [Fact]
     public void ConfirmsNonEmptyShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
-                new ProductItemAddedToShoppingCart(shoppingCartId, PricedProductItem(), now),
+                new Opened(clientId, now),
+                new ProductItemAdded(PricedProductItem(), now),
             ])
             .When(state =>
                 state.Confirm(now)
             )
             .Then(
-                new ShoppingCartConfirmed(shoppingCartId, now)
+                new Confirmed(now)
             );
 
     [Fact]
     public void CantConfirmAlreadyConfirmedShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
-                new ProductItemAddedToShoppingCart(shoppingCartId, PricedProductItem(), now),
-                new ShoppingCartConfirmed(shoppingCartId, now)
+                new Opened(clientId, now),
+                new ProductItemAdded(PricedProductItem(), now),
+                new Confirmed(now)
             ])
             .When(state =>
                 state.Confirm(now)
@@ -220,9 +215,9 @@ public class BusinessLogicTests
     [Fact]
     public void CantConfirmCanceledShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
-                new ProductItemAddedToShoppingCart(shoppingCartId, PricedProductItem(), now),
-                new ShoppingCartCanceled(shoppingCartId, now)
+                new Opened(clientId, now),
+                new ProductItemAdded(PricedProductItem(), now),
+                new Canceled(now)
             ])
             .When(state =>
                 state.Confirm(now)
@@ -242,7 +237,7 @@ public class BusinessLogicTests
     [Fact]
     public void CancelsEmptyShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
+                new Opened(clientId, now),
             ])
             .When(state =>
                 state.Cancel(now)
@@ -252,22 +247,22 @@ public class BusinessLogicTests
     [Fact]
     public void CancelsNonEmptyShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
-                new ProductItemAddedToShoppingCart(shoppingCartId, PricedProductItem(), now),
+                new Opened(clientId, now),
+                new ProductItemAdded(PricedProductItem(), now),
             ])
             .When(state =>
                 state.Cancel(now)
             )
             .Then(
-                new ShoppingCartCanceled(shoppingCartId, now)
+                new Canceled(now)
             );
 
     [Fact]
     public void CantCancelAlreadyCanceledShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
-                new ProductItemAddedToShoppingCart(shoppingCartId, PricedProductItem(), now),
-                new ShoppingCartCanceled(shoppingCartId, now)
+                new Opened(clientId, now),
+                new ProductItemAdded(PricedProductItem(), now),
+                new Canceled(now)
             ])
             .When(state =>
                 state.Cancel(now)
@@ -277,9 +272,9 @@ public class BusinessLogicTests
     [Fact]
     public void CantCancelConfirmedShoppingCart() =>
         Spec.Given([
-                new ShoppingCartOpened(shoppingCartId, clientId, now),
-                new ProductItemAddedToShoppingCart(shoppingCartId, PricedProductItem(), now),
-                new ShoppingCartConfirmed(shoppingCartId, now)
+                new Opened(clientId, now),
+                new ProductItemAdded(PricedProductItem(), now),
+                new Confirmed(now)
             ])
             .When(state =>
                 state.Cancel(now)

diff --git a/...ogic.Slimmed/Mutable/PricingCalculator.cs → ...mmed/Mutable/Pricing/PricingCalculator.cs b/...ogic.Slimmed/Mutable/PricingCalculator.cs → ...mmed/Mutable/Pricing/PricingCalculator.cs
@@ -1,4 +1,4 @@
-namespace IntroductionToEventSourcing.BusinessLogic.Slimmed.Mutable;
+namespace IntroductionToEventSourcing.BusinessLogic.Slimmed.Mutable.Pricing;
 
 public interface IProductPriceCalculator
 {