@reventlessdev/online-shop-dcb-ordering 1.0.0-alpha.246 → 1.0.0-alpha.248

package/lib/bs/tests/Order/OutboundTranslation/SendOrderConfirmation_GWT.res

@@ -12,21 +12,24 @@ module SendOrderConfirmationSlice = {
 
 @@reventless.gwt
 
+let cid = CustomerId.make
+let oid = OrderId.make
+
 describe("SendOrderConfirmation OutboundTranslationSlice", () => {
   testSync("collect: OrderPlaced queues an outbound TODO", () =>
-    givenEvent(OrderPlaced({orderId: "o1", customerId: "c1"}))
+    givenEvent(OrderPlaced({orderId: oid("o1"), customerId: cid("c1")}))
     ->whenCollect
-    ->thenTodos([("o1", {orderId: "o1", customerId: "c1"})])
+    ->thenTodos([("o1", {orderId: oid("o1"), customerId: cid("c1")})])
   )
 
   test("translate success marks the TODO Completed", () =>
-    givenTodo("o1", {orderId: "o1", customerId: "c1"})
+    givenTodo("o1", {orderId: oid("o1"), customerId: cid("c1")})
     ->whenTranslateMocked((_id, _item) => Promise.resolve(Ok(None)))
     ->thenTodoStatus("o1", #Completed)
   )
 
   test("translate failure leaves the TODO Pending for retry", () =>
-    givenTodo("o1", {orderId: "o1", customerId: "c1"})
+    givenTodo("o1", {orderId: oid("o1"), customerId: cid("c1")})
     ->whenTranslateMocked((_id, _item) => Promise.resolve(Error("smtp down")))
     ->thenTodoStatus("o1", #Pending)
   )

package/lib/bs/tests/Order/OutboundTranslation/SendOrderConfirmation_GWT.res.mjs

@@ -1,5 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as OrderId$OrderingPlugin from "../../../src/Order/OrderId.res.mjs";
+import * as CustomerId$OrderingPlugin from "../../../src/Customer/CustomerId.res.mjs";
 import * as SendOrderConfirmation$OrderingPlugin from "../../../src/Order/OutboundTranslation/SendOrderConfirmation.res.mjs";
 import * as OutboundTranslation_GWT$ReventlessGwt from "@reventlessdev/reventless-gwt/src/OutboundTranslation_GWT.res.mjs";
 import * as SendOrderConfirmation_Translation$OrderingPlugin from "../../../src/Order/OutboundTranslation/SendOrderConfirmation_Translation.res.mjs";
@@ -50,25 +52,25 @@ let thenTodoStatus = include.thenTodoStatus;
 describe("SendOrderConfirmation OutboundTranslationSlice", () => {
   testSync("collect: OrderPlaced queues an outbound TODO", () => thenTodos(whenCollect(givenEvent({
     TAG: "OrderPlaced",
-    orderId: "o1",
-    customerId: "c1"
+    orderId: OrderId$OrderingPlugin.make("o1"),
+    customerId: CustomerId$OrderingPlugin.make("c1")
   }), undefined), [[
       "o1",
       {
-        orderId: "o1",
-        customerId: "c1"
+        orderId: OrderId$OrderingPlugin.make("o1"),
+        customerId: CustomerId$OrderingPlugin.make("c1")
       }
     ]]));
   test("translate success marks the TODO Completed", undefined, () => thenTodoStatus(whenTranslateMocked(givenTodo("o1", {
-    orderId: "o1",
-    customerId: "c1"
+    orderId: OrderId$OrderingPlugin.make("o1"),
+    customerId: CustomerId$OrderingPlugin.make("c1")
   }), (_id, _item) => Promise.resolve({
     TAG: "Ok",
     _0: undefined
   })), "o1", "Completed"));
   test("translate failure leaves the TODO Pending for retry", undefined, () => thenTodoStatus(whenTranslateMocked(givenTodo("o1", {
-    orderId: "o1",
-    customerId: "c1"
+    orderId: OrderId$OrderingPlugin.make("o1"),
+    customerId: CustomerId$OrderingPlugin.make("c1")
   }), (_id, _item) => Promise.resolve({
     TAG: "Error",
     _0: "smtp down"
@@ -85,6 +87,10 @@ let thenNoCommand = include.thenNoCommand;
 
 let thenRetryRecorded = include.thenRetryRecorded;
 
+let cid = CustomerId$OrderingPlugin.make;
+
+let oid = OrderId$OrderingPlugin.make;
+
 export {
   SendOrderConfirmationSlice,
   Spec,
@@ -101,5 +107,7 @@ export {
   thenNoCommand,
   thenRetryRecorded,
   thenTodoStatus,
+  cid,
+  oid,
 }
 /* include Not a pure module */

package/lib/bs/tests/Order/StateChange/CancelOrder_GWT.res

@@ -1,27 +1,30 @@
 @@reventless.gwt
 
+let oid = OrderId.make
+let pid = CatalogSpec.ProductId.make
+
 describe("CancelOrder StateChangeSlice", () => {
   test("non-existent order returns OrderNotFound", () =>
     givenEvents([])
-    ->whenCmd(CancelOrder({orderId: "o1"}))
+    ->whenCmd(CancelOrder({orderId: oid("o1")}))
     ->thenError(OrderNotFound)
   )
 
   test("placed order produces OrderCancelled with productIds carried over", () =>
-    givenEvents([OrderPlaced({productIds: ["p1", "p2"]})])
-    ->whenCmd(CancelOrder({orderId: "o1"}))
-    ->thenEvent(OrderCancelled({orderId: "o1", productIds: ["p1", "p2"]}))
+    givenEvents([OrderPlaced({productIds: [pid("p1"), pid("p2")]})])
+    ->whenCmd(CancelOrder({orderId: oid("o1")}))
+    ->thenEvent(OrderCancelled({orderId: oid("o1"), productIds: [pid("p1"), pid("p2")]}))
   )
 
   test("already cancelled order produces no events (idempotent)", () =>
-    givenEvents([OrderPlaced({productIds: ["p1"]}), OrderCancelled])
-    ->whenCmd(CancelOrder({orderId: "o1"}))
+    givenEvents([OrderPlaced({productIds: [pid("p1")]}), OrderCancelled])
+    ->whenCmd(CancelOrder({orderId: oid("o1")}))
     ->thenNoEvent
   )
 
   test("shipped order returns OrderAlreadyShipped", () =>
-    givenEvents([OrderPlaced({productIds: ["p1"]}), OrderShipped])
-    ->whenCmd(CancelOrder({orderId: "o1"}))
+    givenEvents([OrderPlaced({productIds: [pid("p1")]}), OrderShipped])
+    ->whenCmd(CancelOrder({orderId: oid("o1")}))
     ->thenError(OrderAlreadyShipped)
   )
 })

package/lib/bs/tests/Order/StateChange/CancelOrder_GWT.res.mjs

@@ -1,5 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as ProductId$CatalogSpec from "@reventlessdev/online-shop-dcb-catalog-spec/src/ProductId.res.mjs";
+import * as OrderId$OrderingPlugin from "../../../src/Order/OrderId.res.mjs";
 import * as Behavior_GWT$ReventlessGwt from "@reventlessdev/reventless-gwt/src/Behavior_GWT.res.mjs";
 import * as CancelOrder$OrderingPlugin from "../../../src/Order/StateChange/CancelOrder.res.mjs";
 import * as CancelOrder_Behavior$OrderingPlugin from "../../../src/Order/StateChange/CancelOrder_Behavior.res.mjs";
@@ -33,44 +35,44 @@ let thenError = include.thenError;
 describe("CancelOrder StateChangeSlice", () => {
   test("non-existent order returns OrderNotFound", () => thenError(whenCmd(givenEvents([]), {
     TAG: "CancelOrder",
-    orderId: "o1"
+    orderId: OrderId$OrderingPlugin.make("o1")
   }), "OrderNotFound"));
   test("placed order produces OrderCancelled with productIds carried over", () => thenEvent(whenCmd(givenEvents([{
       TAG: "OrderPlaced",
       productIds: [
-        "p1",
-        "p2"
+        ProductId$CatalogSpec.make("p1"),
+        ProductId$CatalogSpec.make("p2")
       ]
     }]), {
     TAG: "CancelOrder",
-    orderId: "o1"
+    orderId: OrderId$OrderingPlugin.make("o1")
   }), {
     TAG: "OrderCancelled",
-    orderId: "o1",
+    orderId: OrderId$OrderingPlugin.make("o1"),
     productIds: [
-      "p1",
-      "p2"
+      ProductId$CatalogSpec.make("p1"),
+      ProductId$CatalogSpec.make("p2")
     ]
   }));
   test("already cancelled order produces no events (idempotent)", () => thenNoEvent(whenCmd(givenEvents([
     {
       TAG: "OrderPlaced",
-      productIds: ["p1"]
+      productIds: [ProductId$CatalogSpec.make("p1")]
     },
     "OrderCancelled"
   ]), {
     TAG: "CancelOrder",
-    orderId: "o1"
+    orderId: OrderId$OrderingPlugin.make("o1")
   })));
   test("shipped order returns OrderAlreadyShipped", () => thenError(whenCmd(givenEvents([
     {
       TAG: "OrderPlaced",
-      productIds: ["p1"]
+      productIds: [ProductId$CatalogSpec.make("p1")]
     },
     "OrderShipped"
   ]), {
     TAG: "CancelOrder",
-    orderId: "o1"
+    orderId: OrderId$OrderingPlugin.make("o1")
   }), "OrderAlreadyShipped"));
 });
 
@@ -88,6 +90,10 @@ let thenAppendsConditionedOn = include.thenAppendsConditionedOn;
 
 let thenAppendsConditionedOnExactly = include.thenAppendsConditionedOnExactly;
 
+let oid = OrderId$OrderingPlugin.make;
+
+let pid = ProductId$CatalogSpec.make;
+
 export {
   Spec,
   describe,
@@ -103,5 +109,7 @@ export {
   thenError,
   thenAppendsConditionedOn,
   thenAppendsConditionedOnExactly,
+  oid,
+  pid,
 }
 /* include Not a pure module */

package/lib/bs/tests/Order/StateChange/PlaceOrder_GWT.res

@@ -1,33 +1,39 @@
 @@reventless.gwt
 
+let cid = CustomerId.make
+let oid = OrderId.make
+let pid = CatalogSpec.ProductId.make
+
 describe("PlaceOrder StateChangeSlice", () => {
   test("requires referenced products to be synced first", () =>
     givenEvents([])
-    ->whenCmd(PlaceOrder({orderId: "o1", customerId: "c1", productIds: ["p1"]}))
-    ->thenError(ProductsNotAvailable({missing: ["p1"]}))
+    ->whenCmd(PlaceOrder({orderId: oid("o1"), customerId: cid("c1"), productIds: [pid("p1")]}))
+    ->thenError(ProductsNotAvailable({missing: [pid("p1")]}))
   )
 
   test("placement succeeds when products are available", () =>
-    givenEvents([CatalogProductSynced({productId: "p1"})])
-    ->whenCmd(PlaceOrder({orderId: "o1", customerId: "c1", productIds: ["p1"]}))
-    ->thenEvent(OrderPlaced({orderId: "o1", customerId: "c1", productIds: ["p1"]}))
+    givenEvents([CatalogProductSynced({productId: pid("p1")})])
+    ->whenCmd(PlaceOrder({orderId: oid("o1"), customerId: cid("c1"), productIds: [pid("p1")]}))
+    ->thenEvent(OrderPlaced({orderId: oid("o1"), customerId: cid("c1"), productIds: [pid("p1")]}))
   )
 
   test("partial product availability returns ProductsNotAvailable with missing list", () =>
-    givenEvents([CatalogProductSynced({productId: "p1"})])
-    ->whenCmd(PlaceOrder({orderId: "o1", customerId: "c1", productIds: ["p1", "p2"]}))
-    ->thenError(ProductsNotAvailable({missing: ["p2"]}))
+    givenEvents([CatalogProductSynced({productId: pid("p1")})])
+    ->whenCmd(
+      PlaceOrder({orderId: oid("o1"), customerId: cid("c1"), productIds: [pid("p1"), pid("p2")]}),
+    )
+    ->thenError(ProductsNotAvailable({missing: [pid("p2")]}))
   )
 
   test("re-placing the same orderId returns OrderAlreadyPlaced", () =>
-    givenEvents([CatalogProductSynced({productId: "p1"}), OrderPlaced({orderId: "o1"})])
-    ->whenCmd(PlaceOrder({orderId: "o1", customerId: "c1", productIds: ["p1"]}))
+    givenEvents([CatalogProductSynced({productId: pid("p1")}), OrderPlaced({orderId: oid("o1")})])
+    ->whenCmd(PlaceOrder({orderId: oid("o1"), customerId: cid("c1"), productIds: [pid("p1")]}))
     ->thenError(OrderAlreadyPlaced)
   )
 
   test("a sibling OrderPlaced for a different orderId does not block placement", () =>
-    givenEvents([CatalogProductSynced({productId: "p1"}), OrderPlaced({orderId: "o2"})])
-    ->whenCmd(PlaceOrder({orderId: "o1", customerId: "c1", productIds: ["p1"]}))
-    ->thenEvent(OrderPlaced({orderId: "o1", customerId: "c1", productIds: ["p1"]}))
+    givenEvents([CatalogProductSynced({productId: pid("p1")}), OrderPlaced({orderId: oid("o2")})])
+    ->whenCmd(PlaceOrder({orderId: oid("o1"), customerId: cid("c1"), productIds: [pid("p1")]}))
+    ->thenEvent(OrderPlaced({orderId: oid("o1"), customerId: cid("c1"), productIds: [pid("p1")]}))
   )
 })

package/lib/bs/tests/Order/StateChange/PlaceOrder_GWT.res.mjs

@@ -1,5 +1,8 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as ProductId$CatalogSpec from "@reventlessdev/online-shop-dcb-catalog-spec/src/ProductId.res.mjs";
+import * as OrderId$OrderingPlugin from "../../../src/Order/OrderId.res.mjs";
+import * as CustomerId$OrderingPlugin from "../../../src/Customer/CustomerId.res.mjs";
 import * as PlaceOrder$OrderingPlugin from "../../../src/Order/StateChange/PlaceOrder.res.mjs";
 import * as Behavior_GWT$ReventlessGwt from "@reventlessdev/reventless-gwt/src/Behavior_GWT.res.mjs";
 import * as PlaceOrder_Behavior$OrderingPlugin from "../../../src/Order/StateChange/PlaceOrder_Behavior.res.mjs";
@@ -31,76 +34,76 @@ let thenError = include.thenError;
 describe("PlaceOrder StateChangeSlice", () => {
   test("requires referenced products to be synced first", () => thenError(whenCmd(givenEvents([]), {
     TAG: "PlaceOrder",
-    orderId: "o1",
-    customerId: "c1",
-    productIds: ["p1"]
+    orderId: OrderId$OrderingPlugin.make("o1"),
+    customerId: CustomerId$OrderingPlugin.make("c1"),
+    productIds: [ProductId$CatalogSpec.make("p1")]
   }), {
     TAG: "ProductsNotAvailable",
-    missing: ["p1"]
+    missing: [ProductId$CatalogSpec.make("p1")]
   }));
   test("placement succeeds when products are available", () => thenEvent(whenCmd(givenEvents([{
       TAG: "CatalogProductSynced",
-      productId: "p1"
+      productId: ProductId$CatalogSpec.make("p1")
     }]), {
     TAG: "PlaceOrder",
-    orderId: "o1",
-    customerId: "c1",
-    productIds: ["p1"]
+    orderId: OrderId$OrderingPlugin.make("o1"),
+    customerId: CustomerId$OrderingPlugin.make("c1"),
+    productIds: [ProductId$CatalogSpec.make("p1")]
   }), {
     TAG: "OrderPlaced",
-    orderId: "o1",
-    customerId: "c1",
-    productIds: ["p1"]
+    orderId: OrderId$OrderingPlugin.make("o1"),
+    customerId: CustomerId$OrderingPlugin.make("c1"),
+    productIds: [ProductId$CatalogSpec.make("p1")]
   }));
   test("partial product availability returns ProductsNotAvailable with missing list", () => thenError(whenCmd(givenEvents([{
       TAG: "CatalogProductSynced",
-      productId: "p1"
+      productId: ProductId$CatalogSpec.make("p1")
     }]), {
     TAG: "PlaceOrder",
-    orderId: "o1",
-    customerId: "c1",
+    orderId: OrderId$OrderingPlugin.make("o1"),
+    customerId: CustomerId$OrderingPlugin.make("c1"),
     productIds: [
-      "p1",
-      "p2"
+      ProductId$CatalogSpec.make("p1"),
+      ProductId$CatalogSpec.make("p2")
     ]
   }), {
     TAG: "ProductsNotAvailable",
-    missing: ["p2"]
+    missing: [ProductId$CatalogSpec.make("p2")]
   }));
   test("re-placing the same orderId returns OrderAlreadyPlaced", () => thenError(whenCmd(givenEvents([
     {
       TAG: "CatalogProductSynced",
-      productId: "p1"
+      productId: ProductId$CatalogSpec.make("p1")
     },
     {
       TAG: "OrderPlaced",
-      orderId: "o1"
+      orderId: OrderId$OrderingPlugin.make("o1")
     }
   ]), {
     TAG: "PlaceOrder",
-    orderId: "o1",
-    customerId: "c1",
-    productIds: ["p1"]
+    orderId: OrderId$OrderingPlugin.make("o1"),
+    customerId: CustomerId$OrderingPlugin.make("c1"),
+    productIds: [ProductId$CatalogSpec.make("p1")]
   }), "OrderAlreadyPlaced"));
   test("a sibling OrderPlaced for a different orderId does not block placement", () => thenEvent(whenCmd(givenEvents([
     {
       TAG: "CatalogProductSynced",
-      productId: "p1"
+      productId: ProductId$CatalogSpec.make("p1")
     },
     {
       TAG: "OrderPlaced",
-      orderId: "o2"
+      orderId: OrderId$OrderingPlugin.make("o2")
     }
   ]), {
     TAG: "PlaceOrder",
-    orderId: "o1",
-    customerId: "c1",
-    productIds: ["p1"]
+    orderId: OrderId$OrderingPlugin.make("o1"),
+    customerId: CustomerId$OrderingPlugin.make("c1"),
+    productIds: [ProductId$CatalogSpec.make("p1")]
   }), {
     TAG: "OrderPlaced",
-    orderId: "o1",
-    customerId: "c1",
-    productIds: ["p1"]
+    orderId: OrderId$OrderingPlugin.make("o1"),
+    customerId: CustomerId$OrderingPlugin.make("c1"),
+    productIds: [ProductId$CatalogSpec.make("p1")]
   }));
 });
 
@@ -120,6 +123,12 @@ let thenAppendsConditionedOn = include.thenAppendsConditionedOn;
 
 let thenAppendsConditionedOnExactly = include.thenAppendsConditionedOnExactly;
 
+let cid = CustomerId$OrderingPlugin.make;
+
+let oid = OrderId$OrderingPlugin.make;
+
+let pid = ProductId$CatalogSpec.make;
+
 export {
   Spec,
   describe,
@@ -135,5 +144,8 @@ export {
   thenError,
   thenAppendsConditionedOn,
   thenAppendsConditionedOnExactly,
+  cid,
+  oid,
+  pid,
 }
 /* include Not a pure module */

package/lib/bs/tests/Order/StateChange/ShipOrder_GWT.res

@@ -1,27 +1,29 @@
 @@reventless.gwt
 
+let oid = OrderId.make
+
 describe("ShipOrder StateChangeSlice", () => {
   test("non-existent order returns OrderNotFound", () =>
     givenEvents([])
-    ->whenCmd(ShipOrder({orderId: "o1"}))
+    ->whenCmd(ShipOrder({orderId: oid("o1")}))
     ->thenError(OrderNotFound)
   )
 
   test("placed order produces OrderShipped", () =>
     givenEvents([OrderPlaced])
-    ->whenCmd(ShipOrder({orderId: "o1"}))
-    ->thenEvent(OrderShipped({orderId: "o1"}))
+    ->whenCmd(ShipOrder({orderId: oid("o1")}))
+    ->thenEvent(OrderShipped({orderId: oid("o1")}))
   )
 
   test("already shipped order produces no events (idempotent)", () =>
     givenEvents([OrderPlaced, OrderShipped])
-    ->whenCmd(ShipOrder({orderId: "o1"}))
+    ->whenCmd(ShipOrder({orderId: oid("o1")}))
     ->thenNoEvent
   )
 
   test("cancelled order returns OrderAlreadyCancelled", () =>
     givenEvents([OrderPlaced, OrderCancelled])
-    ->whenCmd(ShipOrder({orderId: "o1"}))
+    ->whenCmd(ShipOrder({orderId: oid("o1")}))
     ->thenError(OrderAlreadyCancelled)
   )
 })

package/lib/bs/tests/Order/StateChange/ShipOrder_GWT.res.mjs

@@ -1,5 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as OrderId$OrderingPlugin from "../../../src/Order/OrderId.res.mjs";
 import * as ShipOrder$OrderingPlugin from "../../../src/Order/StateChange/ShipOrder.res.mjs";
 import * as Behavior_GWT$ReventlessGwt from "@reventlessdev/reventless-gwt/src/Behavior_GWT.res.mjs";
 import * as ShipOrder_Behavior$OrderingPlugin from "../../../src/Order/StateChange/ShipOrder_Behavior.res.mjs";
@@ -33,28 +34,28 @@ let thenError = include.thenError;
 describe("ShipOrder StateChangeSlice", () => {
   test("non-existent order returns OrderNotFound", () => thenError(whenCmd(givenEvents([]), {
     TAG: "ShipOrder",
-    orderId: "o1"
+    orderId: OrderId$OrderingPlugin.make("o1")
   }), "OrderNotFound"));
   test("placed order produces OrderShipped", () => thenEvent(whenCmd(givenEvents(["OrderPlaced"]), {
     TAG: "ShipOrder",
-    orderId: "o1"
+    orderId: OrderId$OrderingPlugin.make("o1")
   }), {
     TAG: "OrderShipped",
-    orderId: "o1"
+    orderId: OrderId$OrderingPlugin.make("o1")
   }));
   test("already shipped order produces no events (idempotent)", () => thenNoEvent(whenCmd(givenEvents([
     "OrderPlaced",
     "OrderShipped"
   ]), {
     TAG: "ShipOrder",
-    orderId: "o1"
+    orderId: OrderId$OrderingPlugin.make("o1")
   })));
   test("cancelled order returns OrderAlreadyCancelled", () => thenError(whenCmd(givenEvents([
     "OrderPlaced",
     "OrderCancelled"
   ]), {
     TAG: "ShipOrder",
-    orderId: "o1"
+    orderId: OrderId$OrderingPlugin.make("o1")
   }), "OrderAlreadyCancelled"));
 });
 
@@ -72,6 +73,8 @@ let thenAppendsConditionedOn = include.thenAppendsConditionedOn;
 
 let thenAppendsConditionedOnExactly = include.thenAppendsConditionedOnExactly;
 
+let oid = OrderId$OrderingPlugin.make;
+
 export {
   Spec,
   describe,
@@ -87,5 +90,6 @@ export {
   thenError,
   thenAppendsConditionedOn,
   thenAppendsConditionedOnExactly,
+  oid,
 }
 /* include Not a pure module */

package/lib/bs/tests/Order/StateView/Orders_GWT.res

@@ -1,30 +1,41 @@
 @@reventless.gwt
 
+let cid = CustomerId.make
+let oid = OrderId.make
+let pid = CatalogSpec.ProductId.make
+
 describe("Orders StateViewSlice", () => {
   test("OrderPlaced creates a row with status Placed", () =>
     givenEvents([])
-    ->whenEvent(OrderPlaced({orderId: "o1", customerId: "c1", productIds: ["p1", "p2"]}))
+    ->whenEvent(
+      OrderPlaced({orderId: oid("o1"), customerId: cid("c1"), productIds: [pid("p1"), pid("p2")]}),
+    )
     ->thenStateWithId(
       "o1",
-      {orderId: "o1", customerId: "c1", productIds: ["p1", "p2"], lifecycle: Placed},
+      {
+        orderId: oid("o1"),
+        customerId: cid("c1"),
+        productIds: [pid("p1"), pid("p2")],
+        lifecycle: Placed,
+      },
     )
   )
 
   test("OrderShipped updates status to Shipped", () =>
-    givenEvents([OrderPlaced({orderId: "o1", customerId: "c1", productIds: ["p1"]})])
-    ->whenEvent(OrderShipped({orderId: "o1"}))
+    givenEvents([OrderPlaced({orderId: oid("o1"), customerId: cid("c1"), productIds: [pid("p1")]})])
+    ->whenEvent(OrderShipped({orderId: oid("o1")}))
     ->thenStateWithId(
       "o1",
-      {orderId: "o1", customerId: "c1", productIds: ["p1"], lifecycle: Shipped},
+      {orderId: oid("o1"), customerId: cid("c1"), productIds: [pid("p1")], lifecycle: Shipped},
     )
   )
 
   test("OrderCancelled updates status to Cancelled", () =>
-    givenEvents([OrderPlaced({orderId: "o1", customerId: "c1", productIds: ["p1"]})])
-    ->whenEvent(OrderCancelled({orderId: "o1"}))
+    givenEvents([OrderPlaced({orderId: oid("o1"), customerId: cid("c1"), productIds: [pid("p1")]})])
+    ->whenEvent(OrderCancelled({orderId: oid("o1")}))
     ->thenStateWithId(
       "o1",
-      {orderId: "o1", customerId: "c1", productIds: ["p1"], lifecycle: Cancelled},
+      {orderId: oid("o1"), customerId: cid("c1"), productIds: [pid("p1")], lifecycle: Cancelled},
     )
   )
 })