Updated Marten aggregates to have Version applied by convention

oskardudycz · May 28, 2022 · 7b95e6f · 7b95e6f
1 parent 96a4c22
commit 7b95e6f
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 73 deletions.
diff --git a/Core.Marten/Repository/MartenRepository.cs b/Core.Marten/Repository/MartenRepository.cs
@@ -8,8 +8,12 @@ public interface IMartenRepository<T> where T : class, IAggregate
 {
     Task<T?> Find(Guid id, CancellationToken cancellationToken);
     Task<long> Add(T aggregate, TraceMetadata? eventMetadata = null, CancellationToken cancellationToken = default);
-    Task<long> Update(T aggregate, long? expectedVersion = null, TraceMetadata? traceMetadata = null, CancellationToken cancellationToken = default);
-    Task<long> Delete(T aggregate, long? expectedVersion = null, TraceMetadata? eventMetadata = null, CancellationToken cancellationToken = default);
+
+    Task<long> Update(T aggregate, long? expectedVersion = null, TraceMetadata? traceMetadata = null,
+        CancellationToken cancellationToken = default);
+
+    Task<long> Delete(T aggregate, long? expectedVersion = null, TraceMetadata? eventMetadata = null,
+        CancellationToken cancellationToken = default);
 }
 
 public class MartenRepository<T>: IMartenRepository<T> where T : class, IAggregate
@@ -26,7 +30,8 @@ IDocumentSession documentSession
     public Task<T?> Find(Guid id, CancellationToken cancellationToken) =>
         documentSession.Events.AggregateStreamAsync<T>(id, token: cancellationToken);
 
-    public async Task<long> Add(T aggregate, TraceMetadata? traceMetadata = null, CancellationToken cancellationToken = default)
+    public async Task<long> Add(T aggregate, TraceMetadata? traceMetadata = null,
+        CancellationToken cancellationToken = default)
     {
         documentSession.CorrelationId = traceMetadata?.CorrelationId?.Value;
         documentSession.CausationId = traceMetadata?.CausationId?.Value;
@@ -43,20 +48,19 @@ public async Task<long> Add(T aggregate, TraceMetadata? traceMetadata = null, Ca
         return events.Length;
     }
 
-    public async Task<long> Update(T aggregate, long? expectedVersion = null, TraceMetadata? traceMetadata = null, CancellationToken cancellationToken = default)
+    public async Task<long> Update(T aggregate, long? expectedVersion = null, TraceMetadata? traceMetadata = null,
+        CancellationToken cancellationToken = default)
     {
         documentSession.CorrelationId = traceMetadata?.CorrelationId?.Value;
         documentSession.CausationId = traceMetadata?.CausationId?.Value;
 
         var events = aggregate.DequeueUncommittedEvents();
 
-        var nextVersion = expectedVersion.HasValue ?
-            expectedVersion.Value + events.Length
-            : aggregate.Version;
+        var nextVersion = (expectedVersion ?? aggregate.Version) + events.Length;
 
         documentSession.Events.Append(
             aggregate.Id,
-            aggregate.Version,
+            nextVersion,
             events
         );
 
@@ -65,6 +69,7 @@ public async Task<long> Update(T aggregate, long? expectedVersion = null, TraceM
         return nextVersion;
     }
 
-    public Task<long> Delete(T aggregate, long? expectedVersion = null, TraceMetadata? traceMetadata = null, CancellationToken cancellationToken = default) =>
+    public Task<long> Delete(T aggregate, long? expectedVersion = null, TraceMetadata? traceMetadata = null,
+        CancellationToken cancellationToken = default) =>
         Update(aggregate, expectedVersion, traceMetadata, cancellationToken);
 }
diff --git a/Marten.Integration.Tests/CompositeIds/CompositeIdsTests.cs b/Marten.Integration.Tests/CompositeIds/CompositeIdsTests.cs
@@ -224,25 +224,21 @@ public void Apply(TentativeReservationCreated @event)
         CustomerId = @event.CustomerId;
         Number = @event.Number;
         Status = ReservationStatus.Tentative;
-        Version++;
     }
 
     public void Apply(ReservationSeatChanged @event)
     {
         SeatId = @event.SeatId;
-        Version++;
     }
 
     public void Apply(ReservationConfirmed @event)
     {
         Status = ReservationStatus.Confirmed;
-        Version++;
     }
 
     public void Apply(ReservationCancelled @event)
     {
         Status = ReservationStatus.Cancelled;
-        Version++;
     }
 }
 

diff --git a/Sample/ECommerce/Carts/Carts.Tests/Carts/ConfirmingCart/ConfirmCartTests.cs b/Sample/ECommerce/Carts/Carts.Tests/Carts/ConfirmingCart/ConfirmCartTests.cs
@@ -23,12 +23,11 @@ public void ForTentativeCart_ShouldSucceed()
 
         // Then
         cart.Status.Should().Be(ShoppingCartStatus.Confirmed);
-        cart.Version.Should().Be(2);
 
         var @event = cart.PublishedEvent<ShoppingCartConfirmed>();
 
         @event.Should().NotBeNull();
         @event.Should().BeOfType<ShoppingCartConfirmed>();
         @event!.CartId.Should().Be(cart.Id);
     }
-}
+}
diff --git a/Sample/ECommerce/Carts/Carts.Tests/Extensions/Reservations/CartExtensions.cs b/Sample/ECommerce/Carts/Carts.Tests/Extensions/Reservations/CartExtensions.cs
@@ -18,7 +18,6 @@ internal static class CartExtensions
         shoppingCart.Status.Should().Be(ShoppingCartStatus.Pending);
         shoppingCart.ProductItems.Should().BeEmpty();
         shoppingCart.TotalPrice.Should().Be(0);
-        shoppingCart.Version.Should().Be(1);
 
         return shoppingCart;
     }

diff --git a/Sample/ECommerce/Carts/Carts/ShoppingCarts/GettingCartById/ShoppingCartDetails.cs b/Sample/ECommerce/Carts/Carts/ShoppingCarts/GettingCartById/ShoppingCartDetails.cs
@@ -24,8 +24,6 @@ public class ShoppingCartDetails
 
     public void Apply(ShoppingCartOpened @event)
     {
-        Version++;
-
         Id = @event.CartId;
         ClientId = @event.ClientId;
         ProductItems = new List<PricedProductItem>();
@@ -34,8 +32,6 @@ public void Apply(ShoppingCartOpened @event)
 
     public void Apply(ProductAdded @event)
     {
-        Version++;
-
         var newProductItem = @event.ProductItem;
 
         var existingProductItem = FindProductItemMatchingWith(newProductItem);
@@ -54,8 +50,6 @@ public void Apply(ProductAdded @event)
 
     public void Apply(ProductRemoved @event)
     {
-        Version++;
-
         var productItemToBeRemoved = @event.ProductItem;
 
         var existingProductItem = FindProductItemMatchingWith(@event.ProductItem);
@@ -77,15 +71,11 @@ public void Apply(ProductRemoved @event)
 
     public void Apply(ShoppingCartConfirmed @event)
     {
-        Version++;
-
         Status = ShoppingCartStatus.Confirmed;
     }
 
     public void Apply(ShoppingCartCanceled @event)
     {
-        Version++;
-
         Status = ShoppingCartStatus.Canceled;
     }
 

diff --git a/Sample/ECommerce/Carts/Carts/ShoppingCarts/ShoppingCart.cs b/Sample/ECommerce/Carts/Carts/ShoppingCarts/ShoppingCart.cs
@@ -44,8 +44,6 @@ public class ShoppingCart: Aggregate
 
     public void Apply(ShoppingCartOpened @event)
     {
-        Version++;
-
         Id = @event.CartId;
         ClientId = @event.ClientId;
         ProductItems = new List<PricedProductItem>();
@@ -69,8 +67,6 @@ public void Apply(ShoppingCartOpened @event)
 
     public void Apply(ProductAdded @event)
     {
-        Version++;
-
         var newProductItem = @event.ProductItem;
 
         var existingProductItem = FindProductItemMatchingWith(newProductItem);
@@ -109,8 +105,6 @@ public void Apply(ProductAdded @event)
 
     public void Apply(ProductRemoved @event)
     {
-        Version++;
-
         var productItemToBeRemoved = @event.ProductItem;
 
         var existingProductItem = FindProductItemMatchingWith(@event.ProductItem);
@@ -143,8 +137,6 @@ public void Confirm()
 
     public void Apply(ShoppingCartConfirmed @event)
     {
-        Version++;
-
         Status = ShoppingCartStatus.Confirmed;
     }
 
@@ -161,8 +153,6 @@ public void Cancel()
 
     public void Apply(ShoppingCartCanceled @event)
     {
-        Version++;
-
         Status = ShoppingCartStatus.Canceled;
     }
 

diff --git a/Sample/ECommerce/Orders/Orders/Orders/Order.cs b/Sample/ECommerce/Orders/Orders/Orders/Order.cs
@@ -51,8 +51,6 @@ private Order(Guid id, Guid clientId, IReadOnlyList<PricedProductItem> productIt
 
     public void Apply(OrderInitialized @event)
     {
-        Version++;
-
         Id = @event.OrderId;
         ClientId = @event.ClientId;
         ProductItems = @event.ProductItems;
@@ -75,8 +73,6 @@ public void RecordPayment(Guid paymentId, DateTime recordedAt)
 
     public void Apply(OrderPaymentRecorded @event)
     {
-        Version++;
-
         PaymentId = @event.PaymentId;
         Status = OrderStatus.Paid;
     }
@@ -94,8 +90,6 @@ public void Complete()
 
     public void Apply(OrderCompleted @event)
     {
-        Version++;
-
         Status = OrderStatus.Completed;
     }
 
@@ -112,8 +106,6 @@ public void Cancel(OrderCancellationReason cancellationReason)
 
     public void Apply(OrderCancelled @event)
     {
-        Version++;
-
         Status = OrderStatus.Cancelled;
     }
 }
diff --git a/Sample/ECommerce/Payments/Payments/Payments/Payment.cs b/Sample/ECommerce/Payments/Payments/Payments/Payment.cs
@@ -31,8 +31,6 @@ private Payment(Guid id, Guid orderId, decimal amount)
 
     public void Apply(PaymentRequested @event)
     {
-        Version++;
-
         Id = @event.PaymentId;
         OrderId = @event.OrderId;
         Amount = @event.Amount;
@@ -51,8 +49,6 @@ public void Complete()
 
     public void Apply(PaymentCompleted @event)
     {
-        Version++;
-
         Status = PaymentStatus.Completed;
     }
 
@@ -69,8 +65,6 @@ public void Discard(DiscardReason discardReason)
 
     public void Apply(PaymentDiscarded @event)
     {
-        Version++;
-
         Status = PaymentStatus.Failed;
     }
 
@@ -87,8 +81,6 @@ public void TimeOut()
 
     public void Apply(PaymentTimedOut @event)
     {
-        Version++;
-
         Status = PaymentStatus.Failed;
     }
-}
+}
diff --git a/Sample/MeetingsManagement/MeetingsManagement/Meetings/Meeting.cs b/Sample/MeetingsManagement/MeetingsManagement/Meetings/Meeting.cs
@@ -41,8 +41,6 @@ public void Apply(MeetingCreated @event)
         Id = @event.MeetingId;
         Name = @event.Name;
         Created = @event.Created;
-
-        Version++;
     }
 
     internal void Schedule(DateRange occurs)
@@ -56,7 +54,5 @@ internal void Schedule(DateRange occurs)
     public void Apply(MeetingScheduled @event)
     {
         Occurs = @event.Occurs;
-
-        Version++;
     }
 }
diff --git a/Sample/Tickets/Tickets.Tests/Extensions/Reservations/ReservationExtensions.cs b/Sample/Tickets/Tickets.Tests/Extensions/Reservations/ReservationExtensions.cs
@@ -17,7 +17,6 @@ internal static class ReservationExtensions
         reservation.Id.Should().Be(id);
         reservation.Number.Should().Be(number);
         reservation.SeatId.Should().Be(seatId);
-        reservation.Version.Should().Be(1);
 
         return reservation;
     }
@@ -38,4 +37,4 @@ internal static class ReservationExtensions
 
         return reservation;
     }
-}
+}
diff --git a/Sample/Tickets/Tickets.Tests/Reservations/CancellingReservation/CancelReservationTests.cs b/Sample/Tickets/Tickets.Tests/Reservations/CancellingReservation/CancelReservationTests.cs
@@ -23,7 +23,6 @@ public void ForTentativeReservation_ShouldSucceed()
 
         // Then
         reservation.Status.Should().Be(ReservationStatus.Cancelled);
-        reservation.Version.Should().Be(2);
 
         var @event = reservation.PublishedEvent<ReservationCancelled>();
 
@@ -43,4 +42,4 @@ public void ForCancelledReservation_ShouldFailWithInvalidOperation()
     {
 
     }
-}
+}
diff --git a/Sample/Tickets/Tickets.Tests/Reservations/ChangingReservationSeat/ChangeSeatTests.cs b/Sample/Tickets/Tickets.Tests/Reservations/ChangingReservationSeat/ChangeSeatTests.cs
@@ -24,7 +24,6 @@ public void ForValidParams_UpdatesSeatId()
 
         // Then
         reservation.SeatId.Should().Be(newSeatId);
-        reservation.Version.Should().Be(2);
 
         var @event = reservation.PublishedEvent<ReservationSeatChanged>();
 
@@ -33,4 +32,4 @@ public void ForValidParams_UpdatesSeatId()
         @event!.ReservationId.Should().Be(reservation.Id);
         @event.SeatId.Should().Be(newSeatId);
     }
-}
+}
diff --git a/Sample/Tickets/Tickets.Tests/Reservations/ConfirmingReservation/ConfirmReservationTests.cs b/Sample/Tickets/Tickets.Tests/Reservations/ConfirmingReservation/ConfirmReservationTests.cs
@@ -23,12 +23,11 @@ public void ForTentativeReservation_ShouldSucceed()
 
         // Then
         reservation.Status.Should().Be(ReservationStatus.Confirmed);
-        reservation.Version.Should().Be(2);
 
         var @event = reservation.PublishedEvent<ReservationConfirmed>();
 
         @event.Should().NotBeNull();
         @event.Should().BeOfType<ReservationConfirmed>();
         @event!.ReservationId.Should().Be(reservation.Id);
     }
-}
+}
diff --git a/Sample/Tickets/Tickets/Reservations/GettingReservationById/ReservationDetails.cs b/Sample/Tickets/Tickets/Reservations/GettingReservationById/ReservationDetails.cs
@@ -24,25 +24,21 @@ public void Apply(TentativeReservationCreated @event)
         SeatId = @event.SeatId;
         Number = @event.Number;
         Status = ReservationStatus.Tentative;
-        Version++;
     }
 
     public void Apply(ReservationSeatChanged @event)
     {
         SeatId = @event.SeatId;
-        Version++;
     }
 
     public void Apply(ReservationConfirmed @event)
     {
         Status = ReservationStatus.Confirmed;
-        Version++;
     }
 
     public void Apply(ReservationCancelled @event)
     {
         Status = ReservationStatus.Cancelled;
-        Version++;
     }
 }
 

diff --git a/Sample/Tickets/Tickets/Reservations/Reservation.cs b/Sample/Tickets/Tickets/Reservations/Reservation.cs
@@ -94,24 +94,20 @@ public void Apply(TentativeReservationCreated @event)
         SeatId = @event.SeatId;
         Number = @event.Number;
         Status = ReservationStatus.Tentative;
-        Version++;
     }
 
     public void Apply(ReservationSeatChanged @event)
     {
         SeatId = @event.SeatId;
-        Version++;
     }
 
     public void Apply(ReservationConfirmed @event)
     {
         Status = ReservationStatus.Confirmed;
-        Version++;
     }
 
     public void Apply(ReservationCancelled @event)
     {
         Status = ReservationStatus.Cancelled;
-        Version++;
     }
 }