cabloy 5.1.115 → 5.1.117

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

@@ -111,10 +111,6 @@ declare module 'vona-module-commerce-member' {
       getById<T extends IModelGetOptions<EntityAddress,ModelAddress>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityAddress, ModelAddress, T> | undefined>;
 updateById<T extends IModelUpdateOptions<EntityAddress,ModelAddress>>(id: TableIdentity, data: TypeModelMutateRelationData<EntityAddress,ModelAddress, T>, options?: T): Promise<TypeModelMutateRelationData<EntityAddress,ModelAddress, T>>;
 deleteById<T extends IModelDeleteOptions<EntityAddress,ModelAddress>>(id: TableIdentity, options?: T): Promise<void>;
-getByName<T extends IModelGetOptions<EntityAddress,ModelAddress>>(name?: string, options?: T): Promise<TypeModelRelationResult<EntityAddress, ModelAddress, T> | undefined>;
-getByNameEqI<T extends IModelGetOptions<EntityAddress,ModelAddress>>(name?: string, options?: T): Promise<TypeModelRelationResult<EntityAddress, ModelAddress, T> | undefined>;
-selectByName<T extends IModelSelectParams<EntityAddress,ModelAddress,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(name?: string, params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityAddress, ModelAddress, T>[]>;
-selectByNameEqI<T extends IModelSelectParams<EntityAddress,ModelAddress,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(name?: string, params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityAddress, ModelAddress, T>[]>;
     }
 }
 declare module 'vona-module-a-orm' {
@@ -204,27 +200,39 @@ declare module 'vona-module-commerce-member' {
 }
 /** meta: end */
 /** dto: begin */
-export * from '../dto/addressCreate.tsx';
+export * from '../dto/addressMineCreate.tsx';
+export * from '../dto/addressMineItem.tsx';
+export * from '../dto/addressMineReq.tsx';
+export * from '../dto/addressMineRes.tsx';
+export * from '../dto/addressMineUpdate.tsx';
+export * from '../dto/addressMineView.tsx';
 export * from '../dto/addressSelectReq.tsx';
 export * from '../dto/addressSelectRes.tsx';
 export * from '../dto/addressSelectResItem.tsx';
-export * from '../dto/addressUpdate.tsx';
 export * from '../dto/addressView.tsx';
-import type { IDtoOptionsAddressCreate } from '../dto/addressCreate.tsx';
+import type { IDtoOptionsAddressMineCreate } from '../dto/addressMineCreate.tsx';
+import type { IDtoOptionsAddressMineItem } from '../dto/addressMineItem.tsx';
+import type { IDtoOptionsAddressMineReq } from '../dto/addressMineReq.tsx';
+import type { IDtoOptionsAddressMineRes } from '../dto/addressMineRes.tsx';
+import type { IDtoOptionsAddressMineUpdate } from '../dto/addressMineUpdate.tsx';
+import type { IDtoOptionsAddressMineView } from '../dto/addressMineView.tsx';
 import type { IDtoOptionsAddressSelectReq } from '../dto/addressSelectReq.tsx';
 import type { IDtoOptionsAddressSelectRes } from '../dto/addressSelectRes.tsx';
 import type { IDtoOptionsAddressSelectResItem } from '../dto/addressSelectResItem.tsx';
-import type { IDtoOptionsAddressUpdate } from '../dto/addressUpdate.tsx';
 import type { IDtoOptionsAddressView } from '../dto/addressView.tsx';
 import 'vona-module-a-web';
 declare module 'vona-module-a-web' {
 
     export interface IDtoRecord {
-      'commerce-member:addressCreate': IDtoOptionsAddressCreate;
+      'commerce-member:addressMineCreate': IDtoOptionsAddressMineCreate;
+'commerce-member:addressMineItem': IDtoOptionsAddressMineItem;
+'commerce-member:addressMineReq': IDtoOptionsAddressMineReq;
+'commerce-member:addressMineRes': IDtoOptionsAddressMineRes;
+'commerce-member:addressMineUpdate': IDtoOptionsAddressMineUpdate;
+'commerce-member:addressMineView': IDtoOptionsAddressMineView;
 'commerce-member:addressSelectReq': IDtoOptionsAddressSelectReq;
 'commerce-member:addressSelectRes': IDtoOptionsAddressSelectRes;
 'commerce-member:addressSelectResItem': IDtoOptionsAddressSelectResItem;
-'commerce-member:addressUpdate': IDtoOptionsAddressUpdate;
 'commerce-member:addressView': IDtoOptionsAddressView;
     }
 
@@ -235,16 +243,40 @@ declare module 'vona-module-commerce-member' {
 }
 /** dto: end */
 /** dto: begin */
-import type { DtoAddressCreate } from '../dto/addressCreate.tsx';
+import type { DtoAddressMineCreate } from '../dto/addressMineCreate.tsx';
+import type { DtoAddressMineItem } from '../dto/addressMineItem.tsx';
+import type { DtoAddressMineReq } from '../dto/addressMineReq.tsx';
+import type { DtoAddressMineRes } from '../dto/addressMineRes.tsx';
+import type { DtoAddressMineUpdate } from '../dto/addressMineUpdate.tsx';
+import type { DtoAddressMineView } from '../dto/addressMineView.tsx';
 import type { DtoAddressSelectReq } from '../dto/addressSelectReq.tsx';
 import type { DtoAddressSelectRes } from '../dto/addressSelectRes.tsx';
 import type { DtoAddressSelectResItem } from '../dto/addressSelectResItem.tsx';
-import type { DtoAddressUpdate } from '../dto/addressUpdate.tsx';
 import type { DtoAddressView } from '../dto/addressView.tsx';
 declare module 'vona-module-commerce-member' {
 
-    export interface IDtoOptionsAddressCreate {
-      fields?: TypeEntityOptionsFields<DtoAddressCreate, IDtoOptionsAddressCreate[TypeSymbolKeyFieldsMore]>;
+    export interface IDtoOptionsAddressMineCreate {
+      fields?: TypeEntityOptionsFields<DtoAddressMineCreate, IDtoOptionsAddressMineCreate[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsAddressMineItem {
+      fields?: TypeEntityOptionsFields<DtoAddressMineItem, IDtoOptionsAddressMineItem[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsAddressMineReq {
+      fields?: TypeEntityOptionsFields<DtoAddressMineReq, IDtoOptionsAddressMineReq[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsAddressMineRes {
+      fields?: TypeEntityOptionsFields<DtoAddressMineRes, IDtoOptionsAddressMineRes[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsAddressMineUpdate {
+      fields?: TypeEntityOptionsFields<DtoAddressMineUpdate, IDtoOptionsAddressMineUpdate[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsAddressMineView {
+      fields?: TypeEntityOptionsFields<DtoAddressMineView, IDtoOptionsAddressMineView[TypeSymbolKeyFieldsMore]>;
     }
 
     export interface IDtoOptionsAddressSelectReq {
@@ -259,10 +291,6 @@ declare module 'vona-module-commerce-member' {
       fields?: TypeEntityOptionsFields<DtoAddressSelectResItem, IDtoOptionsAddressSelectResItem[TypeSymbolKeyFieldsMore]>;
     }
 
-    export interface IDtoOptionsAddressUpdate {
-      fields?: TypeEntityOptionsFields<DtoAddressUpdate, IDtoOptionsAddressUpdate[TypeSymbolKeyFieldsMore]>;
-    }
-
     export interface IDtoOptionsAddressView {
       fields?: TypeEntityOptionsFields<DtoAddressView, IDtoOptionsAddressView[TypeSymbolKeyFieldsMore]>;
     }
@@ -304,18 +332,20 @@ declare module 'vona-module-commerce-member' {
     }
 }
 declare module 'vona-module-a-web' {
-  export interface IApiPathPostRecord{
-        '/commerce/member/address': undefined;
-    }
-export interface IApiPathGetRecord{
-        '/commerce/member/address': undefined;
+  export interface IApiPathGetRecord{
+        '/commerce/member/address/mine': undefined;
+'/commerce/member/address/viewMine/:id': undefined;
+'/commerce/member/address': undefined;
 '/commerce/member/address/:id': undefined;
     }
+export interface IApiPathPostRecord{
+        '/commerce/member/address/createMine': undefined;
+    }
 export interface IApiPathPatchRecord{
-        '/commerce/member/address/:id': undefined;
+        '/commerce/member/address/updateMine/:id': undefined;
     }
 export interface IApiPathDeleteRecord{
-        '/commerce/member/address/:id': undefined;
+        '/commerce/member/address/deleteMine/:id': undefined;
     }
 
 }
@@ -327,6 +357,32 @@ import 'vona-module-a-openapi';
   }
 
 /** 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;
+        }
+
+          export interface SsrMenuAddress {
+            get $beanFullName(): 'commerce-member.ssrMenu.address';
+            get $onionName(): 'commerce-member:address';
+            get $onionOptions(): ISsrMenuOptionsAddress;
+          }
+}
+/** ssrMenu: end */
 /** locale: begin */
 import { locales } from './locales.ts';
 /** locale: end */

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

@@ -0,0 +1,30 @@
+import type { IDecoratorSsrMenuOptions } from 'vona-module-a-ssr';
+import type { ISsrSiteOptionsCommerceAdmin } from 'vona-module-commerce-siteadmin';
+
+import { BeanBase } from 'vona';
+import { $order } from 'vona-module-a-openapiutils';
+import { SsrMenu } from 'vona-module-a-ssr';
+
+import { $locale } from '../.metadata/locales.ts';
+
+export interface ISsrMenuOptionsAddress extends IDecoratorSsrMenuOptions<ISsrSiteOptionsCommerceAdmin> {}
+
+@SsrMenu<ISsrMenuOptionsAddress>({
+  items: {
+    address: {
+      title: $locale('Address'),
+      order: $order(3),
+      icon: undefined,
+      link: 'presetResource',
+      meta: {
+        params: {
+          resource: 'commerce-member:address',
+        },
+      },
+      group: 'commerce-siteadmin:catalog',
+      roles: ['systemAdmin'],
+    },
+  },
+  site: ['commerce-siteadmin:commerceAdmin'],
+})
+export class SsrMenuAddress extends BeanBase {}

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

@@ -4,15 +4,19 @@ import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 
 import { BeanBase } from 'vona';
 import { Api, Resource, v } from 'vona-module-a-openapiutils';
+import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { z } from 'zod';
 
 import type { ModelAddress } from '../model/address.ts';
 
-import { DtoAddressCreate } from '../dto/addressCreate.tsx';
+import { DtoAddressMineCreate } from '../dto/addressMineCreate.tsx';
+import { DtoAddressMineReq } from '../dto/addressMineReq.tsx';
+import { DtoAddressMineRes } from '../dto/addressMineRes.tsx';
+import { DtoAddressMineUpdate } from '../dto/addressMineUpdate.tsx';
+import { DtoAddressMineView } from '../dto/addressMineView.tsx';
 import { DtoAddressSelectReq } from '../dto/addressSelectReq.tsx';
 import { DtoAddressSelectRes } from '../dto/addressSelectRes.tsx';
-import { DtoAddressUpdate } from '../dto/addressUpdate.tsx';
 import { DtoAddressView } from '../dto/addressView.tsx';
 
 export interface IControllerOptionsAddress extends IDecoratorControllerOptions {}
@@ -20,14 +24,46 @@ export interface IControllerOptionsAddress extends IDecoratorControllerOptions {
 @Controller<IControllerOptionsAddress>('address')
 @Resource()
 export class ControllerAddress extends BeanBase {
-  @Web.post()
+  @Web.get('mine')
+  @Api.body(DtoAddressMineRes)
+  async mine(
+    @Arg.filter(DtoAddressMineReq) params: IQueryParams<ModelAddress>,
+  ): Promise<DtoAddressMineRes> {
+    return await this.scope.service.address.mine(params);
+  }
+
+  @Web.get('viewMine/:id')
+  @Api.body(v.optional(), v.object(DtoAddressMineView))
+  async viewMine(
+    @Arg.param('id', v.tableIdentity()) id: TableIdentity,
+  ): Promise<DtoAddressMineView | undefined> {
+    return await this.scope.service.address.viewMine(id);
+  }
+
+  @Web.post('createMine')
   @Api.body(v.tableIdentity())
-  async create(@Arg.body() address: DtoAddressCreate): Promise<TableIdentity> {
-    return (await this.scope.service.address.create(address)).id;
+  async createMine(@Arg.body() address: DtoAddressMineCreate): Promise<TableIdentity> {
+    return (await this.scope.service.address.createMine(address)).id;
+  }
+
+  @Web.patch('updateMine/:id')
+  @Api.body(z.null())
+  async updateMine(
+    @Arg.param('id', v.tableIdentity()) id: TableIdentity,
+    @Arg.body() address: DtoAddressMineUpdate,
+  ): Promise<void> {
+    await this.scope.service.address.updateMine(id, address);
+  }
+
+  @Web.delete('deleteMine/:id')
+  @Api.body(z.null())
+  async deleteMine(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<void> {
+    await this.scope.service.address.deleteMine(id);
   }
 
   @Web.get()
   @Api.body(DtoAddressSelectRes)
+  @Passport.systemAdmin()
   async select(
     @Arg.filter(DtoAddressSelectReq) params: IQueryParams<ModelAddress>,
   ): Promise<DtoAddressSelectRes> {
@@ -36,24 +72,10 @@ export class ControllerAddress extends BeanBase {
 
   @Web.get(':id')
   @Api.body(v.optional(), v.object(DtoAddressView))
+  @Passport.systemAdmin()
   async view(
     @Arg.param('id', v.tableIdentity()) id: TableIdentity,
   ): Promise<DtoAddressView | undefined> {
     return await this.scope.service.address.view(id);
   }
-
-  @Web.patch(':id')
-  @Api.body(z.null())
-  async update(
-    @Arg.param('id', v.tableIdentity()) id: TableIdentity,
-    @Arg.body() address: DtoAddressUpdate,
-  ): Promise<void> {
-    await this.scope.service.address.update(id, address);
-  }
-
-  @Web.delete(':id')
-  @Api.body(z.null())
-  async delete(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<void> {
-    await this.scope.service.address.delete(id);
-  }
 }

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

@@ -0,0 +1,35 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+
+import { $locale } from '../.metadata/locales.ts';
+
+export interface IDtoOptionsAddressMineCreate extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsAddressMineCreate>()
+export class DtoAddressMineCreate {
+  @Api.field(v.title($locale('RecipientName')), v.required(), v.min(2), v.max(100))
+  recipientName: string;
+
+  @Api.field(v.title($locale('Phone')), v.required(), v.min(1), v.max(50))
+  phone: string;
+
+  @Api.field(v.title($locale('CountryCode')), v.required(), v.min(2), v.max(10))
+  countryCode: string;
+
+  @Api.field(v.title($locale('Region')), v.required(), v.min(1), v.max(100))
+  region: string;
+
+  @Api.field(v.title($locale('City')), v.required(), v.min(1), v.max(100))
+  city: string;
+
+  @Api.field(v.title($locale('PostalCode')), v.required(), v.min(1), v.max(30))
+  postalCode: string;
+
+  @Api.field(v.title($locale('AddressLine1')), v.required(), v.min(1), v.max(255))
+  addressLine1: string;
+
+  @Api.field(v.title($locale('AddressLine2')), v.optional(), v.max(255))
+  addressLine2?: string;
+}

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

@@ -0,0 +1,39 @@
+import type { TableIdentity } from 'table-identity';
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+
+import { $locale } from '../.metadata/locales.ts';
+
+export interface IDtoOptionsAddressMineItem extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsAddressMineItem>()
+export class DtoAddressMineItem {
+  @Api.field(v.tableIdentity())
+  id: TableIdentity;
+
+  @Api.field(v.title($locale('RecipientName')), v.required(), v.min(2), v.max(100))
+  recipientName: string;
+
+  @Api.field(v.title($locale('Phone')), v.required(), v.min(1), v.max(50))
+  phone: string;
+
+  @Api.field(v.title($locale('CountryCode')), v.required(), v.min(2), v.max(10))
+  countryCode: string;
+
+  @Api.field(v.title($locale('Region')), v.required(), v.min(1), v.max(100))
+  region: string;
+
+  @Api.field(v.title($locale('City')), v.required(), v.min(1), v.max(100))
+  city: string;
+
+  @Api.field(v.title($locale('PostalCode')), v.required(), v.min(1), v.max(30))
+  postalCode: string;
+
+  @Api.field(v.title($locale('AddressLine1')), v.required(), v.min(1), v.max(255))
+  addressLine1: string;
+
+  @Api.field(v.title($locale('AddressLine2')), v.optional(), v.max(255))
+  addressLine2?: string;
+}

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

@@ -0,0 +1,11 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { $Dto } from 'vona-module-a-orm';
+import { Dto } from 'vona-module-a-web';
+
+import { EntityAddress } from '../entity/address.tsx';
+
+export interface IDtoOptionsAddressMineReq extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsAddressMineReq>()
+export class DtoAddressMineReq extends $Dto.queryPage(EntityAddress, []) {}

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

@@ -0,0 +1,11 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { $Dto } from 'vona-module-a-orm';
+import { Dto } from 'vona-module-a-web';
+
+import { DtoAddressMineItem } from './addressMineItem.tsx';
+
+export interface IDtoOptionsAddressMineRes extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsAddressMineRes>()
+export class DtoAddressMineRes extends $Dto.listAndCount(DtoAddressMineItem) {}

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

@@ -0,0 +1,10 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Dto } from 'vona-module-a-web';
+
+import { DtoAddressMineCreate } from './addressMineCreate.tsx';
+
+export interface IDtoOptionsAddressMineUpdate extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsAddressMineUpdate>()
+export class DtoAddressMineUpdate extends DtoAddressMineCreate {}

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

@@ -0,0 +1,10 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Dto } from 'vona-module-a-web';
+
+import { DtoAddressMineItem } from './addressMineItem.tsx';
+
+export interface IDtoOptionsAddressMineView extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsAddressMineView>()
+export class DtoAddressMineView extends DtoAddressMineItem {}

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

@@ -15,9 +15,6 @@ export interface IDtoOptionsAddressSelectResItem extends IDecoratorDtoOptions {}
     ZovaRender.block('basic-page:blockPage', {
       blocks: [
         ZovaRender.block('basic-page:blockFilter'),
-        ZovaRender.block('basic-page:blockToolbarBulk', {
-          actions: [ZovaRender.tableActionBulk('basic-table:actionCreate')],
-        }),
         ZovaRender.block('basic-page:blockTable'),
         ZovaRender.block('basic-page:blockPager'),
       ],
@@ -43,10 +40,7 @@ export class DtoAddressSelectResItem extends $Dto.get(() => ModelAddress, {
     v.title($locale('Operations')),
     ZovaRender.order(1, 'max'),
     ZovaRender.cell('basic-table:actionOperationsRow', {
-      actions: [
-        ZovaRender.tableActionRow('basic-table:actionUpdate'),
-        ZovaRender.tableActionRow('basic-table:actionDelete'),
-      ],
+      actions: [ZovaRender.tableActionRow('basic-table:actionView')],
     }),
   )
   _operationsRow?: unknown;

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

@@ -1,57 +1,72 @@
 import type { TableIdentity } from 'table-identity';
-import type { IQueryParams } from 'vona-module-a-orm';
+import type { IQueryParams, TypeModelColumns } from 'vona-module-a-orm';
 
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
-import type { DtoAddressCreate } from '../dto/addressCreate.tsx';
+import type { DtoAddressMineCreate } from '../dto/addressMineCreate.tsx';
+import type { DtoAddressMineRes } from '../dto/addressMineRes.tsx';
+import type { DtoAddressMineUpdate } from '../dto/addressMineUpdate.tsx';
+import type { DtoAddressMineView } from '../dto/addressMineView.tsx';
 import type { DtoAddressSelectRes } from '../dto/addressSelectRes.tsx';
-import type { DtoAddressUpdate } from '../dto/addressUpdate.tsx';
 import type { DtoAddressView } from '../dto/addressView.tsx';
+import type { EntityAddress } from '../entity/address.tsx';
 import type { ModelAddress } from '../model/address.ts';
 
+const addressColumns: TypeModelColumns<EntityAddress> = [
+  'id',
+  'recipientName',
+  'phone',
+  'countryCode',
+  'region',
+  'city',
+  'postalCode',
+  'addressLine1',
+  'addressLine2',
+  'createdAt',
+  'updatedAt',
+];
+
 @Service()
 export class ServiceAddress extends BeanBase {
-  async create(address: DtoAddressCreate) {
-    return await this.scope.model.address.insert({
-      ...address,
-      userId: this._getCurrentUserId(),
+  async select(params?: IQueryParams<ModelAddress>): Promise<DtoAddressSelectRes> {
+    return await this.scope.model.address.selectAndCount({
+      ...params,
+      orders: params?.orders ?? [['id', 'asc']],
     });
   }
 
-  async select(params?: IQueryParams<ModelAddress>): Promise<DtoAddressSelectRes> {
+  async view(id: TableIdentity): Promise<DtoAddressView | undefined> {
+    return await this.scope.model.address.getById(id);
+  }
+
+  async mine(params?: IQueryParams<ModelAddress>): Promise<DtoAddressMineRes> {
     return await this.scope.model.address.selectAndCount({
-      columns: [
-        'id',
-        'recipientName',
-        'phone',
-        'countryCode',
-        'region',
-        'city',
-        'postalCode',
-        'addressLine1',
-        'addressLine2',
-        'createdAt',
-        'updatedAt',
-      ],
+      ...params,
+      columns: addressColumns,
       where: { ...params?.where, userId: this._getCurrentUserId() },
-      orders: [['id', 'asc']],
-      limit: params?.limit ?? 20,
-      offset: params?.offset ?? 0,
+      orders: params?.orders ?? [['id', 'asc']],
     });
   }
 
-  async view(id: TableIdentity): Promise<DtoAddressView | undefined> {
+  async viewMine(id: TableIdentity): Promise<DtoAddressMineView | undefined> {
     return await this._getOwnedAddress(id);
   }
 
-  async update(id: TableIdentity, address: DtoAddressUpdate) {
+  async createMine(address: DtoAddressMineCreate) {
+    return await this.scope.model.address.insert({
+      ...address,
+      userId: this._getCurrentUserId(),
+    });
+  }
+
+  async updateMine(id: TableIdentity, address: DtoAddressMineUpdate) {
     const ownedAddress = await this._getOwnedAddress(id);
     if (!ownedAddress) return;
     await this.scope.model.address.updateById(ownedAddress.id, address);
   }
 
-  async delete(id: TableIdentity) {
+  async deleteMine(id: TableIdentity) {
     const ownedAddress = await this._getOwnedAddress(id);
     if (!ownedAddress) return;
     await this.scope.model.address.deleteById(ownedAddress.id);
@@ -64,21 +79,7 @@ export class ServiceAddress extends BeanBase {
   private async _getOwnedAddress(id: TableIdentity) {
     return await this.scope.model.address.get(
       { id, userId: this._getCurrentUserId() },
-      {
-        columns: [
-          'id',
-          'recipientName',
-          'phone',
-          'countryCode',
-          'region',
-          'city',
-          'postalCode',
-          'addressLine1',
-          'addressLine2',
-          'createdAt',
-          'updatedAt',
-        ],
-      },
+      { columns: addressColumns },
     );
   }
 }