Removed the union types in events to simplify the narrative

oskardudycz · Nov 6, 2024 · 8e693b5 · 8e693b5
1 parent 96e3e39
commit 8e693b5
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 249 deletions.
diff --git a/Sample/EventsVersioning/Talk/HotelManagement.Tests/Downcasters/ChangedStructure.cs b/Sample/EventsVersioning/Talk/HotelManagement.Tests/Downcasters/ChangedStructure.cs
@@ -1,11 +1,9 @@
 using System.Text.Json;
 using FluentAssertions;
-using HotelManagement.GuestStayAccounts;
+using V1 = HotelManagement.GuestStayAccounts;
 
 namespace HotelManagement.Tests.Downcasters;
 
-using V1 = GuestStayAccountEvent;
-
 public class ChangedStructure
 {
     public record Money(

diff --git a/Sample/EventsVersioning/Talk/HotelManagement.Tests/SimpleMappings/NewNotRequiredProperty.cs b/Sample/EventsVersioning/Talk/HotelManagement.Tests/SimpleMappings/NewNotRequiredProperty.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using FluentAssertions;
-using V1 = HotelManagement.GuestStayAccounts.GuestStayAccountEvent;
+using V1 = HotelManagement.GuestStayAccounts;
 
 namespace HotelManagement.Tests.SimpleMappings;
 

diff --git a/Sample/EventsVersioning/Talk/HotelManagement.Tests/SimpleMappings/NewRequiredProperty.cs b/Sample/EventsVersioning/Talk/HotelManagement.Tests/SimpleMappings/NewRequiredProperty.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using FluentAssertions;
-using V1 = HotelManagement.GuestStayAccounts.GuestStayAccountEvent;
+using V1 = HotelManagement.GuestStayAccounts;
 
 namespace HotelManagement.Tests.SimpleMappings;
 

diff --git a/Sample/EventsVersioning/Talk/HotelManagement.Tests/SimpleMappings/RenamedProperty.cs b/Sample/EventsVersioning/Talk/HotelManagement.Tests/SimpleMappings/RenamedProperty.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using FluentAssertions;
-using V1 = HotelManagement.GuestStayAccounts.GuestStayAccountEvent;
+using V1 = HotelManagement.GuestStayAccounts;
 
 namespace HotelManagement.Tests.SimpleMappings;
 

diff --git a/Sample/EventsVersioning/Talk/HotelManagement.Tests/SnapshotTesting/PackageSnapshotTests.cs b/Sample/EventsVersioning/Talk/HotelManagement.Tests/SnapshotTesting/PackageSnapshotTests.cs
@@ -8,7 +8,7 @@ public class PackageSnapshotTests
     [Fact(Skip = "not now, my friend")]
     public Task my_assembly_has_no_public_api_changes()
     {
-        var publicApi = typeof(GuestStayAccountEvent).Assembly.GeneratePublicApi();
+        var publicApi = typeof(GuestCheckedIn).Assembly.GeneratePublicApi();
 
         return Verify(publicApi);
     }

diff --git a/...s/SnapshotTesting/PackageSnapshotTests.my_assembly_has_no_public_api_changes.received.txt b/...s/SnapshotTesting/PackageSnapshotTests.my_assembly_has_no_public_api_changes.received.txt
diff --git a/...k/HotelManagement.Tests/Transformations/MultipleTransformationsWithDifferentEventTypes.cs b/...k/HotelManagement.Tests/Transformations/MultipleTransformationsWithDifferentEventTypes.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using FluentAssertions;
 using HotelManagement.EventStore;
-using V1 = HotelManagement.GuestStayAccounts.GuestStayAccountEvent;
+using V1 = HotelManagement.GuestStayAccounts;
 
 public record Money(
     decimal Amount,

diff --git a/Sample/EventsVersioning/Talk/HotelManagement.Tests/Upcasters/ChangedStructure.cs b/Sample/EventsVersioning/Talk/HotelManagement.Tests/Upcasters/ChangedStructure.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using FluentAssertions;
-using V1 = HotelManagement.GuestStayAccounts.GuestStayAccountEvent;
+using V1 = HotelManagement.GuestStayAccounts;
 
 namespace HotelManagement.Tests.Upcasters;
 

diff --git a/.../EventsVersioning/Talk/HotelManagement.Tests/Upcasters/NewRequiredPropertyFromMetadata.cs b/.../EventsVersioning/Talk/HotelManagement.Tests/Upcasters/NewRequiredPropertyFromMetadata.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using FluentAssertions;
-using V1 = HotelManagement.GuestStayAccounts.GuestStayAccountEvent;
+using V1 = HotelManagement.GuestStayAccounts;
 
 namespace HotelManagement.Tests.Upcasters;
 

diff --git a/Sample/EventsVersioning/Talk/HotelManagement/GuestStayAccounts/BusinessLogic.cs b/Sample/EventsVersioning/Talk/HotelManagement/GuestStayAccounts/BusinessLogic.cs
@@ -1,37 +1,29 @@
 namespace HotelManagement.GuestStayAccounts;
 
-using static GuestStayAccountEvent;
-using static GuestStayAccountCommand;
+public record CheckIn(
+    string ClerkId,
+    string GuestStayId,
+    string RoomId,
+    DateTimeOffset Now
+);
 
-public abstract record GuestStayAccountCommand
-{
-    public record CheckIn(
-        string ClerkId,
-        string GuestStayId,
-        string RoomId,
-        DateTimeOffset Now
-    ): GuestStayAccountCommand;
-
-    public record RecordCharge(
-        string GuestStayAccountId,
-        decimal Amount,
-        DateTimeOffset Now
-    ): GuestStayAccountCommand;
+public record RecordCharge(
+    string GuestStayAccountId,
+    decimal Amount,
+    DateTimeOffset Now
+);
 
-    public record RecordPayment(
-        string GuestStayAccountId,
-        decimal Amount,
-        DateTimeOffset Now
-    ): GuestStayAccountCommand;
+public record RecordPayment(
+    string GuestStayAccountId,
+    decimal Amount,
+    DateTimeOffset Now
+);
 
-    public record CheckOut(
-        string ClerkId,
-        string GuestStayAccountId,
-        DateTimeOffset Now
-    ): GuestStayAccountCommand;
-
-    private GuestStayAccountCommand() { }
-}
+public record CheckOut(
+    string ClerkId,
+    string GuestStayAccountId,
+    DateTimeOffset Now
+);
 
 public static class GuestStayAccountDecider
 {
@@ -60,7 +52,7 @@ public static PaymentRecorded RecordPayment(RecordPayment command, GuestStayAcco
         return new PaymentRecorded(state.Id, command.Amount, command.Now);
     }
 
-    public static GuestStayAccountEvent CheckOut(CheckOut command, GuestStayAccount state)
+    public static object CheckOut(CheckOut command, GuestStayAccount state)
     {
         if (state.Status != GuestStayAccountStatus.Opened)
             return new GuestCheckoutFailed(