Update to 0.10.1

alexeyzimarev · alexeyzimarev · commit ca1f65447f8e · 2022-07-20T13:37:23.000+02:00
diff --git a/.editorconfig b/.editorconfig
@@ -3,4 +3,6 @@
 
 # ReSharper properties
 resharper_instance_members_qualify_declared_in = this_class
+resharper_int_align_assignments = false
+resharper_use_heuristics_for_body_style = true
 resharper_wrap_after_invocation_lpar = false
diff --git a/Bookings.Domain/Bookings/Booking.cs b/Bookings.Domain/Bookings/Booking.cs
@@ -4,7 +4,7 @@
 
 namespace Bookings.Domain.Bookings;
 
-public class Booking : Aggregate<BookingState, BookingId> {
+public class Booking : Aggregate<BookingState> {
     public async Task BookRoom(
         BookingId       bookingId,
         string          guestId,
@@ -22,7 +22,6 @@ IsRoomAvailable isRoomAvailable
 
         Apply(
             new V1.RoomBooked(
-                bookingId,
                 guestId,
                 roomId,
                 period.CheckIn,
@@ -52,7 +51,6 @@ DateTimeOffset paidAt
 
         Apply(
             new V1.PaymentRecorded(
-                State.Id,
                 paid.Amount,
                 outstanding.Amount,
                 paid.Currency,
@@ -68,7 +66,7 @@ DateTimeOffset paidAt
     void MarkFullyPaidIfNecessary(DateTimeOffset when) {
         if (State.Outstanding.Amount != 0) return;
 
-        Apply(new V1.BookingFullyPaid(State.Id, when));
+        Apply(new V1.BookingFullyPaid(when));
     }
 
     static async Task EnsureRoomAvailable(RoomId roomId, StayPeriod period, IsRoomAvailable isRoomAvailable) {
diff --git a/Bookings.Domain/Bookings/BookingEvents.cs b/Bookings.Domain/Bookings/BookingEvents.cs
@@ -7,7 +7,6 @@ public static class BookingEvents {
     public static class V1 {
         [EventType("V1.RoomBooked")]
         public record RoomBooked(
-            string         BookingId,
             string         GuestId,
             string         RoomId,
             LocalDate      CheckInDate,
@@ -21,7 +20,6 @@ DateTimeOffset BookingDate
 
         [EventType("V1.PaymentRecorded")]
         public record PaymentRecorded(
-            string         BookingId,
             float          PaidAmount,
             float          Outstanding,
             string         Currency,
@@ -31,9 +29,9 @@ DateTimeOffset PaidAt
         );
 
         [EventType("V1.FullyPaid")]
-        public record BookingFullyPaid(string BookingId, DateTimeOffset FullyPaidAt);
+        public record BookingFullyPaid(DateTimeOffset FullyPaidAt);
 
         [EventType("V1.BookingCancelled")]
-        public record BookingCancelled(string BookingId, string CancelledBy, DateTimeOffset CancelledAt);
+        public record BookingCancelled(string CancelledBy, DateTimeOffset CancelledAt);
     }
 }
diff --git a/Bookings.Domain/Bookings/BookingState.cs b/Bookings.Domain/Bookings/BookingState.cs
@@ -2,9 +2,9 @@
 using Eventuous;
 using static Bookings.Domain.Bookings.BookingEvents;
 
-namespace Bookings.Domain.Bookings; 
+namespace Bookings.Domain.Bookings;
 
-public record BookingState : AggregateState<BookingState, BookingId> {
+public record BookingState : AggregateState<BookingState> {
     public string     GuestId     { get; init; }
     public RoomId     RoomId      { get; init; }
     public StayPeriod Period      { get; init; }
@@ -14,7 +14,8 @@ public record BookingState : AggregateState<BookingState, BookingId> {
 
     public ImmutableList<PaymentRecord> PaymentRecords { get; init; } = ImmutableList<PaymentRecord>.Empty;
 
-    internal bool HasPaymentBeenRecorded(string paymentId) => PaymentRecords.Any(x => x.PaymentId == paymentId);
+    internal bool HasPaymentBeenRecorded(string paymentId)
+        => PaymentRecords.Any(x => x.PaymentId == paymentId);
 
     public BookingState() {
         On<V1.RoomBooked>(HandleBooked);
@@ -32,7 +33,6 @@ static BookingState HandlePayment(BookingState state, V1.PaymentRecorded e)
 
     static BookingState HandleBooked(BookingState state, V1.RoomBooked booked)
         => state with {
-            Id = new BookingId(booked.BookingId),
             RoomId = new RoomId(booked.RoomId),
             Period = new StayPeriod(booked.CheckInDate, booked.CheckOutDate),
             GuestId = booked.GuestId,
@@ -43,4 +43,4 @@ static BookingState HandleBooked(BookingState state, V1.RoomBooked booked)
 
 public record PaymentRecord(string PaymentId, Money PaidAmount);
 
-public record DiscountRecord(Money Discount, string Reason);
+public record DiscountRecord(Money Discount, string Reason);
diff --git a/Bookings.Payments/Application/CommandService.cs b/Bookings.Payments/Application/CommandService.cs
@@ -8,6 +8,7 @@ namespace Bookings.Payments.Application;
 public class CommandService : ApplicationService<Payment, PaymentState, PaymentId> {
     public CommandService(IAggregateStore store) : base(store) {
         OnNew<PaymentCommands.RecordPayment>(
+            cmd => new PaymentId(cmd.PaymentId),
             (payment, cmd) => payment.ProcessPayment(
                 new PaymentId(cmd.PaymentId),
                 cmd.BookingId,
diff --git a/Bookings.Payments/Domain/Money.cs b/Bookings.Payments/Domain/Money.cs
@@ -4,10 +4,11 @@ namespace Bookings.Payments.Domain;
 
 public record Money {
     public float  Amount   { get; internal init; }
-    public string Currency { get; internal init; }
+    public string Currency { get; internal init; } = null!;
 
     static readonly string[] SupportedCurrencies = { "USD", "GPB", "EUR" };
 
+    // ReSharper disable once UnusedMember.Global
     internal Money() { }
 
     public Money(float amount, string currency) {
diff --git a/Bookings.Payments/Domain/Payment.cs b/Bookings.Payments/Domain/Payment.cs
@@ -3,21 +3,20 @@
 
 namespace Bookings.Payments.Domain;
 
-public class Payment : Aggregate<PaymentState, PaymentId> {
+public class Payment : Aggregate<PaymentState> {
     public void ProcessPayment(
         PaymentId paymentId, string bookingId, Money amount, string method, string provider
     )
         => Apply(new PaymentRecorded(paymentId, bookingId, amount.Amount, amount.Currency, method, provider));
 }
 
-public record PaymentState : AggregateState<PaymentState, PaymentId> {
+public record PaymentState : AggregateState<PaymentState> {
     public string BookingId { get; init; } = null!;
     public float  Amount    { get; init; }
 
     public PaymentState() {
         On<PaymentRecorded>(
             (state, recorded) => state with {
-                Id = new PaymentId(recorded.PaymentId),
                 BookingId = recorded.BookingId,
                 Amount = recorded.Amount
             }
diff --git a/Bookings/Application/BookingsCommandService.cs b/Bookings/Application/BookingsCommandService.cs
@@ -9,6 +9,7 @@ namespace Bookings.Application;
 public class BookingsCommandService : ApplicationService<Booking, BookingState, BookingId> {
     public BookingsCommandService(IAggregateStore store, Services.IsRoomAvailable isRoomAvailable) : base(store) {
         OnNewAsync<BookRoom>(
+            cmd => new BookingId(cmd.BookingId),
             (booking, cmd, _) => booking.BookRoom(
                 new BookingId(cmd.BookingId),
                 cmd.GuestId,
diff --git a/Bookings/Application/Queries/BookingStateProjection.cs b/Bookings/Application/Queries/BookingStateProjection.cs
@@ -1,4 +1,5 @@
 using Eventuous.Projections.MongoDB;
+using Eventuous.Subscriptions.Context;
 using MongoDB.Driver;
 using static Bookings.Domain.Bookings.BookingEvents;
 
@@ -8,27 +9,35 @@ namespace Bookings.Application.Queries;
 
 public class BookingStateProjection : MongoProjection<BookingDocument> {
     public BookingStateProjection(IMongoDatabase database) : base(database) {
-        On<V1.RoomBooked>(evt => evt.BookingId, HandleRoomBooked);
+        On<V1.RoomBooked>(stream => stream.GetId(), HandleRoomBooked);
 
         On<V1.PaymentRecorded>(
-            evt => evt.BookingId,
-            (evt, update) => update.Set(x => x.Outstanding, evt.Outstanding)
+            b => b
+                .UpdateOne
+                .DefaultId()
+                .Update((evt, update) =>
+                    update.Set(x => x.Outstanding, evt.Outstanding)
+                )
         );
 
-        On<V1.BookingFullyPaid>(
-            evt => evt.BookingId,
-            (_, update) => update.Set(x => x.Paid, true)
+        On<V1.BookingFullyPaid>(b => b
+            .UpdateOne
+            .DefaultId()
+            .Update((_, update) => update.Set(x => x.Paid, true))
         );
     }
 
     static UpdateDefinition<BookingDocument> HandleRoomBooked(
-        V1.RoomBooked evt, UpdateDefinitionBuilder<BookingDocument> update
-    )
-        => update.SetOnInsert(x => x.Id, evt.BookingId)
+        IMessageConsumeContext<V1.RoomBooked> ctx, UpdateDefinitionBuilder<BookingDocument> update
+    ) {
+        var evt = ctx.Message;
+
+        return update.SetOnInsert(x => x.Id, ctx.Stream.GetId())
             .Set(x => x.GuestId, evt.GuestId)
             .Set(x => x.RoomId, evt.RoomId)
             .Set(x => x.CheckInDate, evt.CheckInDate)
             .Set(x => x.CheckOutDate, evt.CheckOutDate)
             .Set(x => x.BookingPrice, evt.BookingPrice)
             .Set(x => x.Outstanding, evt.OutstandingAmount);
-}
+    }
+}
diff --git a/Bookings/Application/Queries/MyBookingsProjection.cs b/Bookings/Application/Queries/MyBookingsProjection.cs
@@ -6,23 +6,30 @@ namespace Bookings.Application.Queries;
 
 public class MyBookingsProjection : MongoProjection<MyBookings> {
     public MyBookingsProjection(IMongoDatabase database) : base(database) {
-        On<V1.RoomBooked>(
-            evt => evt.GuestId,
-            (evt, update) => update.AddToSet(
-                x => x.Bookings,
-                new MyBookings.Booking(evt.BookingId, evt.CheckInDate, evt.CheckOutDate, evt.BookingPrice)
+        On<V1.RoomBooked>(b => b
+            .UpdateOne
+            .Id(ctx => ctx.Message.GuestId)
+            .UpdateFromContext((ctx, update) =>
+                update.AddToSet(
+                    x => x.Bookings,
+                    new MyBookings.Booking(ctx.Stream.GetId(),
+                        ctx.Message.CheckInDate,
+                        ctx.Message.CheckOutDate,
+                        ctx.Message.BookingPrice
+                    )
+                )
             )
         );
 
         On<V1.BookingCancelled>(
             b => b.UpdateOne
-                .Filter((evt, doc) =>
-                    doc.Bookings.Select(booking => booking.BookingId).Contains(evt.BookingId)
+                .Filter((ctx, doc) =>
+                    doc.Bookings.Select(booking => booking.BookingId).Contains(ctx.Stream.GetId())
                 )
-                .Update((evt, update) =>
+                .UpdateFromContext((ctx, update) =>
                     update.PullFilter(
                         x => x.Bookings,
-                        x => x.BookingId == evt.BookingId
+                        x => x.BookingId == ctx.Stream.GetId()
                     )
                 )
         );
diff --git a/Bookings/HttpApi/Bookings/QueryApi.cs b/Bookings/HttpApi/Bookings/QueryApi.cs
@@ -13,7 +13,7 @@ public class QueryApi : ControllerBase {
     [HttpGet]
     [Route("{id}")]
     public async Task<BookingState> GetBooking(string id, CancellationToken cancellationToken) {
-        var booking = await _store.Load<Booking>(new BookingId(id), cancellationToken);
+        var booking = await _store.Load<Booking>(StreamName.For<Booking>(id), cancellationToken);
         return booking.State;
     }
 }
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,6 +3,6 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <EventuousVersion>0.9.0</EventuousVersion>
+        <EventuousVersion>0.10.1</EventuousVersion>
     </PropertyGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class QueryApi : ControllerBase {`
`13`	`13`	`[HttpGet]`
`14`	`14`	`[Route("{id}")]`
`15`	`15`	`public async Task<BookingState> GetBooking(string id, CancellationToken cancellationToken) {`
`16`		`- var booking = await _store.Load<Booking>(new BookingId(id), cancellationToken);`
	`16`	`+ var booking = await _store.Load<Booking>(StreamName.For<Booking>(id), cancellationToken);`
`17`	`17`	`return booking.State;`
`18`	`18`	`}`
`19`	`19`	`}`