cabloy 5.1.225 → 5.1.227

package/vona/pnpm-workspace.yaml

@@ -29,7 +29,6 @@ publicHoistPattern:
   - '*cabloy*'
   - '*@cabloy*'
   - '*why-is-node-running*'
-  - '*ts-node*'
   - zod
 
 overrides:

package/vona/src/suite/a-commerce/modules/commerce-catalog/test/product.test.ts

@@ -68,6 +68,7 @@ describe('product.test.ts', { concurrency: false }, () => {
           title: `__Tom-${suffix}__`,
           published: false,
           description: 'This is a test',
+          productContentForm: undefined,
         };
         const productId = await app.bean.executor.performAction(
           'post',
@@ -82,6 +83,7 @@ describe('product.test.ts', { concurrency: false }, () => {
           title: `__TomNew-${suffix}__`,
           published: true,
           description: 'This is a test',
+          productContentForm: undefined,
         };
         assert.equal(!!productId, true);
         const selectRes: DtoProductSelectRes = await app.bean.executor.performAction(

package/vona/src/suite/a-commerce/modules/commerce-catalog/test/sku.test.ts

@@ -43,6 +43,7 @@ describe('sku.test.ts', { concurrency: false }, () => {
           categoryId,
           title: '__SkuProduct__',
           published: true,
+          productContentForm: undefined,
         };
         const productId = await app.bean.executor.performAction(
           'post',

package/vona/src/suite/a-commerce/modules/commerce-catalog/test/skuUniqueness.test.ts

@@ -119,18 +119,17 @@ describe('skuUniqueness.test.ts', { concurrency: false }, () => {
       await createFixture(fixture, suffix, 2);
       const sourceIds = await runInContext(async () => {
         const catalog = app.scope('commerce-catalog');
-        const skus = [];
+        const skuIds: TableIdentity[] = [];
         for (let index = 0; index < 2; index++) {
-          skus.push(
-            await catalog.service.sku.create({
-              productId: fixture.productIds[index]!,
-              code: sourceCodes[index]!,
-              priceCents: 100,
-              lifecycle: 'draft',
-            }),
-          );
+          const sku = await catalog.service.sku.create({
+            productId: fixture.productIds[index]!,
+            code: sourceCodes[index]!,
+            priceCents: 100,
+            lifecycle: 'draft',
+          });
+          skuIds.push(sku.id);
         }
-        return skus.map(sku => sku.id);
+        return skuIds;
       });
       const results = await Promise.allSettled(
         sourceIds.map((skuId, index) =>

package/vona/src/suite/a-commerce/modules/commerce-member/test/addressOwnership.test.ts

@@ -1,3 +1,7 @@
+import type { TableIdentity } from 'table-identity';
+import type { IPerformActionOptions } from 'vona-module-a-executor';
+import type { IApiPathRecordMethodMap } from 'vona-module-a-web';
+
 import { catchError } from '@cabloy/utils';
 import assert from 'node:assert';
 import { randomUUID } from 'node:crypto';
@@ -35,7 +39,10 @@ function createAddress(suffix: string): DtoAddressMineCreate {
   };
 }
 
-async function performAs(accessToken: string, method: string, path: string, options = {}) {
+async function performAs<
+  METHOD extends keyof IApiPathRecordMethodMap,
+  PATH extends keyof IApiPathRecordMethodMap[METHOD],
+>(accessToken: string, method: METHOD, path: PATH, options: IPerformActionOptions = {}) {
   return await app.bean.executor.newCtxIsolate(async () => {
     return await app.bean.executor.performAction(method, path, {
       ...options,
@@ -92,18 +99,37 @@ describe('addressOwnership.test.ts', () => {
 
   it('denies anonymous Admin and Web Address actions', async () => {
     await app.bean.executor.mockCtx(async () => {
-      for (const [method, path, options] of [
-        ['get', actionPath, {}],
-        ['get', `${actionPath}/:id`, { params: { id: 999999 } }],
-        ['get', minePath, {}],
-        ['get', viewMinePath, { params: { id: 999999 } }],
-        ['post', createMinePath, { body: createAddress('anonymous') }],
-        ['patch', updateMinePath, { params: { id: 999999 }, body: createAddress('anonymous') }],
-        ['delete', deleteMinePath, { params: { id: 999999 } }],
-      ] as const) {
-        const [_, err] = await catchError(() =>
-          app.bean.executor.performAction(method, path, { ...options, innerAccess: false }),
-        );
+      for (const action of [
+        () => app.bean.executor.performAction('get', actionPath, { innerAccess: false }),
+        () =>
+          app.bean.executor.performAction('get', `${actionPath}/:id`, {
+            params: { id: 999999 },
+            innerAccess: false,
+          }),
+        () => app.bean.executor.performAction('get', minePath, { innerAccess: false }),
+        () =>
+          app.bean.executor.performAction('get', viewMinePath, {
+            params: { id: 999999 },
+            innerAccess: false,
+          }),
+        () =>
+          app.bean.executor.performAction('post', createMinePath, {
+            body: createAddress('anonymous'),
+            innerAccess: false,
+          }),
+        () =>
+          app.bean.executor.performAction('patch', updateMinePath, {
+            params: { id: 999999 },
+            body: createAddress('anonymous'),
+            innerAccess: false,
+          }),
+        () =>
+          app.bean.executor.performAction('delete', deleteMinePath, {
+            params: { id: 999999 },
+            innerAccess: false,
+          }),
+      ]) {
+        const [_, err] = await catchError(action);
         assert.equal(err?.code, 401);
       }
     });
@@ -111,7 +137,7 @@ describe('addressOwnership.test.ts', () => {
 
   it('derives Web ownership from Passport and treats foreign rows as absent', async () => {
     await app.bean.executor.mockCtx(async () => {
-      let addressId: number | undefined;
+      let addressId: TableIdentity | undefined;
       try {
         const suffix = createTestId();
         const customerA = await registerAndSignin(`address-a-${suffix}`);
@@ -121,6 +147,7 @@ describe('addressOwnership.test.ts', () => {
           body: { ...addressData, userId: customerB.user.id, iid: 999999 } as any,
         });
 
+        assert.ok(addressId !== undefined);
         const persisted = await app.scope('commerce-member').model.address.getById(addressId);
         assert.equal(String(persisted?.userId), String(customerA.user.id));
         assert.equal(persisted?.iid, app.ctx.instance.id);
@@ -201,7 +228,7 @@ describe('addressOwnership.test.ts', () => {
 
   it('exposes active-instance Address inspection only to systemAdmin', async () => {
     await app.bean.executor.mockCtx(async () => {
-      let addressId: number | undefined;
+      let addressId: TableIdentity | undefined;
       try {
         const suffix = createTestId();
         const customer = await registerAndSignin(`address-admin-${suffix}`);
@@ -238,7 +265,7 @@ describe('addressOwnership.test.ts', () => {
   });
 
   it('treats another instance Address as absent on Web actions', async () => {
-    let addressId: number | undefined;
+    let addressId: TableIdentity | undefined;
     let customerDefault!: Awaited<ReturnType<typeof registerAndSignin>>;
     const addressDefault = createAddress('default');
     try {

package/vona/src/suite/a-commerce/modules/commerce-member/test/addressPresentation.test.ts

@@ -1,3 +1,6 @@
+import type { IPerformActionOptions } from 'vona-module-a-executor';
+import type { IApiPathRecordMethodMap } from 'vona-module-a-web';
+
 import assert from 'node:assert';
 import { randomUUID } from 'node:crypto';
 import { describe, it } from 'node:test';
@@ -51,7 +54,10 @@ function createAddress(suffix: string): DtoAddressMineCreate {
   };
 }
 
-async function performAs(accessToken: string, method: string, path: string, options = {}) {
+async function performAs<
+  METHOD extends keyof IApiPathRecordMethodMap,
+  PATH extends keyof IApiPathRecordMethodMap[METHOD],
+>(accessToken: string, method: METHOD, path: PATH, options: IPerformActionOptions = {}) {
   return await app.bean.executor.newCtxIsolate(async () => {
     return await app.bean.executor.performAction(method, path, {
       ...options,

package/vona/src/suite/a-commerce/modules/commerce-payment/test/paymentIndexes.test.ts

@@ -16,6 +16,7 @@ import {
   resolveVonaLocalPaths,
 } from 'vona';
 import { app } from 'vona-mock';
+import { MetaVersion } from 'vona-module-a-index';
 import { ServiceDatabaseAsyncLocalStorage, ServiceDatabaseClient } from 'vona-module-a-orm';
 
 const expectedIndexes = {
@@ -198,7 +199,7 @@ describe('paymentIndexes.test.ts', { concurrency: false }, () => {
           assert.ok(indexesBefore.some(item => item.name === retainedIndex));
 
           const update = async () => {
-            await app.bean._getBean('a-index.meta.version').update({ version: -1 });
+            await app.bean._getBean(MetaVersion).update({ version: -1 });
           };
           for (let pass = 0; pass < 2; pass++) {
             await update();

package/vona/src/suite/a-commerce/modules/commerce-promotion/test/couponReservation.test.ts

@@ -1,3 +1,5 @@
+import type { TableIdentity } from 'table-identity';
+
 import { catchError } from '@cabloy/utils';
 import assert from 'node:assert';
 import { randomUUID } from 'node:crypto';
@@ -13,7 +15,7 @@ interface IFixture {
   userId?: number;
   templateIds?: number[];
   grantIds?: number[];
-  userIds?: number[];
+  userIds?: TableIdentity[];
 }
 
 function createTestId() {
@@ -36,7 +38,7 @@ async function cleanup(fixture: IFixture) {
   }
   for (const userId of userIds) {
     await app.scope('home-user').model.roleUser.delete({ userId });
-    await app.bean.user.removeById(userId);
+    if (userId !== undefined) await app.bean.user.removeById(userId);
   }
 }
 
@@ -199,10 +201,15 @@ describe('couponReservation.test.ts', { concurrency: false }, () => {
           reason: 'test reserve',
         });
         assert.equal(replay.couponGrant.id, grant.id);
+        const wrongCustomer = await app.bean.user.register(
+          { name: `coupon-wrong-customer-${suffix}` },
+          true,
+        );
+        (fixture.userIds ??= []).push(wrongCustomer.id);
         const [, wrongCustomerError] = await catchError(() =>
           coupon.reserve({
             couponGrantId: grant.id,
-            userId: customer.id + 10_000,
+            userId: wrongCustomer.id,
             orderId: 100_001,
             eligibleSubtotalCents: 1_200,
             currency: 'USD',
@@ -434,16 +441,18 @@ describe('couponReservation.test.ts', { concurrency: false }, () => {
           customer.id as number,
           `reserve-exhausted-${suffix}`,
         );
-        for (const [grant, label] of [
-          [disabledGrant, 'disabled'],
-          [expiredGrant, 'expired'],
-          [usageExhaustedGrant, 'usage-exhausted'],
-        ] as const) {
+        for (const [index, [grant, label]] of (
+          [
+            [disabledGrant, 'disabled'],
+            [expiredGrant, 'expired'],
+            [usageExhaustedGrant, 'usage-exhausted'],
+          ] as const
+        ).entries()) {
           const [_, error] = await catchError(() =>
             coupon.reserve({
               couponGrantId: grant.id,
               userId: customer.id,
-              orderId: 200_000 + grant.id,
+              orderId: 200_000 + index,
               eligibleSubtotalCents: 1_000,
               currency: 'USD',
               correlationId: `reserve-${label}-${suffix}`,

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

@@ -1,3 +1,5 @@
+import type { IPerformActionOptions } from 'vona-module-a-executor';
+import type { IApiPathRecordMethodMap } from 'vona-module-a-web';
 import type { DtoCartAddItem, DtoCartUpdateItem } from 'vona-module-commerce-trade';
 
 import { catchError } from '@cabloy/utils';
@@ -22,7 +24,10 @@ function cartItem(skuId: number, quantity = 1): DtoCartAddItem {
   return { skuId, quantity };
 }
 
-async function performAs(accessToken: string, method: string, path: string, options = {}) {
+async function performAs<
+  METHOD extends keyof IApiPathRecordMethodMap,
+  PATH extends keyof IApiPathRecordMethodMap[METHOD],
+>(accessToken: string, method: METHOD, path: PATH, options: IPerformActionOptions = {}) {
   return await app.bean.executor.newCtxIsolate(async () => {
     return await app.bean.executor.performAction(method, path, {
       ...options,
@@ -106,16 +111,28 @@ describe('cartOwnership.test.ts', { concurrency: false }, () => {
 
   it('denies anonymous cart actions', async () => {
     await app.bean.executor.mockCtx(async () => {
-      for (const [method, path, options] of [
-        ['get', actionPath, {}],
-        ['post', `${actionPath}/items`, { body: cartItem(1) }],
-        ['patch', `${actionPath}/items/:id`, { params: { id: 999999 }, body: { quantity: 1 } }],
-        ['delete', `${actionPath}/items/:id`, { params: { id: 999999 } }],
-        ['delete', `${actionPath}/items`, {}],
-      ] as const) {
-        const [_, err] = await catchError(() =>
-          app.bean.executor.performAction(method, path, { ...options, innerAccess: false }),
-        );
+      for (const action of [
+        () => app.bean.executor.performAction('get', actionPath, { innerAccess: false }),
+        () =>
+          app.bean.executor.performAction('post', `${actionPath}/items`, {
+            body: cartItem(1),
+            innerAccess: false,
+          }),
+        () =>
+          app.bean.executor.performAction('patch', `${actionPath}/items/:id`, {
+            params: { id: 999999 },
+            body: { quantity: 1 },
+            innerAccess: false,
+          }),
+        () =>
+          app.bean.executor.performAction('delete', `${actionPath}/items/:id`, {
+            params: { id: 999999 },
+            innerAccess: false,
+          }),
+        () =>
+          app.bean.executor.performAction('delete', `${actionPath}/items`, { innerAccess: false }),
+      ]) {
+        const [_, err] = await catchError(action);
         assert.equal(err?.code, 401);
       }
     });

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

@@ -1,3 +1,5 @@
+import type { TableIdentity } from 'table-identity';
+
 import { catchError } from '@cabloy/utils';
 import assert from 'node:assert';
 import { randomUUID } from 'node:crypto';
@@ -5,22 +7,22 @@ import { after, before, describe, it } from 'node:test';
 import { acquireTestLock, 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[];
-  couponTemplateId?: number;
-  couponGrantId?: number;
-  userId?: number;
+  categoryId?: TableIdentity;
+  productId?: TableIdentity;
+  skuId?: TableIdentity;
+  balanceId?: TableIdentity;
+  cartId?: TableIdentity;
+  cartItemId?: TableIdentity;
+  addressId?: TableIdentity;
+  orderId?: TableIdentity;
+  orderLineId?: TableIdentity;
+  paymentAttemptId?: TableIdentity;
+  orderAuditId?: TableIdentity;
+  reservationId?: TableIdentity;
+  stockAuditIds?: TableIdentity[];
+  couponTemplateId?: TableIdentity;
+  couponGrantId?: TableIdentity;
+  userId?: TableIdentity;
 }
 
 async function cleanup(fixture: IFixture) {
@@ -113,6 +115,7 @@ describe('checkoutReservation.test.ts', { concurrency: false }, () => {
             lifecycle: 'active',
           },
         });
+        assert.ok(fixture.skuId !== undefined);
         fixture.balanceId = (
           await app.scope('commerce-trade').service.stockBalance.adjustStock({
             skuId: fixture.skuId,
@@ -246,6 +249,7 @@ describe('checkoutReservation.test.ts', { concurrency: false }, () => {
               lifecycle: 'active',
             },
           });
+          assert.ok(local.skuId !== undefined);
           local.balanceId = (
             await app.scope('commerce-trade').service.stockBalance.adjustStock({
               skuId: local.skuId,
@@ -339,6 +343,8 @@ describe('checkoutReservation.test.ts', { concurrency: false }, () => {
       );
 
       await app.bean.executor.mockCtx(async () => {
+        const cartItemId = local.cartItemId;
+        assert.ok(cartItemId !== undefined);
         const assertNoPartialWrites = async (correlationId: string) => {
           assert.equal(
             await app.scope('commerce-trade').model.order.get({ correlationId }),
@@ -349,7 +355,7 @@ describe('checkoutReservation.test.ts', { concurrency: false }, () => {
             undefined,
           );
           assert.equal(
-            (await app.scope('commerce-trade').model.cartItem.getById(local.cartItemId))?.quantity,
+            (await app.scope('commerce-trade').model.cartItem.getById(cartItemId))?.quantity,
             1,
           );
           const balance = await app
@@ -435,6 +441,7 @@ describe('checkoutReservation.test.ts', { concurrency: false }, () => {
             lifecycle: 'active',
           })
         ).id as number;
+        assert.ok(fixture.skuId !== undefined);
         fixture.balanceId = (
           await app.scope('commerce-trade').service.stockBalance.adjustStock({
             skuId: fixture.skuId,
@@ -521,6 +528,8 @@ describe('checkoutReservation.test.ts', { concurrency: false }, () => {
         )?.id as number;
         assert.equal(result.payableTotalCents, 799);
 
+        assert.ok(fixture.productId !== undefined);
+        assert.ok(fixture.addressId !== undefined);
         await app.scope('commerce-catalog').model.product.updateById(fixture.productId, {
           title: 'Changed checkout product',
           published: false,
@@ -609,6 +618,7 @@ describe('checkoutReservation.test.ts', { concurrency: false }, () => {
             lifecycle: 'active',
           },
         });
+        assert.ok(fixture.skuId !== undefined);
         const balance = await app.scope('commerce-trade').service.stockBalance.adjustStock({
           skuId: fixture.skuId,
           delta: 1,
@@ -644,6 +654,7 @@ describe('checkoutReservation.test.ts', { concurrency: false }, () => {
         });
         fixture.cartItemId = cartItem.id as number;
 
+        assert.ok(fixture.addressId !== undefined);
         const result = await app.scope('commerce-trade').service.order.checkout({
           addressId: fixture.addressId,
           correlationId: `checkout-${suffix}`,
@@ -691,10 +702,10 @@ describe('checkoutReservation.test.ts', { concurrency: false }, () => {
 
     const suffix = randomUUID().slice(0, 12);
     const fixture: {
-      categoryId?: number;
-      productId?: number;
-      skuId?: number;
-      balanceId?: number;
+      categoryId?: TableIdentity;
+      productId?: TableIdentity;
+      skuId?: TableIdentity;
+      balanceId?: TableIdentity;
       customers: Array<{
         name: string;
         userId: number;
@@ -776,6 +787,7 @@ describe('checkoutReservation.test.ts', { concurrency: false }, () => {
               lifecycle: 'active',
             },
           });
+          assert.ok(fixture.skuId !== undefined);
           const balance = await trade.service.stockBalance.adjustStock({
             skuId: fixture.skuId,
             delta: 1,

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

@@ -152,7 +152,7 @@ async function assertRollback(fixture: IFixture) {
   );
 }
 
-describe('checkoutTransaction.test.ts', { concurrency: false, sequential: true }, () => {
+describe('checkoutTransaction.test.ts', { concurrency: false }, () => {
   let releaseTestLock: (() => void) | undefined;
 
   before(async () => {
@@ -179,13 +179,14 @@ describe('checkoutTransaction.test.ts', { concurrency: false, sequential: true }
         await app.bean.passport.signinMock(customerName as any);
         let fixture: IFixture | undefined;
         try {
-          fixture = await createFixture(suffix);
+          const createdFixture = await createFixture(suffix);
+          fixture = createdFixture;
           const [_, error] = await catchError(() =>
             app.scope('commerce-trade').service.order.checkoutForTest(
               {
-                addressId: fixture.addressId,
-                couponGrantId: fixture.grantId,
-                correlationId: fixture.correlationId,
+                addressId: createdFixture.addressId,
+                couponGrantId: createdFixture.grantId,
+                correlationId: createdFixture.correlationId,
               },
               async currentStage => {
                 if (currentStage === stage) throw new Error(`checkout test failure: ${stage}`);

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

@@ -1,3 +1,5 @@
+import type { TableIdentity } from 'table-identity';
+
 import { catchError } from '@cabloy/utils';
 import assert from 'node:assert';
 import { randomUUID } from 'node:crypto';
@@ -5,16 +7,16 @@ import { after, before, describe, it } from 'node:test';
 import { acquireTestLock, app } from 'vona-mock';
 
 interface IFixture {
-  categoryId?: number;
-  productId?: number;
-  skuId?: number;
-  addressId?: number;
-  cartId?: number;
-  orderId?: number;
-  paymentAttemptId?: number;
-  couponTemplateId?: number;
-  couponGrantId?: number;
-  userId?: number;
+  categoryId?: TableIdentity;
+  productId?: TableIdentity;
+  skuId?: TableIdentity;
+  addressId?: TableIdentity;
+  cartId?: TableIdentity;
+  orderId?: TableIdentity;
+  paymentAttemptId?: TableIdentity;
+  couponTemplateId?: TableIdentity;
+  couponGrantId?: TableIdentity;
+  userId?: TableIdentity;
 }
 
 async function cleanup(fixture: IFixture) {
@@ -171,15 +173,21 @@ describe('orderSnapshot.test.ts', { concurrency: false }, () => {
           },
         );
 
+        const productId = fixture.productId;
+        const addressId = fixture.addressId;
+        const skuId = fixture.skuId;
+        assert.ok(productId !== undefined);
+        assert.ok(addressId !== undefined);
+        assert.ok(skuId !== undefined);
         const created = await app.scope('commerce-trade').service.order.createSnapshot({
-          addressId: fixture.addressId,
+          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,
+          addressId,
           couponGrantId: fixture.couponGrantId,
           correlationId: `snapshot-order-${suffix}`,
           lines: [{ skuId: fixture.skuId, quantity: 2 }],
@@ -188,9 +196,9 @@ describe('orderSnapshot.test.ts', { concurrency: false }, () => {
         assert.equal(replay.lines[0].id, created.lines[0].id);
         const [_, conflict] = await catchError(() =>
           app.scope('commerce-trade').service.order.createSnapshot({
-            addressId: fixture.addressId,
+            addressId,
             correlationId: `snapshot-order-${suffix}`,
-            lines: [{ skuId: fixture.skuId, quantity: 1 }],
+            lines: [{ skuId, quantity: 1 }],
           }),
         );
         assert.equal(conflict?.code, 409);
@@ -203,7 +211,7 @@ describe('orderSnapshot.test.ts', { concurrency: false }, () => {
           { name: 'Color', value: 'Black' },
         ]);
 
-        await app.scope('commerce-catalog').model.product.updateById(fixture.productId, {
+        await app.scope('commerce-catalog').model.product.updateById(productId, {
           title: 'Changed product title',
           published: false,
         });
@@ -213,7 +221,7 @@ describe('orderSnapshot.test.ts', { concurrency: false }, () => {
           attributes: [{ name: 'Color', value: 'Blue' }],
           lifecycle: 'inactive',
         });
-        await app.scope('commerce-member').model.address.updateById(fixture.addressId, {
+        await app.scope('commerce-member').model.address.updateById(addressId, {
           city: 'Oakland',
           addressLine1: 'Changed address',
         });
@@ -337,8 +345,12 @@ describe('orderSnapshot.test.ts', { concurrency: false }, () => {
           skuId: fixture.skuId,
           quantity: 1,
         });
+        const productId = fixture.productId;
+        const addressId = fixture.addressId;
+        assert.ok(productId !== undefined);
+        assert.ok(addressId !== undefined);
         const checkout = await app.scope('commerce-trade').service.order.checkout({
-          addressId: fixture.addressId,
+          addressId,
           couponGrantId: fixture.couponGrantId,
           correlationId: `refund-snapshot-checkout-${suffix}`,
         });
@@ -351,7 +363,7 @@ describe('orderSnapshot.test.ts', { concurrency: false }, () => {
             idempotencyKey: `refund-snapshot-payment-${suffix}`,
           });
 
-        await app.scope('commerce-catalog').model.product.updateById(fixture.productId, {
+        await app.scope('commerce-catalog').model.product.updateById(productId, {
           title: 'Changed refund product title',
           published: false,
         });
@@ -361,7 +373,7 @@ describe('orderSnapshot.test.ts', { concurrency: false }, () => {
           attributes: [{ name: 'Color', value: 'Blue' }],
           lifecycle: 'inactive',
         });
-        await app.scope('commerce-member').model.address.updateById(fixture.addressId, {
+        await app.scope('commerce-member').model.address.updateById(addressId, {
           city: 'Oakland',
           addressLine1: 'Changed refund address',
         });
@@ -417,13 +429,9 @@ describe('orderSnapshot.test.ts', { concurrency: false }, () => {
             lineTotalCents: 1299,
           },
         );
-        const liveProduct = await app
-          .scope('commerce-catalog')
-          .model.product.getById(fixture.productId);
+        const liveProduct = await app.scope('commerce-catalog').model.product.getById(productId);
         const liveSku = await app.scope('commerce-catalog').model.sku.getById(fixture.skuId);
-        const liveAddress = await app
-          .scope('commerce-member')
-          .model.address.getById(fixture.addressId);
+        const liveAddress = await app.scope('commerce-member').model.address.getById(addressId);
         const liveCoupon = await app
           .scope('commerce-promotion')
           .model.couponTemplate.getById(fixture.couponTemplateId);