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

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

@@ -1,12 +1,16 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as Orders$OrderingPlugin from "../../../src/Order/StateView/Orders.res.mjs";
+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 Projection_GWT$ReventlessGwt from "@reventlessdev/reventless-gwt/src/Projection_GWT.res.mjs";
 import * as Orders_Projection$OrderingPlugin from "../../../src/Order/StateView/Orders_Projection.res.mjs";
 
 let include = Projection_GWT$ReventlessGwt.Make({
   name: Orders$OrderingPlugin.name,
   stateSchema: Orders$OrderingPlugin.stateSchema,
+  Key: OrderId$OrderingPlugin,
   consumedEventSchema: Orders$OrderingPlugin.consumedEventSchema,
   subIdConfig: undefined
 })({
@@ -26,47 +30,47 @@ let thenStateWithId = include.thenStateWithId;
 describe("Orders StateViewSlice", () => {
   test("OrderPlaced creates a row with status Placed", undefined, () => thenStateWithId(whenEvent(givenEvents([]), {
     TAG: "OrderPlaced",
-    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")
     ]
   }), "o1", {
-    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")
     ],
     lifecycle: "Placed"
   }));
   test("OrderShipped updates status to Shipped", undefined, () => thenStateWithId(whenEvent(givenEvents([{
       TAG: "OrderPlaced",
-      orderId: "o1",
-      customerId: "c1",
-      productIds: ["p1"]
+      orderId: OrderId$OrderingPlugin.make("o1"),
+      customerId: CustomerId$OrderingPlugin.make("c1"),
+      productIds: [ProductId$CatalogSpec.make("p1")]
     }]), {
     TAG: "OrderShipped",
-    orderId: "o1"
+    orderId: OrderId$OrderingPlugin.make("o1")
   }), "o1", {
-    orderId: "o1",
-    customerId: "c1",
-    productIds: ["p1"],
+    orderId: OrderId$OrderingPlugin.make("o1"),
+    customerId: CustomerId$OrderingPlugin.make("c1"),
+    productIds: [ProductId$CatalogSpec.make("p1")],
     lifecycle: "Shipped"
   }));
   test("OrderCancelled updates status to Cancelled", undefined, () => thenStateWithId(whenEvent(givenEvents([{
       TAG: "OrderPlaced",
-      orderId: "o1",
-      customerId: "c1",
-      productIds: ["p1"]
+      orderId: OrderId$OrderingPlugin.make("o1"),
+      customerId: CustomerId$OrderingPlugin.make("c1"),
+      productIds: [ProductId$CatalogSpec.make("p1")]
     }]), {
     TAG: "OrderCancelled",
-    orderId: "o1"
+    orderId: OrderId$OrderingPlugin.make("o1")
   }), "o1", {
-    orderId: "o1",
-    customerId: "c1",
-    productIds: ["p1"],
+    orderId: OrderId$OrderingPlugin.make("o1"),
+    customerId: CustomerId$OrderingPlugin.make("c1"),
+    productIds: [ProductId$CatalogSpec.make("p1")],
     lifecycle: "Cancelled"
   }));
 });
@@ -93,6 +97,12 @@ let thenThrow = include.thenThrow;
 
 let thenFail = include.thenFail;
 
+let cid = CustomerId$OrderingPlugin.make;
+
+let oid = OrderId$OrderingPlugin.make;
+
+let pid = ProductId$CatalogSpec.make;
+
 export {
   Spec,
   describe,
@@ -110,5 +120,8 @@ export {
   thenNoState,
   thenThrow,
   thenFail,
+  cid,
+  oid,
+  pid,
 }
 /* include Not a pure module */

package/lib/ocaml/.compiler.log

@@ -1,2 +1,2 @@
-#Start(1789989171081)
-#Done(1789989173453)
+#Start(1789997169658)
+#Done(1789997172500)

package/lib/ocaml/AutoShipOrder.res

@@ -9,10 +9,10 @@
 @@reventless.spec
 
 @schema
-type todoItem = {orderId: string}
+type todoItem = {orderId: OrderId.t}
 
 @schema
-type command = ShipOrder({orderId: string})
+type command = ShipOrder({orderId: OrderId.t})
 
 let maxRetries = 3
 let heartbeatInterval = 60

package/lib/ocaml/AutoShipOrder_Automation.res

@@ -5,8 +5,8 @@ module OrderingDcbSource = {
   let name = "OrderingDcbEventLog"
   @schema
   type event =
-    | OrderPlaced({orderId: string})
-    | OrderShipped({orderId: string})
+    | OrderPlaced({orderId: OrderId.t})
+    | OrderShipped({orderId: OrderId.t})
 }
 
 module FromOrderingDcb = Mapping.Make(
@@ -17,13 +17,16 @@ module FromOrderingDcb = Mapping.Make(
 
     let collect = (event, ~sourceId as _, _ctx) =>
       switch event {
-      | OrderPlaced({orderId}) => [(orderId, ({orderId: orderId}: AutoShipOrder.todoItem))]
+      // To-do rows are keyed by string; the item keeps the typed id.
+      | OrderPlaced({orderId}) => [
+          (orderId->OrderId.toString, ({orderId: orderId}: AutoShipOrder.todoItem)),
+        ]
       | OrderShipped(_) => []
       }
 
     let resolve = event =>
       switch event {
-      | OrderShipped({orderId}) => Some(orderId)
+      | OrderShipped({orderId}) => Some(orderId->OrderId.toString)
       | OrderPlaced(_) => None
       }
   },
@@ -31,7 +34,7 @@ module FromOrderingDcb = Mapping.Make(
 
 let mappings: array<module(Mapping)> = [module(FromOrderingDcb)]
 
-let process = (id, _item) => Some((id, ShipOrder({orderId: id})))
+let process = (id, item: AutoShipOrder.todoItem) => Some((id, ShipOrder({orderId: item.orderId})))
 
 // Nothing to say: an order the shipping automation gave up on is a Placed order
 // that never shipped, which the Orders view already shows. A command here would

package/lib/ocaml/AutoShipOrder_GWT.res

@@ -22,34 +22,36 @@ module AutoShipOrderSlice = {
 
 @@reventless.gwt
 
+let oid = OrderId.make
+
 describe("AutoShipOrder AutomationSlice", () => {
   test("collect: OrderPlaced creates a pending TODO", () =>
-    givenEvent(OrderPlaced({orderId: "o1"}))
+    givenEvent(OrderPlaced({orderId: oid("o1")}))
     ->whenCollect
-    ->thenTodos([("o1", {orderId: "o1"})])
+    ->thenTodos([("o1", {orderId: oid("o1")})])
   )
 
   test("collect: OrderShipped is ignored (no TODO)", () =>
-    givenEvent(OrderShipped({orderId: "o1"}))
+    givenEvent(OrderShipped({orderId: oid("o1")}))
     ->whenCollect
     ->thenTodos([])
   )
 
   test("resolve: OrderShipped marks the TODO done", () =>
-    givenEvent(OrderShipped({orderId: "o1"}))
+    givenEvent(OrderShipped({orderId: oid("o1")}))
     ->whenResolve
     ->thenResolved(Some("o1"))
   )
 
   test("resolve: OrderPlaced does not mark anything done", () =>
-    givenEvent(OrderPlaced({orderId: "o1"}))
+    givenEvent(OrderPlaced({orderId: oid("o1")}))
     ->whenResolve
     ->thenResolved(None)
   )
 
   test("process: pending TODO emits ShipOrder for the same id", () =>
-    givenTodo("o1", {orderId: "o1"})
+    givenTodo("o1", {orderId: oid("o1")})
     ->whenProcess
-    ->thenCommand("o1", ShipOrder({orderId: "o1"}))
+    ->thenCommand("o1", ShipOrder({orderId: oid("o1")}))
   )
 })

package/lib/ocaml/AvailableProducts.res

@@ -4,10 +4,13 @@
 @@reventless.spec
 @@reventless.visibility(Internal)
 
+// Rows are keyed by this identity.
+module Key = CatalogSpec.ProductId
+
 @schema
-type state = {productId: string, name: string, price: float}
+type state = {productId: CatalogSpec.ProductId.t, name: string, price: float}
 
 @schema
 type consumedEvent =
-  | CatalogProductSynced({productId: string, name: string, price: float})
-  | CatalogProductPriceChanged({productId: string, price: float})
+  | CatalogProductSynced({productId: CatalogSpec.ProductId.t, name: string, price: float})
+  | CatalogProductPriceChanged({productId: CatalogSpec.ProductId.t, price: float})

package/lib/ocaml/AvailableProducts_GWT.res

@@ -1,15 +1,17 @@
 @@reventless.gwt
 
+let pid = CatalogSpec.ProductId.make
+
 describe("AvailableProducts StateViewSlice", () => {
   test("CatalogProductSynced creates a row", () =>
     givenEvents([])
-    ->whenEvent(CatalogProductSynced({productId: "p1", name: "Laptop", price: 999.99}))
-    ->thenStateWithId("p1", {productId: "p1", name: "Laptop", price: 999.99})
+    ->whenEvent(CatalogProductSynced({productId: pid("p1"), name: "Laptop", price: 999.99}))
+    ->thenStateWithId("p1", {productId: pid("p1"), name: "Laptop", price: 999.99})
   )
 
   test("CatalogProductPriceChanged updates the price", () =>
-    givenEvents([CatalogProductSynced({productId: "p1", name: "Laptop", price: 999.99})])
-    ->whenEvent(CatalogProductPriceChanged({productId: "p1", price: 899.99}))
-    ->thenStateWithId("p1", {productId: "p1", name: "Laptop", price: 899.99})
+    givenEvents([CatalogProductSynced({productId: pid("p1"), name: "Laptop", price: 999.99})])
+    ->whenEvent(CatalogProductPriceChanged({productId: pid("p1"), price: 899.99}))
+    ->thenStateWithId("p1", {productId: pid("p1"), name: "Laptop", price: 899.99})
   )
 })

package/lib/ocaml/CancelOrder.res

@@ -4,12 +4,12 @@
 
 @schema
 type consumedEvent =
-  | OrderPlaced({productIds: array<string>})
+  | OrderPlaced({productIds: array<CatalogSpec.ProductId.t>})
   | OrderShipped
   | OrderCancelled
 
 @schema
-type command = CancelOrder({orderId: string})
+type command = CancelOrder({orderId: OrderId.t})
 
 @schema
 type error =
@@ -17,7 +17,7 @@ type error =
   | OrderAlreadyShipped
 
 @schema
-type event = OrderCancelled({orderId: string, productIds: array<string>})
+type event = OrderCancelled({orderId: OrderId.t, productIds: array<CatalogSpec.ProductId.t>})
 
 type lifecycleState = Orders.lifecycle
 

package/lib/ocaml/CancelOrder_Behavior.res

@@ -1,6 +1,11 @@
 @@reventless.behavior
 
-type state = {exists: bool, shipped: bool, cancelled: bool, productIds: array<string>}
+type state = {
+  exists: bool,
+  shipped: bool,
+  cancelled: bool,
+  productIds: array<CatalogSpec.ProductId.t>,
+}
 
 let initialState = {exists: false, shipped: false, cancelled: false, productIds: []}
 

package/lib/ocaml/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/ocaml/ChangeAddress.res

@@ -9,7 +9,7 @@ type consumedEvent =
   | CustomerDeactivated
 
 @schema
-type command = ChangeAddress({customerId: string, address: string})
+type command = ChangeAddress({customerId: CustomerId.t, address: string})
 
 @schema
 type error =
@@ -17,4 +17,4 @@ type error =
   | CustomerAlreadyDeactivated
 
 @schema
-type event = AddressChanged({customerId: string, address: string})
+type event = AddressChanged({customerId: CustomerId.t, address: string})

package/lib/ocaml/ChangeAddress_GWT.res

@@ -1,27 +1,29 @@
 @@reventless.gwt
 
+let cid = CustomerId.make
+
 describe("ChangeAddress StateChangeSlice", () => {
   test("non-existent customer returns CustomerNotFound", () =>
     givenEvents([])
-    ->whenCmd(ChangeAddress({customerId: "c1", address: "789 Pine"}))
+    ->whenCmd(ChangeAddress({customerId: cid("c1"), address: "789 Pine"}))
     ->thenError(CustomerNotFound)
   )
 
   test("active customer produces AddressChanged", () =>
     givenEvents([CustomerRegistered({address: "123 Main"})])
-    ->whenCmd(ChangeAddress({customerId: "c1", address: "789 Pine"}))
-    ->thenEvent(AddressChanged({customerId: "c1", address: "789 Pine"}))
+    ->whenCmd(ChangeAddress({customerId: cid("c1"), address: "789 Pine"}))
+    ->thenEvent(AddressChanged({customerId: cid("c1"), address: "789 Pine"}))
   )
 
   test("same address produces no events (idempotent)", () =>
     givenEvents([CustomerRegistered({address: "123 Main"})])
-    ->whenCmd(ChangeAddress({customerId: "c1", address: "123 Main"}))
+    ->whenCmd(ChangeAddress({customerId: cid("c1"), address: "123 Main"}))
     ->thenNoEvent
   )
 
   test("deactivated customer returns CustomerAlreadyDeactivated", () =>
     givenEvents([CustomerRegistered({address: "123 Main"}), CustomerDeactivated])
-    ->whenCmd(ChangeAddress({customerId: "c1", address: "789 Pine"}))
+    ->whenCmd(ChangeAddress({customerId: cid("c1"), address: "789 Pine"}))
     ->thenError(CustomerAlreadyDeactivated)
   )
 })

package/lib/ocaml/ChangeEmail.res

@@ -9,7 +9,7 @@ type consumedEvent =
   | CustomerDeactivated
 
 @schema
-type command = ChangeEmail({customerId: string, email: string})
+type command = ChangeEmail({customerId: CustomerId.t, email: string})
 
 @schema
 type error =
@@ -17,4 +17,4 @@ type error =
   | CustomerAlreadyDeactivated
 
 @schema
-type event = EmailChanged({customerId: string, email: string})
+type event = EmailChanged({customerId: CustomerId.t, email: string})

package/lib/ocaml/ChangeEmail_GWT.res

@@ -1,27 +1,29 @@
 @@reventless.gwt
 
+let cid = CustomerId.make
+
 describe("ChangeEmail StateChangeSlice", () => {
   test("non-existent customer returns CustomerNotFound", () =>
     givenEvents([])
-    ->whenCmd(ChangeEmail({customerId: "c1", email: "alice2@x.y"}))
+    ->whenCmd(ChangeEmail({customerId: cid("c1"), email: "alice2@x.y"}))
     ->thenError(CustomerNotFound)
   )
 
   test("active customer produces EmailChanged", () =>
     givenEvents([CustomerRegistered({email: "alice@x.y"})])
-    ->whenCmd(ChangeEmail({customerId: "c1", email: "alice2@x.y"}))
-    ->thenEvent(EmailChanged({customerId: "c1", email: "alice2@x.y"}))
+    ->whenCmd(ChangeEmail({customerId: cid("c1"), email: "alice2@x.y"}))
+    ->thenEvent(EmailChanged({customerId: cid("c1"), email: "alice2@x.y"}))
   )
 
   test("same email produces no events (idempotent)", () =>
     givenEvents([CustomerRegistered({email: "alice@x.y"})])
-    ->whenCmd(ChangeEmail({customerId: "c1", email: "alice@x.y"}))
+    ->whenCmd(ChangeEmail({customerId: cid("c1"), email: "alice@x.y"}))
     ->thenNoEvent
   )
 
   test("deactivated customer returns CustomerAlreadyDeactivated", () =>
     givenEvents([CustomerRegistered({email: "alice@x.y"}), CustomerDeactivated])
-    ->whenCmd(ChangeEmail({customerId: "c1", email: "alice2@x.y"}))
+    ->whenCmd(ChangeEmail({customerId: cid("c1"), email: "alice2@x.y"}))
     ->thenError(CustomerAlreadyDeactivated)
   )
 })

package/lib/ocaml/CustomerId.res

@@ -0,0 +1,4 @@
+// A customer's id: the partition its slices decide about, and an order's buyer.
+include Reventless.Id.Make({
+  let key = "customerId"
+})

package/lib/ocaml/Customers.res

@@ -2,9 +2,12 @@
 // Projects customer events from the shared ordering event log into a Customers read model.
 @@reventless.spec
 
+// Rows are keyed by this identity.
+module Key = CustomerId
+
 @schema
 type state = {
-  customerId: string,
+  customerId: CustomerId.t,
   @displayName email: string,
   address: string,
   deactivated: bool,
@@ -12,7 +15,7 @@ type state = {
 
 @schema
 type consumedEvent =
-  | CustomerRegistered({customerId: string, email: string, address: string})
-  | EmailChanged({customerId: string, email: string})
-  | AddressChanged({customerId: string, address: string})
-  | CustomerDeactivated({customerId: string})
+  | CustomerRegistered({customerId: CustomerId.t, email: string, address: string})
+  | EmailChanged({customerId: CustomerId.t, email: string})
+  | AddressChanged({customerId: CustomerId.t, address: string})
+  | CustomerDeactivated({customerId: CustomerId.t})