vona-module-test-vona 5.0.51 → 5.0.52

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-test-vona",
   "type": "module",
-  "version": "5.0.51",
+  "version": "5.0.52",
   "title": "test-vona",
   "vonaModule": {
     "fileVersion": 1,

package/src/.metadata/index.ts

@@ -1331,7 +1331,9 @@ export interface IModuleSummerCache {
 export * from '../dto/categoryTree.ts';
 export * from '../dto/orderCreate.ts';
 export * from '../dto/orderQuery.ts';
+export * from '../dto/orderQueryPage.ts';
 export * from '../dto/orderResult.ts';
+export * from '../dto/orderResultPage.ts';
 export * from '../dto/orderUpdate.ts';
 export * from '../dto/postCreate.ts';
 export * from '../dto/postQuery.ts';
@@ -1346,7 +1348,9 @@ export * from '../dto/userUpdate.ts';
 import type { IDtoOptionsCategoryTree } from '../dto/categoryTree.ts';
 import type { IDtoOptionsOrderCreate } from '../dto/orderCreate.ts';
 import type { IDtoOptionsOrderQuery } from '../dto/orderQuery.ts';
+import type { IDtoOptionsOrderQueryPage } from '../dto/orderQueryPage.ts';
 import type { IDtoOptionsOrderResult } from '../dto/orderResult.ts';
+import type { IDtoOptionsOrderResultPage } from '../dto/orderResultPage.ts';
 import type { IDtoOptionsOrderUpdate } from '../dto/orderUpdate.ts';
 import type { IDtoOptionsPostCreate } from '../dto/postCreate.ts';
 import type { IDtoOptionsPostQuery } from '../dto/postQuery.ts';
@@ -1365,7 +1369,9 @@ declare module 'vona-module-a-web' {
       'test-vona:categoryTree': IDtoOptionsCategoryTree;
 'test-vona:orderCreate': IDtoOptionsOrderCreate;
 'test-vona:orderQuery': IDtoOptionsOrderQuery;
+'test-vona:orderQueryPage': IDtoOptionsOrderQueryPage;
 'test-vona:orderResult': IDtoOptionsOrderResult;
+'test-vona:orderResultPage': IDtoOptionsOrderResultPage;
 'test-vona:orderUpdate': IDtoOptionsOrderUpdate;
 'test-vona:postCreate': IDtoOptionsPostCreate;
 'test-vona:postQuery': IDtoOptionsPostQuery;
@@ -1389,7 +1395,9 @@ declare module 'vona-module-test-vona' {
 import type { DtoCategoryTree } from '../dto/categoryTree.ts';
 import type { DtoOrderCreate } from '../dto/orderCreate.ts';
 import type { DtoOrderQuery } from '../dto/orderQuery.ts';
+import type { DtoOrderQueryPage } from '../dto/orderQueryPage.ts';
 import type { DtoOrderResult } from '../dto/orderResult.ts';
+import type { DtoOrderResultPage } from '../dto/orderResultPage.ts';
 import type { DtoOrderUpdate } from '../dto/orderUpdate.ts';
 import type { DtoPostCreate } from '../dto/postCreate.ts';
 import type { DtoPostQuery } from '../dto/postQuery.ts';
@@ -1415,10 +1423,18 @@ declare module 'vona-module-test-vona' {
       fields?: TypeEntityOptionsFields<DtoOrderQuery, IDtoOptionsOrderQuery[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IDtoOptionsOrderQueryPage {
+      fields?: TypeEntityOptionsFields<DtoOrderQueryPage, IDtoOptionsOrderQueryPage[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IDtoOptionsOrderResult {
       fields?: TypeEntityOptionsFields<DtoOrderResult, IDtoOptionsOrderResult[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IDtoOptionsOrderResultPage {
+      fields?: TypeEntityOptionsFields<DtoOrderResultPage, IDtoOptionsOrderResultPage[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IDtoOptionsOrderUpdate {
       fields?: TypeEntityOptionsFields<DtoOrderUpdate, IDtoOptionsOrderUpdate[TypeSymbolKeyFieldsMore]>;
     }
@@ -1802,6 +1818,7 @@ declare module 'vona-module-a-web' {
 '/test/vona/onion/echo5': undefined;
 '/test/vona/onion/echo6': undefined;
 '/test/vona/order/findAll': undefined;
+'/test/vona/order/findMany': undefined;
 '/test/vona/passport/echo/:name': undefined;
 '/test/vona/passport/isAuthenticated': undefined;
 '/test/vona/post/findManyEcho': undefined;

package/src/controller/order.ts

@@ -7,7 +7,9 @@ import { Api, v } from 'vona-module-a-openapi';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { DtoOrderCreate } from '../dto/orderCreate.ts';
 import { DtoOrderQuery } from '../dto/orderQuery.ts';
+import { DtoOrderQueryPage } from '../dto/orderQueryPage.ts';
 import { DtoOrderResult } from '../dto/orderResult.ts';
+import { DtoOrderResultPage } from '../dto/orderResultPage.ts';
 
 export interface IControllerOptionsOrder extends IDecoratorControllerOptions {}
 
@@ -39,4 +41,17 @@ export class ControllerOrder extends BeanBase {
       },
     });
   }
+
+  @Web.get('findMany')
+  @Api.body(DtoOrderResultPage)
+  async findMany(
+    @Arg.queryPro(DtoOrderQueryPage) params: IQueryParams<ModelOrder>,
+  ): Promise<DtoOrderResultPage> {
+    return this.scope.model.order.selectAndCount({
+      ...params,
+      include: {
+        products: true,
+      },
+    });
+  }
 }

package/src/dto/orderQueryPage.ts

@@ -0,0 +1,20 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+import { $Class } from 'vona';
+import { Api } from 'vona-module-a-openapi';
+import { $Dto } from 'vona-module-a-orm';
+import { Dto } from 'vona-module-a-web';
+import z from 'zod';
+import { EntityOrder } from '../entity/order.ts';
+
+export interface IDtoOptionsOrderQueryPage extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsOrderQueryPage>({
+  fields: {
+    pageSize: z.number().min(1).max(300).default(30),
+  },
+})
+export class DtoOrderQueryPage
+  extends $Class.omit($Dto.queryPage(EntityOrder, ['orderNo', 'remark']), ['pageSize']) {
+  @Api.field(z.number().min(1).max(300).default(30))
+  pageSize: number;
+}

package/src/dto/orderResultPage.ts

@@ -0,0 +1,9 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+import { $Dto } from 'vona-module-a-orm';
+import { Dto } from 'vona-module-a-web';
+import { ModelOrder } from 'vona-module-test-vona';
+
+export interface IDtoOptionsOrderResultPage extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsOrderResultPage>()
+export class DtoOrderResultPage extends $Dto.selectAndCount(() => ModelOrder) {}