cabloy 5.1.131 → 5.1.133

package/vona/src/suite/a-commerce/modules/commerce-member/src/.metadata/index.ts

@@ -7,15 +7,15 @@ export * from '../entity/address.tsx';
 import type { IEntityOptionsAddress } from '../entity/address.tsx';
 import 'vona-module-a-orm';
 declare module 'vona-module-a-orm' {
-
+  
     export interface IEntityRecord {
       'commerce-member:address': IEntityOptionsAddress;
     }
 
-
+  
 }
 declare module 'vona-module-commerce-member' {
-
+   
 }
 /** entity: end */
 /** entity: begin */
@@ -33,7 +33,7 @@ declare module 'vona-module-a-orm' {
   }
 }
 declare module 'vona-module-commerce-member' {
-
+  
     export interface IEntityOptionsAddress {
       fields?: TypeEntityOptionsFields<EntityAddress, IEntityOptionsAddress[TypeSymbolKeyFieldsMore]>;
     }
@@ -44,15 +44,15 @@ export * from '../model/address.ts';
 import type { IModelOptionsAddress } from '../model/address.ts';
 import 'vona-module-a-orm';
 declare module 'vona-module-a-orm' {
-
+  
     export interface IModelRecord {
       'commerce-member:address': IModelOptionsAddress;
     }
 
-
+  
 }
 declare module 'vona-module-commerce-member' {
-
+  
         export interface ModelAddress {
           /** @internal */
           get scope(): ScopeModuleCommerceMember;
@@ -62,7 +62,7 @@ declare module 'vona-module-commerce-member' {
             get $beanFullName(): 'commerce-member.model.address';
             get $onionName(): 'commerce-member:address';
             get $onionOptions(): IModelOptionsAddress;
-          }
+          } 
 }
 /** model: end */
 /** model: begin */
@@ -84,13 +84,23 @@ declare module 'vona' {
 import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TypeModelSelectAndCount, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelIncrementParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'vona-module-a-orm';
 declare module 'vona-module-commerce-member' {
-
+  
   export interface ModelAddress {
       [SymbolKeyEntity]: EntityAddress;
       [SymbolKeyEntityMeta]: EntityAddressMeta;
       [SymbolKeyModelOptions]: IModelOptionsAddress;
       get<T extends IModelGetOptions<EntityAddress,ModelAddress>>(where: TypeModelWhere<EntityAddress>, options?: T): Promise<TypeModelRelationResult<EntityAddress, ModelAddress, T> | undefined>;
+      /**
+       * Retrieves one matching primary row with a pessimistic FOR UPDATE lock.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getForUpdate<T extends IModelGetOptions<EntityAddress,ModelAddress>>(where: TypeModelWhere<EntityAddress>, options?: T): Promise<TypeModelRelationResult<EntityAddress, ModelAddress, T> | undefined>;
+      /**
+       * Retrieves a primary row by ID with the same pessimistic FOR UPDATE lock semantics.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getByIdForUpdate<T extends IModelGetOptions<EntityAddress,ModelAddress>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityAddress, ModelAddress, T> | undefined>;
       mget<T extends IModelGetOptions<EntityAddress,ModelAddress>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityAddress, ModelAddress, T>[]>;
       selectAndCount<T extends IModelSelectParams<EntityAddress,ModelAddress,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityAddress, ModelAddress, T>>;
@@ -124,15 +134,15 @@ export * from '../service/address.ts';
 
 import 'vona-module-a-bean';
 declare module 'vona-module-a-bean' {
-
+  
     export interface IServiceRecord {
       'commerce-member:address': never;
     }
 
-
+  
 }
 declare module 'vona-module-commerce-member' {
-
+  
         export interface ServiceAddress {
           /** @internal */
           get scope(): ScopeModuleCommerceMember;
@@ -141,8 +151,8 @@ declare module 'vona-module-commerce-member' {
           export interface ServiceAddress {
             get $beanFullName(): 'commerce-member.service.address';
             get $onionName(): 'commerce-member:address';
-
-          }
+            
+          } 
 }
 /** service: end */
 /** service: begin */
@@ -166,16 +176,16 @@ export * from '../bean/meta.version.ts';
 import type { IMetaOptionsIndex } from 'vona-module-a-index';
 import 'vona-module-a-meta';
 declare module 'vona-module-a-meta' {
-
+  
     export interface IMetaRecord {
       'commerce-member:index': IMetaOptionsIndex;
 'commerce-member:version': never;
     }
 
-
+  
 }
 declare module 'vona-module-commerce-member' {
-
+  
         export interface MetaIndex {
           /** @internal */
           get scope(): ScopeModuleCommerceMember;
@@ -195,8 +205,8 @@ declare module 'vona-module-commerce-member' {
           export interface MetaVersion {
             get $beanFullName(): 'commerce-member.meta.version';
             get $onionName(): 'commerce-member:version';
-
-          }
+            
+          } 
 }
 /** meta: end */
 /** dto: begin */
@@ -222,7 +232,7 @@ import type { IDtoOptionsAddressSelectResItem } from '../dto/addressSelectResIte
 import type { IDtoOptionsAddressView } from '../dto/addressView.tsx';
 import 'vona-module-a-web';
 declare module 'vona-module-a-web' {
-
+  
     export interface IDtoRecord {
       'commerce-member:addressMineCreate': IDtoOptionsAddressMineCreate;
 'commerce-member:addressMineItem': IDtoOptionsAddressMineItem;
@@ -236,10 +246,10 @@ declare module 'vona-module-a-web' {
 'commerce-member:addressView': IDtoOptionsAddressView;
     }
 
-
+  
 }
 declare module 'vona-module-commerce-member' {
-
+   
 }
 /** dto: end */
 /** dto: begin */
@@ -254,7 +264,7 @@ import type { DtoAddressSelectRes } from '../dto/addressSelectRes.tsx';
 import type { DtoAddressSelectResItem } from '../dto/addressSelectResItem.tsx';
 import type { DtoAddressView } from '../dto/addressView.tsx';
 declare module 'vona-module-commerce-member' {
-
+  
     export interface IDtoOptionsAddressMineCreate {
       fields?: TypeEntityOptionsFields<DtoAddressMineCreate, IDtoOptionsAddressMineCreate[TypeSymbolKeyFieldsMore]>;
     }
@@ -301,15 +311,15 @@ export * from '../controller/address.ts';
 import type { IControllerOptionsAddress } from '../controller/address.ts';
 import 'vona-module-a-web';
 declare module 'vona-module-a-web' {
-
+  
     export interface IControllerRecord {
       'commerce-member:address': IControllerOptionsAddress;
     }
 
-
+  
 }
 declare module 'vona-module-commerce-member' {
-
+  
         export interface ControllerAddress {
           /** @internal */
           get scope(): ScopeModuleCommerceMember;
@@ -319,14 +329,14 @@ declare module 'vona-module-commerce-member' {
             get $beanFullName(): 'commerce-member.controller.address';
             get $onionName(): 'commerce-member:address';
             get $onionOptions(): IControllerOptionsAddress;
-          }
+          } 
 }
 /** controller: end */
 /** controller: begin */
 // @ts-ignore ignore
 import type { ControllerAddress } from '../controller/address.ts';
 declare module 'vona-module-commerce-member' {
-
+  
     export interface IControllerOptionsAddress {
       actions?: TypeControllerOptionsActions<ControllerAddress>;
     }
@@ -355,22 +365,22 @@ import 'vona-module-a-openapi';
       'commerce-member:address': never;
     }
   }
-
+  
 /** controller: end */
 /** ssrMenu: begin */
 export * from '../bean/ssrMenu.address.ts';
 import type { ISsrMenuOptionsAddress } from '../bean/ssrMenu.address.ts';
 import 'vona-module-a-ssr';
 declare module 'vona-module-a-ssr' {
-
+  
     export interface ISsrMenuRecord {
       'commerce-member:address': ISsrMenuOptionsAddress;
     }
 
-
+  
 }
 declare module 'vona-module-commerce-member' {
-
+  
         export interface SsrMenuAddress {
           /** @internal */
           get scope(): ScopeModuleCommerceMember;
@@ -380,7 +390,7 @@ declare module 'vona-module-commerce-member' {
             get $beanFullName(): 'commerce-member.ssrMenu.address';
             get $onionName(): 'commerce-member:address';
             get $onionOptions(): ISsrMenuOptionsAddress;
-          }
+          } 
 }
 /** ssrMenu: end */
 /** locale: begin */
@@ -410,13 +420,13 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     commerceMember: ScopeModuleCommerceMember;
   }
-
-
+  
+  
 
   export interface IBeanScopeLocale {
     'commerce-member': (typeof locales)[TypeLocaleBase];
   }
 
-
+  
 }
 /** scope: end */

package/vona/src/suite/a-commerce/modules/commerce-member/src/dto/addressSelectResItem.tsx

@@ -6,6 +6,7 @@ import { Dto } from 'vona-module-a-web';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
+import { EntityAddress } from '../entity/address.tsx';
 import { ModelAddress } from '../model/address.ts';
 
 export interface IDtoOptionsAddressSelectResItem extends IDecoratorDtoOptions {}
@@ -45,20 +46,11 @@ export interface IDtoOptionsAddressSelectResItem extends IDecoratorDtoOptions {}
   ],
 })
 export class DtoAddressSelectResItem extends $Dto.get(() => ModelAddress, {
-  columns: [
-    'id',
-    'recipientName',
-    'phone',
-    'countryCode',
-    'region',
-    'city',
-    'postalCode',
-    'addressLine1',
-    'addressLine2',
-    'createdAt',
-    'updatedAt',
-  ],
+  columns: ['id', 'recipientName', 'phone', 'countryCode', 'city', 'createdAt'],
 }) {
+  @Api.field(ZovaRender.order(1, 'core'), ZovaRender.cell('basic-table:actionView'))
+  declare id: EntityAddress['id'];
+
   @Api.field(
     v.title($locale('Operations')),
     ZovaRender.order(1, 'max'),

package/vona/src/suite/a-commerce/modules/commerce-member/src/service/address.ts

@@ -19,12 +19,27 @@ export class ServiceAddress extends BeanBase {
   async select(params?: IQueryParams<ModelAddress>): Promise<DtoAddressSelectRes> {
     return await this.scope.model.address.selectAndCount({
       ...params,
+      columns: ['id', 'recipientName', 'phone', 'countryCode', 'city', 'createdAt'],
       orders: params?.orders ?? [['id', 'asc']],
     });
   }
 
   async view(id: TableIdentity): Promise<DtoAddressView | undefined> {
-    return await this.scope.model.address.getById(id);
+    return await this.scope.model.address.getById(id, {
+      columns: [
+        'id',
+        'recipientName',
+        'phone',
+        'countryCode',
+        'region',
+        'city',
+        'postalCode',
+        'addressLine1',
+        'addressLine2',
+        'createdAt',
+        'updatedAt',
+      ],
+    });
   }
 
   async mine(params?: IQueryParams<ModelAddress>): Promise<DtoAddressMineRes> {

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

@@ -0,0 +1,210 @@
+import assert from 'node:assert';
+import { randomUUID } from 'node:crypto';
+import { describe, it } from 'node:test';
+import { app } from 'vona-mock';
+import {
+  DtoAddressMineCreate,
+  DtoAddressSelectReq,
+  DtoAddressSelectResItem,
+  DtoAddressView,
+} from 'vona-module-commerce-member';
+
+const actionPath = '/commerce/member/address';
+const createMinePath = `${actionPath}/createMine`;
+
+function findComponent(apiJson: any, predicate: (properties: any) => boolean) {
+  return Object.values(apiJson.components!.schemas as any).find(item => {
+    return predicate((item as any).properties);
+  }) as any;
+}
+
+function getListFilter(component: any) {
+  const page = component?.rest?.blocks?.[0];
+  const [filter, table, pager] = page?.options?.blocks ?? [];
+  assert.equal(page?.render, 'basic-page:blockPage');
+  assert.equal(filter?.render, 'basic-page:blockFilter');
+  assert.equal(table?.render, 'basic-page:blockTable');
+  assert.equal(pager?.render, 'basic-page:blockPager');
+  return filter;
+}
+
+function getEntryToolbar(component: any) {
+  const pageEntry = component?.rest?.blocks?.[0];
+  const formBlock = pageEntry?.options?.blocks?.[0];
+  const toolbarBlock = pageEntry?.options?.blocks?.[1];
+  assert.equal(pageEntry?.render, 'basic-pageentry:blockPageEntry');
+  assert.equal(formBlock?.render, 'basic-pageentry:blockForm');
+  assert.equal(toolbarBlock?.render, 'basic-pageentry:blockToolbarRow');
+  return toolbarBlock;
+}
+
+function createAddress(suffix: string): DtoAddressMineCreate {
+  return {
+    recipientName: `Presentation Recipient ${suffix}`,
+    phone: '15555550123',
+    countryCode: 'US',
+    region: 'California',
+    city: 'San Francisco',
+    postalCode: '94105',
+    addressLine1: `1 Market Street ${suffix}`,
+    addressLine2: 'Suite 100',
+  };
+}
+
+async function performAs(accessToken: string, method: string, path: string, options = {}) {
+  return await app.bean.executor.newCtxIsolate(async () => {
+    return await app.bean.executor.performAction(method, path, {
+      ...options,
+      authToken: accessToken,
+      innerAccess: false,
+    });
+  });
+}
+
+describe('addressPresentation.test.ts', () => {
+  it('action:address:presentationMetadata', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      const listJson = await app.bean.openapi.generateJsonOfClass(DtoAddressSelectResItem);
+      const list = findComponent(
+        listJson,
+        properties =>
+          properties?._operationsRow && properties?.recipientName && properties?.countryCode,
+      );
+      assert.deepEqual(Object.keys(list.properties).sort(), [
+        '_operationsRow',
+        'city',
+        'countryCode',
+        'createdAt',
+        'id',
+        'phone',
+        'recipientName',
+      ]);
+      assert.equal(list.properties.id.rest.table.render, 'basic-table:actionView');
+      assert.equal(list.properties.createdAt.rest.table.render, 'basic-date:date');
+      assert.deepEqual(
+        list.properties._operationsRow.rest.table.columnProps.actions.map(
+          (action: any) => action.render,
+        ),
+        ['basic-table:actionView'],
+      );
+
+      const filter = getListFilter(list);
+      const section = filter.options.blocks[0].options.formLayout.children[0];
+      assert.equal(section.type, 'section');
+      assert.equal(section.layout, 'flow');
+      assert.deepEqual(
+        section.children.slice(0, 3).map((field: any) => field.name),
+        ['recipientName', 'phone', 'createdAt'],
+      );
+      assert.equal(section.children[3].block.render, 'basic-page:blockFilterActions');
+
+      const filterJson = await app.bean.openapi.generateJsonOfClass(DtoAddressSelectReq);
+      const filterComponent = findComponent(filterJson, properties => {
+        return properties?.recipientName && properties?.phone && properties?.createdAt;
+      });
+      assert.equal(
+        filterComponent.properties.createdAt.rest.form.render,
+        'basic-date:formFieldDateRange',
+      );
+
+      const viewJson = await app.bean.openapi.generateJsonOfClass(DtoAddressView);
+      const view = findComponent(
+        viewJson,
+        properties =>
+          properties?.recipientName && properties?.addressLine1 && properties?.updatedAt,
+      );
+      assert.deepEqual(Object.keys(view.properties).sort(), [
+        'addressLine1',
+        'addressLine2',
+        'city',
+        'countryCode',
+        'createdAt',
+        'id',
+        'phone',
+        'postalCode',
+        'recipientName',
+        'region',
+        'updatedAt',
+      ]);
+      assert.equal(view.properties.createdAt.rest.form.render, 'basic-date:formFieldDate');
+      assert.equal(view.properties.updatedAt.rest.form.render, 'basic-date:formFieldDate');
+      assert.deepEqual(
+        getEntryToolbar(view).options.actions.map((action: any) => action.render),
+        ['basic-form:actionBack'],
+      );
+
+      for (const component of [list, view]) {
+        for (const field of ['userId', 'iid', 'deleted']) {
+          assert.equal(component.properties[field], undefined);
+        }
+      }
+    });
+  });
+
+  it('action:address:runtimeBoundary', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      let addressId: number | undefined;
+      const suffix = randomUUID().slice(0, 12);
+      const address = createAddress(suffix);
+      try {
+        await app.bean.user.register({ name: `presentation-address-${suffix}` }, true);
+        const customer = await app.bean.passport.signinMock(
+          `presentation-address-${suffix}` as any,
+        );
+        addressId = await performAs(customer.accessToken, 'post', createMinePath, {
+          body: address,
+        });
+
+        const admin = await app.bean.passport.signinMock();
+        const list: any = await performAs(admin.accessToken, 'get', actionPath, {
+          query: { recipientName: address.recipientName },
+        });
+        const item = list.list.find((entry: any) => String(entry.id) === String(addressId));
+        assert.deepEqual(Object.keys(item).sort(), [
+          'city',
+          'countryCode',
+          'createdAt',
+          'id',
+          'phone',
+          'recipientName',
+        ]);
+        assert.equal(item.recipientName, address.recipientName);
+        assert.equal(item.phone, address.phone);
+        assert.equal(item.countryCode, address.countryCode);
+        assert.equal(item.city, address.city);
+
+        const view: any = await performAs(admin.accessToken, 'get', `${actionPath}/:id`, {
+          params: { id: addressId },
+        });
+        assert.deepEqual(Object.keys(view).sort(), [
+          'addressLine1',
+          'addressLine2',
+          'city',
+          'countryCode',
+          'createdAt',
+          'id',
+          'phone',
+          'postalCode',
+          'recipientName',
+          'region',
+          'updatedAt',
+        ]);
+        assert.equal(view.addressLine1, address.addressLine1);
+        assert.equal(view.addressLine2, address.addressLine2);
+        assert.equal(view.region, address.region);
+
+        const permissions = await Promise.all(
+          ['create', 'update', 'delete'].map(action =>
+            app.bean.permission.retrievePermissionAction('commerce-member:address', action),
+          ),
+        );
+        assert.deepEqual(permissions, [false, false, false]);
+      } finally {
+        if (addressId !== undefined) {
+          await app.scope('commerce-member').model.address.deleteById(addressId);
+        }
+        await app.bean.passport.signout();
+      }
+    });
+  });
+});

package/vona/src/suite/a-commerce/modules/commerce-payment/src/service/commercePayScene.ts

@@ -52,8 +52,9 @@ export class ServiceCommercePayScene extends BeanBase {
     return { ...refundAttempt, refundOperationId };
   }
 
+  @Core.transaction({ isolationLevel: 'SERIALIZABLE' })
   async createRefundOperation(refundAttemptId: TableIdentity) {
-    const refundAttempt = await this.scope.model.refundAttempt.getById(refundAttemptId);
+    const refundAttempt = await this.scope.model.refundAttempt.getByIdForUpdate(refundAttemptId);
     if (!refundAttempt) this.app.throw(404, 'commerce refund attempt not found');
     const paymentAttempt = await this.scope.model.paymentAttempt.get({
       orderId: refundAttempt.orderId,
@@ -68,7 +69,17 @@ export class ServiceCommercePayScene extends BeanBase {
       idempotencyKey: `${refundAttempt.correlationId}:refund`,
       correlationId: refundAttempt.correlationId,
     });
-    await this.linkRefundOperation(refundAttempt.id, refund.id);
+    if (
+      refundAttempt.refundOperationId &&
+      String(refundAttempt.refundOperationId) !== String(refund.id)
+    ) {
+      this.app.throw(409, 'commerce refund attempt is linked to another refund operation');
+    }
+    if (!refundAttempt.refundOperationId) {
+      await this.scope.model.refundAttempt.updateById(refundAttempt.id, {
+        refundOperationId: refund.id,
+      });
+    }
     return refund;
   }
 

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

@@ -46,6 +46,18 @@ describe('paymentAttempt.test.ts', { concurrency: false }, () => {
         assert.equal(session?.providerName, 'pay-mock:mock');
         assert.equal(session?.clientName, 'default');
         assert.equal(session?.environment, 'sandbox');
+        assert.match(
+          session?.providerInvoiceReference ?? '',
+          /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i,
+        );
+        assert.match(
+          session?.providerCorrelationReference ?? '',
+          /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i,
+        );
+        assert.notEqual(session?.providerInvoiceReference, session?.providerCorrelationReference);
+        const reloaded = await app.scope('a-pay').model.paymentSession.getById(paymentSessionId);
+        assert.equal(reloaded?.providerInvoiceReference, session?.providerInvoiceReference);
+        assert.equal(reloaded?.providerCorrelationReference, session?.providerCorrelationReference);
         assert.ok((session?.expiresAt.getTime() ?? 0) > Date.now() + 29 * 60 * 1000);
         const cancelled = await scope.service.paymentAttempt.cancel(created.orderId);
         assert.equal(cancelled?.state, 'cancelled');

package/vona/src/suite/a-commerce/modules/commerce-promotion/src/service/coupon.ts

@@ -42,7 +42,13 @@ const serializationRetryOptions = {
   minTimeout: 0,
   maxTimeout: 0,
   randomize: false,
-  errorCodes: ['40001', 'ER_LOCK_DEADLOCK', 'ER_LOCK_WAIT_TIMEOUT'],
+  errorCodes: [
+    '40001',
+    'ER_LOCK_DEADLOCK',
+    'ER_LOCK_WAIT_TIMEOUT',
+    'SQLITE_BUSY',
+    'SQLITE_BUSY_SNAPSHOT',
+  ],
   ownerOnly: true,
 };