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

package/lib/ocaml/SendOrderConfirmation.res

@@ -5,10 +5,10 @@
 @@reventless.spec
 
 @schema
-type consumedEvent = OrderPlaced({orderId: string, customerId: string})
+type consumedEvent = OrderPlaced({orderId: OrderId.t, customerId: CustomerId.t})
 
 @schema
-type outboundItem = {orderId: string, customerId: string}
+type outboundItem = {orderId: OrderId.t, customerId: CustomerId.t}
 
 @schema
 type inboundCommand = unit

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

@@ -3,14 +3,17 @@
 // `orderId` is in the payload, so the envelope id adds nothing here.
 let collect = (event, ~sourceId as _) =>
   switch event {
-  | OrderPlaced({orderId, customerId}) => [(orderId, {orderId, customerId})]
+  | OrderPlaced({orderId, customerId}) => [(orderId->OrderId.toString, {orderId, customerId})]
   }
 
 // This slice calls a service the framework does not broker, so it reaches its
 // mailer directly and ignores the injected capabilities.
 let translate = async (_id, item, ~capabilities as _) => {
   try {
-    await EmailService.sendOrderConfirmation(~email=item.customerId, ~orderId=item.orderId)
+    await EmailService.sendOrderConfirmation(
+      ~email=item.customerId->CustomerId.toString,
+      ~orderId=item.orderId->OrderId.toString,
+    )
     Ok(None)
   } catch {
   | exn =>

package/lib/ocaml/ShipOrder.res

@@ -9,7 +9,7 @@ type consumedEvent =
   | OrderCancelled
 
 @schema
-type command = ShipOrder({orderId: string})
+type command = ShipOrder({orderId: OrderId.t})
 
 @schema
 type error =
@@ -17,7 +17,7 @@ type error =
   | OrderAlreadyCancelled
 
 @schema
-type event = OrderShipped({orderId: string})
+type event = OrderShipped({orderId: OrderId.t})
 
 type lifecycleState = Orders.lifecycle
 

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

@@ -9,13 +9,13 @@ type consumedEvent =
 
 @schema
 type command =
-  | SyncNewProduct({productId: string, name: string, price: float})
-  | ChangeSyncedPrice({productId: string, price: float})
+  | SyncNewProduct({productId: CatalogSpec.ProductId.t, name: string, price: float})
+  | ChangeSyncedPrice({productId: CatalogSpec.ProductId.t, price: float})
 
 @schema
 type error = unit // always succeeds — sync is idempotent
 
 @schema
 type event =
-  | 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/SyncCatalogProduct_GWT.res

@@ -1,27 +1,29 @@
 @@reventless.gwt
 
+let pid = CatalogSpec.ProductId.make
+
 describe("SyncCatalogProduct StateChangeSlice", () => {
   test("SyncNewProduct produces CatalogProductSynced", () =>
     givenEvents([])
-    ->whenCmd(SyncNewProduct({productId: "p1", name: "Laptop", price: 999.99}))
-    ->thenEvent(CatalogProductSynced({productId: "p1", name: "Laptop", price: 999.99}))
+    ->whenCmd(SyncNewProduct({productId: pid("p1"), name: "Laptop", price: 999.99}))
+    ->thenEvent(CatalogProductSynced({productId: pid("p1"), name: "Laptop", price: 999.99}))
   )
 
   test("ChangeSyncedPrice produces CatalogProductPriceChanged", () =>
     givenEvents([CatalogProductSynced({name: "Laptop", price: 999.99})])
-    ->whenCmd(ChangeSyncedPrice({productId: "p1", price: 899.99}))
-    ->thenEvent(CatalogProductPriceChanged({productId: "p1", price: 899.99}))
+    ->whenCmd(ChangeSyncedPrice({productId: pid("p1"), price: 899.99}))
+    ->thenEvent(CatalogProductPriceChanged({productId: pid("p1"), price: 899.99}))
   )
 
   test("re-syncing identical product data produces no events (idempotent)", () =>
     givenEvents([CatalogProductSynced({name: "Laptop", price: 999.99})])
-    ->whenCmd(SyncNewProduct({productId: "p1", name: "Laptop", price: 999.99}))
+    ->whenCmd(SyncNewProduct({productId: pid("p1"), name: "Laptop", price: 999.99}))
     ->thenNoEvent
   )
 
   test("re-applying the current price produces no events (idempotent)", () =>
     givenEvents([CatalogProductSynced({name: "Laptop", price: 999.99})])
-    ->whenCmd(ChangeSyncedPrice({productId: "p1", price: 999.99}))
+    ->whenCmd(ChangeSyncedPrice({productId: pid("p1"), price: 999.99}))
     ->thenNoEvent
   )
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/online-shop-dcb-ordering",
-  "version": "1.0.0-alpha.246",
+  "version": "1.0.0-alpha.248",
   "description": "Online Shop example — Ordering bounded context (Customer & Order) using the DCB pattern",
   "license": "Apache-2.0",
   "jest": {
@@ -21,18 +21,18 @@
   },
   "dependencies": {
     "sury": "11.0.0-rc.2",
-    "@reventlessdev/online-shop-dcb-ordering-spec": "1.0.0-alpha.139",
-    "@reventlessdev/online-shop-dcb-catalog-spec": "1.0.0-alpha.139",
+    "@reventlessdev/online-shop-dcb-catalog-spec": "1.0.0-alpha.140",
+    "@reventlessdev/online-shop-dcb-ordering-spec": "1.0.0-alpha.140",
     "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.21",
-    "@reventlessdev/reventless-gwt": "1.0.0-alpha.213",
-    "@reventlessdev/reventless-infra": "3.0.0-alpha.167",
-    "@reventlessdev/reventless-local": "3.0.0-alpha.256",
-    "@reventlessdev/reventless-spec": "3.0.0-alpha.139"
+    "@reventlessdev/reventless-gwt": "1.0.0-alpha.215",
+    "@reventlessdev/reventless-infra": "3.0.0-alpha.168",
+    "@reventlessdev/reventless-local": "3.0.0-alpha.258",
+    "@reventlessdev/reventless-spec": "3.0.0-alpha.140"
   },
   "devDependencies": {
     "rescript": "12.3.0",
     "sury-ppx": "11.0.0-rc.2",
-    "@reventlessdev/reventless-ppx": "1.0.0-alpha.80"
+    "@reventlessdev/reventless-ppx": "1.0.0-alpha.81"
   },
   "peerDependencies": {
     "rescript": "12.3.0"

package/src/CatalogProduct/StateChange/SyncCatalogProduct.res

@@ -9,13 +9,13 @@ type consumedEvent =
 
 @schema
 type command =
-  | SyncNewProduct({productId: string, name: string, price: float})
-  | ChangeSyncedPrice({productId: string, price: float})
+  | SyncNewProduct({productId: CatalogSpec.ProductId.t, name: string, price: float})
+  | ChangeSyncedPrice({productId: CatalogSpec.ProductId.t, price: float})
 
 @schema
 type error = unit // always succeeds — sync is idempotent
 
 @schema
 type event =
-  | 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/src/CatalogProduct/StateChange/SyncCatalogProduct.res.mjs

@@ -2,6 +2,7 @@
 
 import * as Sury from "sury";
 import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
+import * as ProductId$CatalogSpec from "@reventlessdev/online-shop-dcb-catalog-spec/src/ProductId.res.mjs";
 
 let consumedEventSchema = Sury.union([
   Sury.$schema(s => ({
@@ -18,13 +19,13 @@ let consumedEventSchema = Sury.union([
 let commandSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "SyncNewProduct",
-    productId: s.m(DcbTag$Reventless.string),
+    productId: s.m(DcbTag$Reventless.mark(ProductId$CatalogSpec.schema)),
     name: s.m(Sury.string),
     price: s.m(Sury.float)
   })),
   Sury.$schema(s => ({
     TAG: "ChangeSyncedPrice",
-    productId: s.m(DcbTag$Reventless.string),
+    productId: s.m(DcbTag$Reventless.mark(ProductId$CatalogSpec.schema)),
     price: s.m(Sury.float)
   }))
 ]);
@@ -34,13 +35,13 @@ let errorSchema = Sury.$unit;
 let eventSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "CatalogProductSynced",
-    productId: s.m(DcbTag$Reventless.string),
+    productId: s.m(DcbTag$Reventless.mark(ProductId$CatalogSpec.schema)),
     name: s.m(Sury.string),
     price: s.m(Sury.float)
   })),
   Sury.$schema(s => ({
     TAG: "CatalogProductPriceChanged",
-    productId: s.m(DcbTag$Reventless.string),
+    productId: s.m(DcbTag$Reventless.mark(ProductId$CatalogSpec.schema)),
     price: s.m(Sury.float)
   }))
 ]);

package/src/CatalogProduct/StateView/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/src/CatalogProduct/StateView/AvailableProducts.res.mjs

@@ -3,10 +3,11 @@
 import * as Sury from "sury";
 import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
 import * as ReadModel$Reventless from "@reventlessdev/reventless-spec/src/components/ReadModel.res.mjs";
+import * as ProductId$CatalogSpec from "@reventlessdev/online-shop-dcb-catalog-spec/src/ProductId.res.mjs";
 import * as StateAnnotations$Reventless from "@reventlessdev/reventless-spec/src/components/StateAnnotations.res.mjs";
 
 let stateSchema = Sury.$schema(s => ({
-  productId: s.m(Sury.string),
+  productId: s.m(ProductId$CatalogSpec.schema),
   name: s.m(Sury.string),
   price: s.m(Sury.float)
 }));
@@ -14,13 +15,13 @@ let stateSchema = Sury.$schema(s => ({
 let consumedEventSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "CatalogProductSynced",
-    productId: s.m(DcbTag$Reventless.string),
+    productId: s.m(DcbTag$Reventless.mark(ProductId$CatalogSpec.schema)),
     name: s.m(Sury.string),
     price: s.m(Sury.float)
   })),
   Sury.$schema(s => ({
     TAG: "CatalogProductPriceChanged",
-    productId: s.m(DcbTag$Reventless.string),
+    productId: s.m(DcbTag$Reventless.mark(ProductId$CatalogSpec.schema)),
     price: s.m(Sury.float)
   }))
 ]);
@@ -54,6 +55,8 @@ let name = "AvailableProducts";
 
 let Id;
 
+let Key;
+
 let subIdConfig;
 
 let moduleUrl = "@reventlessdev/online-shop-dcb-ordering/src/CatalogProduct/StateView/AvailableProducts.res.mjs";
@@ -65,6 +68,7 @@ let visibility = "Internal";
 export {
   name,
   Id,
+  Key,
   consumedEventSchema,
   config,
   subIdConfig,

package/src/Customer/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/src/Customer/CustomerId.res.mjs

@@ -0,0 +1,29 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
+
+let include = Id$Reventless.Make({
+  key: "customerId"
+});
+
+let schema = include.schema;
+
+let make = include.make;
+
+let makeFromString = include.makeFromString;
+
+let toString = include.toString;
+
+let cmp = include.cmp;
+
+let key = include.key;
+
+export {
+  schema,
+  make,
+  makeFromString,
+  toString,
+  cmp,
+  key,
+}
+/* include Not a pure module */

package/src/Customer/StateChange/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/src/Customer/StateChange/ChangeAddress.res.mjs

@@ -2,6 +2,7 @@
 
 import * as Sury from "sury";
 import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
+import * as CustomerId$OrderingPlugin from "../CustomerId.res.mjs";
 
 let consumedEventSchema = Sury.union([
   Sury.$schema(s => ({
@@ -17,7 +18,7 @@ let consumedEventSchema = Sury.union([
 
 let commandSchema = Sury.$schema(s => ({
   TAG: "ChangeAddress",
-  customerId: s.m(DcbTag$Reventless.string),
+  customerId: s.m(DcbTag$Reventless.mark(CustomerId$OrderingPlugin.schema)),
   address: s.m(Sury.string)
 }));
 
@@ -28,7 +29,7 @@ let errorSchema = Sury.union([
 
 let eventSchema = Sury.$schema(s => ({
   TAG: "AddressChanged",
-  customerId: s.m(DcbTag$Reventless.string),
+  customerId: s.m(DcbTag$Reventless.mark(CustomerId$OrderingPlugin.schema)),
   address: s.m(Sury.string)
 }));
 

package/src/Customer/StateChange/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/src/Customer/StateChange/ChangeEmail.res.mjs

@@ -2,6 +2,7 @@
 
 import * as Sury from "sury";
 import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
+import * as CustomerId$OrderingPlugin from "../CustomerId.res.mjs";
 
 let consumedEventSchema = Sury.union([
   Sury.$schema(s => ({
@@ -17,7 +18,7 @@ let consumedEventSchema = Sury.union([
 
 let commandSchema = Sury.$schema(s => ({
   TAG: "ChangeEmail",
-  customerId: s.m(DcbTag$Reventless.string),
+  customerId: s.m(DcbTag$Reventless.mark(CustomerId$OrderingPlugin.schema)),
   email: s.m(Sury.string)
 }));
 
@@ -28,7 +29,7 @@ let errorSchema = Sury.union([
 
 let eventSchema = Sury.$schema(s => ({
   TAG: "EmailChanged",
-  customerId: s.m(DcbTag$Reventless.string),
+  customerId: s.m(DcbTag$Reventless.mark(CustomerId$OrderingPlugin.schema)),
   email: s.m(Sury.string)
 }));
 

package/src/Customer/StateChange/DeactivateCustomer.res

@@ -8,10 +8,10 @@ type consumedEvent =
   | CustomerDeactivated
 
 @schema
-type command = DeactivateCustomer({customerId: string})
+type command = DeactivateCustomer({customerId: CustomerId.t})
 
 @schema
 type error = CustomerNotFound
 
 @schema
-type event = CustomerDeactivated({customerId: string})
+type event = CustomerDeactivated({customerId: CustomerId.t})

package/src/Customer/StateChange/DeactivateCustomer.res.mjs

@@ -2,6 +2,7 @@
 
 import * as Sury from "sury";
 import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
+import * as CustomerId$OrderingPlugin from "../CustomerId.res.mjs";
 
 let consumedEventSchema = Sury.union([
   Sury.literal("CustomerRegistered"),
@@ -10,14 +11,14 @@ let consumedEventSchema = Sury.union([
 
 let commandSchema = Sury.$schema(s => ({
   TAG: "DeactivateCustomer",
-  customerId: s.m(DcbTag$Reventless.string)
+  customerId: s.m(DcbTag$Reventless.mark(CustomerId$OrderingPlugin.schema))
 }));
 
 let errorSchema = Sury.literal("CustomerNotFound");
 
 let eventSchema = Sury.$schema(s => ({
   TAG: "CustomerDeactivated",
-  customerId: s.m(DcbTag$Reventless.string)
+  customerId: s.m(DcbTag$Reventless.mark(CustomerId$OrderingPlugin.schema))
 }));
 
 function commandAuthorization(param) {

package/src/Customer/StateChange/RegisterCustomer.res

@@ -6,10 +6,10 @@
 type consumedEvent = CustomerRegistered
 
 @schema
-type command = RegisterCustomer({customerId: string, email: string, address: string})
+type command = RegisterCustomer({customerId: CustomerId.t, email: string, address: string})
 
 @schema
 type error = CustomerAlreadyRegistered
 
 @schema
-type event = CustomerRegistered({customerId: string, email: string, address: string})
+type event = CustomerRegistered({customerId: CustomerId.t, email: string, address: string})

package/src/Customer/StateChange/RegisterCustomer.res.mjs

@@ -2,12 +2,13 @@
 
 import * as Sury from "sury";
 import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
+import * as CustomerId$OrderingPlugin from "../CustomerId.res.mjs";
 
 let consumedEventSchema = Sury.literal("CustomerRegistered");
 
 let commandSchema = Sury.$schema(s => ({
   TAG: "RegisterCustomer",
-  customerId: s.m(DcbTag$Reventless.string),
+  customerId: s.m(DcbTag$Reventless.mark(CustomerId$OrderingPlugin.schema)),
   email: s.m(Sury.string),
   address: s.m(Sury.string)
 }));
@@ -16,7 +17,7 @@ let errorSchema = Sury.literal("CustomerAlreadyRegistered");
 
 let eventSchema = Sury.$schema(s => ({
   TAG: "CustomerRegistered",
-  customerId: s.m(DcbTag$Reventless.string),
+  customerId: s.m(DcbTag$Reventless.mark(CustomerId$OrderingPlugin.schema)),
   email: s.m(Sury.string),
   address: s.m(Sury.string)
 }));

package/src/Customer/StateView/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})