cabloy 5.1.112 → 5.1.114

package/vona/src/suite/a-commerce/modules/commerce-trade/test/cartOwnership.test.ts

@@ -2,11 +2,16 @@ import type { DtoCartAddItem, DtoCartUpdateItem } from 'vona-module-commerce-tra
 
 import { catchError } from '@cabloy/utils';
 import assert from 'node:assert';
+import { randomUUID } from 'node:crypto';
 import { describe, it } from 'node:test';
 import { app } from 'vona-mock';
 
 const actionPath = '/commerce/trade/cart';
 
+function createTestId() {
+  return randomUUID().slice(0, 12);
+}
+
 function cartItem(skuId: number, quantity = 1): DtoCartAddItem {
   return { skuId, quantity };
 }
@@ -58,7 +63,7 @@ async function createSellableSku(suffix: string) {
   }
 }
 
-describe('cartOwnership.test.ts', () => {
+describe('cartOwnership.test.ts', { concurrency: false }, () => {
   it('denies anonymous cart actions', async () => {
     await app.bean.executor.mockCtx(async () => {
       for (const [method, path, options] of [
@@ -78,7 +83,7 @@ describe('cartOwnership.test.ts', () => {
 
   it('derives cart ownership from the authenticated customer and scopes every item action', async () => {
     await app.bean.executor.mockCtx(async () => {
-      const suffix = `${Date.now()}`;
+      const suffix = createTestId();
       const skuId = await createSellableSku(suffix);
       const customerA = await registerAndSignin(`cart-a-${suffix}`);
       const customerB = await registerAndSignin(`cart-b-${suffix}`);
@@ -135,7 +140,7 @@ describe('cartOwnership.test.ts', () => {
     let itemId!: number;
     let customerDefault!: Awaited<ReturnType<typeof registerAndSignin>>;
     await app.bean.executor.mockCtx(async () => {
-      const suffix = `${Date.now()}`;
+      const suffix = createTestId();
       const skuId = await createSellableSku(suffix);
       customerDefault = await registerAndSignin(`cart-default-${suffix}`);
       const cart = await performAs(customerDefault.token, 'post', `${actionPath}/items`, {

package/vona/src/suite/a-commerce/modules/commerce-trade/test/checkoutReservation.test.ts

@@ -0,0 +1,158 @@
+import assert from 'node:assert';
+import { randomUUID } from 'node:crypto';
+import { describe, it } from 'node:test';
+import { app } from 'vona-mock';
+
+interface IFixture {
+  categoryId?: number;
+  productId?: number;
+  skuId?: number;
+  balanceId?: number;
+  cartId?: number;
+  cartItemId?: number;
+  addressId?: number;
+  orderId?: number;
+  orderLineId?: number;
+  paymentAttemptId?: number;
+  orderAuditId?: number;
+  reservationId?: number;
+  stockAuditIds?: number[];
+}
+
+async function cleanup(fixture: IFixture) {
+  const trade = app.scope('commerce-trade');
+  const payment = app.scope('commerce-payment');
+  const member = app.scope('commerce-member');
+  const catalog = app.scope('commerce-catalog');
+  if (fixture.paymentAttemptId !== undefined)
+    await payment.model.paymentAttempt.delete({ id: fixture.paymentAttemptId });
+  if (fixture.orderAuditId !== undefined)
+    await trade.model.orderAudit.delete({ id: fixture.orderAuditId });
+  if (fixture.skuId !== undefined) await trade.model.stockAudit.delete({ skuId: fixture.skuId });
+  if (fixture.reservationId !== undefined)
+    await trade.model.stockReservation.delete({ id: fixture.reservationId });
+  if (fixture.orderLineId !== undefined)
+    await trade.model.orderLine.delete({ id: fixture.orderLineId });
+  if (fixture.orderId !== undefined) await trade.model.order.delete({ id: fixture.orderId });
+  if (fixture.cartItemId !== undefined)
+    await trade.model.cartItem.delete({ id: fixture.cartItemId });
+  if (fixture.cartId !== undefined) await trade.model.cart.delete({ id: fixture.cartId });
+  if (fixture.balanceId !== undefined)
+    await trade.model.stockBalance.delete({ id: fixture.balanceId });
+  if (fixture.skuId !== undefined) await catalog.model.sku.delete({ id: fixture.skuId });
+  if (fixture.productId !== undefined)
+    await catalog.model.product.delete({ id: fixture.productId });
+  if (fixture.categoryId !== undefined)
+    await catalog.model.category.delete({ id: fixture.categoryId });
+  if (fixture.addressId !== undefined) await member.model.address.delete({ id: fixture.addressId });
+}
+
+describe('checkoutReservation.test.ts', { concurrency: false }, () => {
+  it('creates an atomic checkout from the persisted cart and replays its correlation', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      const fixture: IFixture = {};
+      const suffix = randomUUID().slice(0, 12);
+      try {
+        await app.bean.passport.signinMock();
+        const userId = app.bean.passport.currentUser!.id;
+        fixture.categoryId = await app.bean.executor.performAction(
+          'post',
+          '/commerce/catalog/category',
+          {
+            body: { name: `checkout-category-${suffix}`, published: true },
+          },
+        );
+        fixture.productId = await app.bean.executor.performAction(
+          'post',
+          '/commerce/catalog/product',
+          {
+            body: {
+              categoryId: fixture.categoryId,
+              title: `checkout-product-${suffix}`,
+              published: true,
+            },
+          },
+        );
+        fixture.skuId = await app.bean.executor.performAction('post', '/commerce/catalog/sku', {
+          body: {
+            productId: fixture.productId,
+            code: `checkout-sku-${suffix}`,
+            priceCents: 1299,
+            attributes: [],
+            lifecycle: 'active',
+          },
+        });
+        const balance = await app.scope('commerce-trade').service.stockBalance.adjustStock({
+          skuId: fixture.skuId,
+          delta: 1,
+          reason: 'checkout fixture',
+          correlationId: `checkout-stock-${suffix}`,
+        });
+        fixture.balanceId = balance.id as number;
+        const auditsBefore = await app.scope('commerce-trade').model.stockAudit.select({
+          where: { skuId: fixture.skuId },
+        });
+        fixture.stockAuditIds = auditsBefore.map(item => item.id as number);
+        fixture.addressId = await app.bean.executor.performAction(
+          'post',
+          '/commerce/member/address',
+          {
+            body: {
+              recipientName: 'Checkout Customer',
+              phone: '15555550123',
+              countryCode: 'US',
+              region: 'California',
+              city: 'San Francisco',
+              postalCode: '94105',
+              addressLine1: '1 Market Street',
+            },
+          },
+        );
+        const cart = await app.scope('commerce-trade').model.cart.insert({ userId });
+        fixture.cartId = cart.id as number;
+        const cartItem = await app.scope('commerce-trade').model.cartItem.insert({
+          cartId: cart.id,
+          skuId: fixture.skuId,
+          quantity: 1,
+        });
+        fixture.cartItemId = cartItem.id as number;
+
+        const result = await app.scope('commerce-trade').service.order.checkout({
+          addressId: fixture.addressId,
+          correlationId: `checkout-${suffix}`,
+        });
+        fixture.orderId = result.orderId as number;
+        fixture.paymentAttemptId = result.paymentAttemptId as number;
+        assert.equal(result.state, 'awaiting_payment');
+        assert.equal(result.payableTotalCents, 1299);
+        assert.equal(
+          await app.scope('commerce-trade').model.cartItem.getById(cartItem.id),
+          undefined,
+        );
+        const line = await app
+          .scope('commerce-trade')
+          .model.orderLine.get({ orderId: result.orderId });
+        fixture.orderLineId = line?.id as number;
+        const reservation = await app
+          .scope('commerce-trade')
+          .model.stockReservation.get({ orderLineId: line?.id });
+        fixture.reservationId = reservation?.id as number;
+        assert.equal(reservation?.state, 'reserved');
+        const audit = await app
+          .scope('commerce-trade')
+          .model.orderAudit.get({ orderId: result.orderId });
+        fixture.orderAuditId = audit?.id as number;
+        assert.equal(audit?.operation, 'created');
+        const replay = await app.scope('commerce-trade').service.order.checkout({
+          addressId: fixture.addressId,
+          correlationId: `checkout-${suffix}`,
+        });
+        assert.equal(replay.orderId, result.orderId);
+        assert.equal(replay.paymentAttemptId, result.paymentAttemptId);
+      } finally {
+        await cleanup(fixture);
+        await app.bean.passport.signout();
+      }
+    });
+  });
+});

package/vona/src/suite/a-commerce/modules/commerce-trade/test/orderSnapshot.test.ts

@@ -0,0 +1,203 @@
+import { catchError } from '@cabloy/utils';
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+import { app } from 'vona-mock';
+
+interface IFixture {
+  categoryId?: number;
+  productId?: number;
+  skuId?: number;
+  addressId?: number;
+  orderId?: number;
+  couponTemplateId?: number;
+  couponGrantId?: number;
+}
+
+async function cleanup(fixture: IFixture) {
+  const promotion = app.scope('commerce-promotion');
+  const trade = app.scope('commerce-trade');
+  const catalog = app.scope('commerce-catalog');
+  const member = app.scope('commerce-member');
+  if (fixture.orderId !== undefined) {
+    const lines = await trade.model.orderLine.select({ where: { orderId: fixture.orderId } });
+    for (const line of lines) {
+      await trade.model.stockReservation.delete({ orderLineId: line.id });
+    }
+    await trade.model.orderLine.delete({ orderId: fixture.orderId });
+    await trade.model.order.delete({ id: fixture.orderId });
+  }
+  if (fixture.couponGrantId !== undefined) {
+    await promotion.model.couponAudit.delete({ couponGrantId: fixture.couponGrantId });
+    await promotion.model.couponGrant.delete({ id: fixture.couponGrantId });
+  }
+  if (fixture.couponTemplateId !== undefined) {
+    await promotion.model.couponTemplate.delete({ id: fixture.couponTemplateId });
+  }
+  if (fixture.skuId !== undefined) {
+    await trade.model.stockAudit.delete({ skuId: fixture.skuId });
+    await trade.model.stockReservation.delete({ skuId: fixture.skuId });
+    await trade.model.stockBalance.delete({ skuId: fixture.skuId });
+    await catalog.model.sku.delete({ id: fixture.skuId });
+  }
+  if (fixture.productId !== undefined)
+    await catalog.model.product.delete({ id: fixture.productId });
+  if (fixture.categoryId !== undefined)
+    await catalog.model.category.delete({ id: fixture.categoryId });
+  if (fixture.addressId !== undefined) await member.model.address.delete({ id: fixture.addressId });
+}
+
+describe('orderSnapshot.test.ts', { concurrency: false }, () => {
+  it('persists catalog and address facts independently from later source changes', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      const fixture: IFixture = {};
+      const suffix = `${Date.now()}`;
+      try {
+        await app.bean.passport.signinMock();
+        fixture.categoryId = await app.bean.executor.performAction(
+          'post',
+          '/commerce/catalog/category',
+          {
+            body: { name: `snapshot category ${suffix}`, published: true },
+          },
+        );
+        fixture.productId = await app.bean.executor.performAction(
+          'post',
+          '/commerce/catalog/product',
+          {
+            body: {
+              categoryId: fixture.categoryId,
+              title: `snapshot product ${suffix}`,
+              published: true,
+            },
+          },
+        );
+        fixture.skuId = await app.bean.executor.performAction('post', '/commerce/catalog/sku', {
+          body: {
+            productId: fixture.productId,
+            code: `snapshot-sku-${suffix}`,
+            priceCents: 1299,
+            attributes: [{ name: 'Color', value: 'Black' }],
+            lifecycle: 'active',
+          },
+        });
+        await app.scope('commerce-trade').service.stockBalance.adjustStock({
+          skuId: fixture.skuId,
+          delta: 2,
+          reason: 'snapshot fixture',
+          correlationId: `snapshot-stock-${suffix}`,
+        });
+        await app.bean.passport.signout();
+        await app.bean.passport.signinMock();
+        fixture.couponTemplateId = (
+          await app.scope('commerce-promotion').model.couponTemplate.insert({
+            name: `snapshot coupon ${suffix}`,
+            state: 'active',
+            currency: 'USD',
+            discountCents: 500,
+            minSpendCents: 1_000,
+            validFrom: new Date(Date.now() - 1_000),
+            validUntil: new Date(Date.now() + 60_000),
+            issuedCount: 0,
+            redeemedCount: 0,
+          })
+        ).id as number;
+        const customerId = app.bean.passport.currentUser!.id;
+        fixture.couponGrantId = (
+          await app.scope('commerce-promotion').service.coupon.issue({
+            templateId: fixture.couponTemplateId,
+            userId: customerId,
+            correlationId: `snapshot-coupon-${suffix}`,
+            reason: 'snapshot fixture',
+          })
+        ).id as number;
+        fixture.addressId = await app.bean.executor.performAction(
+          'post',
+          '/commerce/member/address',
+          {
+            body: {
+              recipientName: 'Snapshot Recipient',
+              phone: '15555550123',
+              countryCode: 'US',
+              region: 'California',
+              city: 'San Francisco',
+              postalCode: '94105',
+              addressLine1: '1 Market Street',
+            },
+          },
+        );
+
+        const created = await app.scope('commerce-trade').service.order.createSnapshot({
+          addressId: fixture.addressId,
+          couponGrantId: fixture.couponGrantId,
+          correlationId: `snapshot-order-${suffix}`,
+          lines: [{ skuId: fixture.skuId, quantity: 2 }],
+        });
+        fixture.orderId = created.order.id as number;
+        const replay = await app.scope('commerce-trade').service.order.createSnapshot({
+          addressId: fixture.addressId,
+          couponGrantId: fixture.couponGrantId,
+          correlationId: `snapshot-order-${suffix}`,
+          lines: [{ skuId: fixture.skuId, quantity: 2 }],
+        });
+        assert.equal(replay.order.id, created.order.id);
+        assert.equal(replay.lines[0].id, created.lines[0].id);
+        const [_, conflict] = await catchError(() =>
+          app.scope('commerce-trade').service.order.createSnapshot({
+            addressId: fixture.addressId,
+            correlationId: `snapshot-order-${suffix}`,
+            lines: [{ skuId: fixture.skuId, quantity: 1 }],
+          }),
+        );
+        assert.equal(conflict?.code, 409);
+        assert.equal(created.order.discountCents, 500);
+        assert.equal(created.order.payableTotalCents, 2098);
+        assert.equal(created.order.couponSnapshot?.couponGrantId, fixture.couponGrantId);
+        assert.equal(created.order.couponSnapshot?.couponCode, `snapshot-coupon-${suffix}`);
+        assert.equal(created.lines[0].titleSnapshot, `snapshot product ${suffix}`);
+        assert.deepEqual(created.lines[0].skuAttributesSnapshot, [
+          { name: 'Color', value: 'Black' },
+        ]);
+
+        await app.scope('commerce-catalog').model.product.updateById(fixture.productId, {
+          title: 'Changed product title',
+          published: false,
+        });
+        await app.scope('commerce-catalog').model.sku.updateById(fixture.skuId, {
+          code: 'changed-sku-code',
+          priceCents: 9999,
+          attributes: [{ name: 'Color', value: 'Blue' }],
+          lifecycle: 'inactive',
+        });
+        await app.scope('commerce-member').model.address.updateById(fixture.addressId, {
+          city: 'Oakland',
+          addressLine1: 'Changed address',
+        });
+
+        const snapshot = await app
+          .scope('commerce-trade')
+          .service.order.viewSnapshot(created.order.id);
+        assert.equal(snapshot?.order.addressSnapshot.city, 'San Francisco');
+        assert.equal(snapshot?.order.addressSnapshot.addressLine1, '1 Market Street');
+        assert.equal(snapshot?.order.discountCents, 500);
+        assert.equal(snapshot?.order.payableTotalCents, 2098);
+        assert.equal(snapshot?.order.couponSnapshot?.templateName, `snapshot coupon ${suffix}`);
+        assert.equal(snapshot?.lines.length, 1);
+        assert.equal(snapshot?.lines[0].skuCodeSnapshot, `snapshot-sku-${suffix}`);
+        assert.equal(snapshot?.lines[0].titleSnapshot, `snapshot product ${suffix}`);
+        assert.deepEqual(snapshot?.lines[0].skuAttributesSnapshot, [
+          { name: 'Color', value: 'Black' },
+        ]);
+        assert.equal(snapshot?.lines[0].unitPriceCents, 1299);
+        assert.equal(snapshot?.lines[0].eligibleSubtotalCents, 2598);
+        assert.equal(snapshot?.lines[0].lineTotalCents, 2598);
+        const reservation = await app.scope('commerce-trade').model.stockReservation.get({
+          orderLineId: created.lines[0].id,
+        });
+        assert.equal(reservation?.state, 'reserved');
+      } finally {
+        await cleanup(fixture);
+        await app.bean.passport.signout();
+      }
+    });
+  });
+});

package/vona/src/suite/a-commerce/modules/commerce-trade/test/reservationExpiry.test.ts

@@ -0,0 +1,163 @@
+import assert from 'node:assert';
+import { randomUUID } from 'node:crypto';
+import { describe, it } from 'node:test';
+import { app } from 'vona-mock';
+
+interface IFixture {
+  categoryId?: number;
+  productId?: number;
+  skuId?: number;
+  balanceId?: number;
+  cartId?: number;
+  addressId?: number;
+  orderId?: number;
+  orderLineId?: number;
+  reservationId?: number;
+  paymentAttemptId?: number;
+  orderAuditIds?: number[];
+}
+
+async function cleanup(fixture: IFixture) {
+  const trade = app.scope('commerce-trade');
+  const payment = app.scope('commerce-payment');
+  const member = app.scope('commerce-member');
+  const catalog = app.scope('commerce-catalog');
+  if (fixture.paymentAttemptId !== undefined)
+    await payment.model.paymentAttempt.delete({ id: fixture.paymentAttemptId });
+  if (fixture.orderId !== undefined)
+    await trade.model.orderAudit.delete({ orderId: fixture.orderId });
+  if (fixture.skuId !== undefined) await trade.model.stockAudit.delete({ skuId: fixture.skuId });
+  if (fixture.reservationId !== undefined)
+    await trade.model.stockReservation.delete({ id: fixture.reservationId });
+  if (fixture.orderLineId !== undefined)
+    await trade.model.orderLine.delete({ id: fixture.orderLineId });
+  if (fixture.orderId !== undefined) await trade.model.order.delete({ id: fixture.orderId });
+  if (fixture.cartId !== undefined) {
+    await trade.model.cartItem.delete({ cartId: fixture.cartId });
+    await trade.model.cart.delete({ id: fixture.cartId });
+  }
+  if (fixture.balanceId !== undefined)
+    await trade.model.stockBalance.delete({ id: fixture.balanceId });
+  if (fixture.skuId !== undefined) await catalog.model.sku.delete({ id: fixture.skuId });
+  if (fixture.productId !== undefined)
+    await catalog.model.product.delete({ id: fixture.productId });
+  if (fixture.categoryId !== undefined)
+    await catalog.model.category.delete({ id: fixture.categoryId });
+  if (fixture.addressId !== undefined) await member.model.address.delete({ id: fixture.addressId });
+}
+
+describe('reservationExpiry.test.ts', { concurrency: false }, () => {
+  it('expires an unpaid order and releases its reservation exactly once', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      const fixture: IFixture = {};
+      const suffix = randomUUID().slice(0, 12);
+      try {
+        await app.bean.passport.signinMock();
+        const userId = app.bean.passport.currentUser!.id;
+        fixture.categoryId = await app.bean.executor.performAction(
+          'post',
+          '/commerce/catalog/category',
+          {
+            body: { name: `expiry-category-${suffix}`, published: true },
+          },
+        );
+        fixture.productId = await app.bean.executor.performAction(
+          'post',
+          '/commerce/catalog/product',
+          {
+            body: {
+              categoryId: fixture.categoryId,
+              title: `expiry-product-${suffix}`,
+              published: true,
+            },
+          },
+        );
+        fixture.skuId = await app.bean.executor.performAction('post', '/commerce/catalog/sku', {
+          body: {
+            productId: fixture.productId,
+            code: `expiry-sku-${suffix}`,
+            priceCents: 899,
+            attributes: [],
+            lifecycle: 'active',
+          },
+        });
+        const balance = await app.scope('commerce-trade').service.stockBalance.adjustStock({
+          skuId: fixture.skuId,
+          delta: 1,
+          reason: 'expiry fixture',
+          correlationId: `expiry-stock-${suffix}`,
+        });
+        fixture.balanceId = balance.id as number;
+        fixture.addressId = await app.bean.executor.performAction(
+          'post',
+          '/commerce/member/address',
+          {
+            body: {
+              recipientName: 'Expiry Customer',
+              phone: '15555550124',
+              countryCode: 'US',
+              region: 'California',
+              city: 'San Francisco',
+              postalCode: '94105',
+              addressLine1: '2 Market Street',
+            },
+          },
+        );
+        const cart = await app.scope('commerce-trade').model.cart.insert({ userId });
+        fixture.cartId = cart.id as number;
+        await app.scope('commerce-trade').model.cartItem.insert({
+          cartId: cart.id,
+          skuId: fixture.skuId,
+          quantity: 1,
+        });
+        const created = await app.scope('commerce-trade').service.order.checkout({
+          addressId: fixture.addressId,
+          correlationId: `expiry-${suffix}`,
+        });
+        fixture.orderId = created.orderId as number;
+        fixture.paymentAttemptId = created.paymentAttemptId as number;
+        const line = await app
+          .scope('commerce-trade')
+          .model.orderLine.get({ orderId: created.orderId });
+        fixture.orderLineId = line?.id as number;
+        const reservation = await app
+          .scope('commerce-trade')
+          .model.stockReservation.get({ orderLineId: line?.id });
+        fixture.reservationId = reservation?.id as number;
+        await app.scope('commerce-trade').model.order.updateById(created.orderId, {
+          reservationExpiresAt: new Date(Date.now() - 1),
+        });
+
+        assert.equal(
+          await app.scope('commerce-trade').service.order.expireIfDue(created.orderId),
+          true,
+        );
+        assert.equal(
+          await app.scope('commerce-trade').service.order.expireIfDue(created.orderId),
+          false,
+        );
+        const order = await app.scope('commerce-trade').model.order.getById(created.orderId);
+        assert.equal(order?.state, 'expired');
+        const released = await app
+          .scope('commerce-trade')
+          .model.stockReservation.getById(reservation!.id);
+        assert.equal(released?.state, 'released');
+        const attempt = await app
+          .scope('commerce-payment')
+          .model.paymentAttempt.getById(created.paymentAttemptId);
+        assert.equal(attempt?.state, 'cancelled');
+        const audits = await app.scope('commerce-trade').model.orderAudit.select({
+          where: { orderId: created.orderId },
+          orders: [['id', 'asc']],
+        });
+        assert.deepEqual(
+          audits.map(item => item.operation),
+          ['created', 'expired'],
+        );
+      } finally {
+        await cleanup(fixture);
+        await app.bean.passport.signout();
+      }
+    });
+  });
+});