cabloy 5.1.248 → 5.1.250

package/vona/src/suite/a-training/modules/training-student/src/.metadata/index.ts

@@ -216,8 +216,10 @@ export * from '../dto/detailRecordBase.tsx';
 export * from '../dto/detailRecordMutate.tsx';
 export * from '../dto/detailRecordResItem.tsx';
 export * from '../dto/detailRecordView.tsx';
+export * from '../dto/studentAggregateRes.tsx';
 export * from '../dto/studentCreate.tsx';
 export * from '../dto/studentDeleteBulk.tsx';
+export * from '../dto/studentGroupResItem.tsx';
 export * from '../dto/studentSelectReq.tsx';
 export * from '../dto/studentSelectRes.tsx';
 export * from '../dto/studentSelectResItem.tsx';
@@ -228,8 +230,10 @@ import type { IDtoOptionsDetailRecordBase } from '../dto/detailRecordBase.tsx';
 import type { IDtoOptionsDetailRecordMutate } from '../dto/detailRecordMutate.tsx';
 import type { IDtoOptionsDetailRecordResItem } from '../dto/detailRecordResItem.tsx';
 import type { IDtoOptionsDetailRecordView } from '../dto/detailRecordView.tsx';
+import type { IDtoOptionsStudentAggregateRes } from '../dto/studentAggregateRes.tsx';
 import type { IDtoOptionsStudentCreate } from '../dto/studentCreate.tsx';
 import type { IDtoOptionsStudentDeleteBulk } from '../dto/studentDeleteBulk.tsx';
+import type { IDtoOptionsStudentGroupResItem } from '../dto/studentGroupResItem.tsx';
 import type { IDtoOptionsStudentSelectReq } from '../dto/studentSelectReq.tsx';
 import type { IDtoOptionsStudentSelectRes } from '../dto/studentSelectRes.tsx';
 import type { IDtoOptionsStudentSelectResItem } from '../dto/studentSelectResItem.tsx';
@@ -244,8 +248,10 @@ declare module 'vona-module-a-web' {
 'training-student:detailRecordMutate': IDtoOptionsDetailRecordMutate;
 'training-student:detailRecordResItem': IDtoOptionsDetailRecordResItem;
 'training-student:detailRecordView': IDtoOptionsDetailRecordView;
+'training-student:studentAggregateRes': IDtoOptionsStudentAggregateRes;
 'training-student:studentCreate': IDtoOptionsStudentCreate;
 'training-student:studentDeleteBulk': IDtoOptionsStudentDeleteBulk;
+'training-student:studentGroupResItem': IDtoOptionsStudentGroupResItem;
 'training-student:studentSelectReq': IDtoOptionsStudentSelectReq;
 'training-student:studentSelectRes': IDtoOptionsStudentSelectRes;
 'training-student:studentSelectResItem': IDtoOptionsStudentSelectResItem;
@@ -265,8 +271,10 @@ import type { DtoDetailRecordBase } from '../dto/detailRecordBase.tsx';
 import type { DtoDetailRecordMutate } from '../dto/detailRecordMutate.tsx';
 import type { DtoDetailRecordResItem } from '../dto/detailRecordResItem.tsx';
 import type { DtoDetailRecordView } from '../dto/detailRecordView.tsx';
+import type { DtoStudentAggregateRes } from '../dto/studentAggregateRes.tsx';
 import type { DtoStudentCreate } from '../dto/studentCreate.tsx';
 import type { DtoStudentDeleteBulk } from '../dto/studentDeleteBulk.tsx';
+import type { DtoStudentGroupResItem } from '../dto/studentGroupResItem.tsx';
 import type { DtoStudentSelectReq } from '../dto/studentSelectReq.tsx';
 import type { DtoStudentSelectRes } from '../dto/studentSelectRes.tsx';
 import type { DtoStudentSelectResItem } from '../dto/studentSelectResItem.tsx';
@@ -291,6 +299,10 @@ declare module 'vona-module-training-student' {
       fields?: TypeEntityOptionsFields<DtoDetailRecordView, IDtoOptionsDetailRecordView[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IDtoOptionsStudentAggregateRes {
+      fields?: TypeEntityOptionsFields<DtoStudentAggregateRes, IDtoOptionsStudentAggregateRes[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IDtoOptionsStudentCreate {
       fields?: TypeEntityOptionsFields<DtoStudentCreate, IDtoOptionsStudentCreate[TypeSymbolKeyFieldsMore]>;
     }
@@ -299,6 +311,10 @@ declare module 'vona-module-training-student' {
       fields?: TypeEntityOptionsFields<DtoStudentDeleteBulk, IDtoOptionsStudentDeleteBulk[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IDtoOptionsStudentGroupResItem {
+      fields?: TypeEntityOptionsFields<DtoStudentGroupResItem, IDtoOptionsStudentGroupResItem[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IDtoOptionsStudentSelectReq {
       fields?: TypeEntityOptionsFields<DtoStudentSelectReq, IDtoOptionsStudentSelectReq[TypeSymbolKeyFieldsMore]>;
     }
@@ -366,6 +382,8 @@ declare module 'vona-module-a-web' {
     }
 export interface IApiPathGetRecord{
         '/training/student': undefined;
+'/training/student/group': undefined;
+'/training/student/aggregate': undefined;
 '/training/student/:id': undefined;
 '/training/student/summary/:id': undefined;
     }

package/vona/src/suite/a-training/modules/training-student/src/config/locale/en-us.ts

@@ -22,6 +22,8 @@ export default {
   StudentController: 'Student Management',
   StudentCreate: 'Create Student',
   StudentSelect: 'List Students',
+  StudentGroup: 'Group Students',
+  StudentAggregate: 'Aggregate Students',
   StudentView: 'View Student',
   StudentUpdate: 'Update Student',
   StudentSummary: 'View Student Summary',

package/vona/src/suite/a-training/modules/training-student/src/config/locale/zh-cn.ts

@@ -22,6 +22,8 @@ export default {
   StudentController: '学生管理',
   StudentCreate: '创建学生',
   StudentSelect: '查询学生列表',
+  StudentGroup: '学生分组统计',
+  StudentAggregate: '学生统计',
   StudentView: '查看学生',
   StudentUpdate: '更新学生',
   StudentSummary: '查看学生摘要',

package/vona/src/suite/a-training/modules/training-student/src/controller/student.ts

@@ -1,5 +1,9 @@
 import type { TableIdentity } from 'table-identity';
-import type { IQueryParams } from 'vona-module-a-orm';
+import type {
+  IQueryParams,
+  TypeAnalysisAggregateParams,
+  TypeAnalysisGroupParams,
+} from 'vona-module-a-orm';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 
 import { BeanBase } from 'vona';
@@ -9,11 +13,14 @@ import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { z } from 'zod';
 
+import type { studentAnalysis } from '../lib/studentAnalysis.ts';
 import type { ModelStudent } from '../model/student.ts';
 
 import { $locale } from '../.metadata/locales.ts';
+import { DtoStudentAggregateRes } from '../dto/studentAggregateRes.tsx';
 import { DtoStudentCreate } from '../dto/studentCreate.tsx';
 import { DtoStudentDeleteBulk } from '../dto/studentDeleteBulk.tsx';
+import { DtoStudentGroupResItem } from '../dto/studentGroupResItem.tsx';
 import { DtoStudentSelectReq } from '../dto/studentSelectReq.tsx';
 import { DtoStudentSelectRes } from '../dto/studentSelectRes.tsx';
 import { DtoStudentSummary } from '../dto/studentSummary.tsx';
@@ -44,6 +51,26 @@ export class ControllerStudent extends BeanBase {
     return await this.scope.service.student.select(params);
   }
 
+  @Web.get('group', { summary: $locale('StudentGroup') })
+  @Api.body(v.array(DtoStudentGroupResItem))
+  @Passport.rbac({ actionInherit: 'select' })
+  async group(
+    @Arg.filter(DtoStudentSelectReq, { mode: 'group' })
+    params: TypeAnalysisGroupParams<typeof studentAnalysis>,
+  ): Promise<DtoStudentGroupResItem[]> {
+    return await this.scope.service.student.group(params);
+  }
+
+  @Web.get('aggregate', { summary: $locale('StudentAggregate') })
+  @Api.body(DtoStudentAggregateRes)
+  @Passport.rbac({ actionInherit: 'select' })
+  async aggregate(
+    @Arg.filter(DtoStudentSelectReq, { mode: 'aggregate' })
+    params: TypeAnalysisAggregateParams<typeof studentAnalysis>,
+  ): Promise<DtoStudentAggregateRes> {
+    return await this.scope.service.student.aggregate(params);
+  }
+
   @Web.get(':id', { summary: $locale('StudentView') })
   @Api.body(v.optional(), v.object(DtoStudentView))
   @Core.serializer()

package/vona/src/suite/a-training/modules/training-student/src/dto/studentAggregateRes.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 { studentAnalysis } from '../lib/studentAnalysis.ts';
+
+export interface IDtoOptionsStudentAggregateRes extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsStudentAggregateRes>()
+export class DtoStudentAggregateRes extends $Dto.analysisAggregate(studentAnalysis) {}

package/vona/src/suite/a-training/modules/training-student/src/dto/studentGroupResItem.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 { studentAnalysis } from '../lib/studentAnalysis.ts';
+
+export interface IDtoOptionsStudentGroupResItem extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsStudentGroupResItem>()
+export class DtoStudentGroupResItem extends $Dto.analysisGroup(studentAnalysis) {}

package/vona/src/suite/a-training/modules/training-student/src/dto/studentSelectReq.tsx

@@ -8,10 +8,12 @@ import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
 import { EntityStudent, studentLevelItems } from '../entity/student.tsx';
+import { studentAnalysis } from '../lib/studentAnalysis.ts';
 
 export interface IDtoOptionsStudentSelectReq extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsStudentSelectReq>({
+  analysis: studentAnalysis,
   openapi: { filter: { table: 'trainingStudent' } },
   fields: {
     name: $makeSchema(v.optional(), z.string()),

package/vona/src/suite/a-training/modules/training-student/src/lib/studentAnalysis.ts

@@ -0,0 +1,12 @@
+import { $defineAnalysis } from 'vona-module-a-orm';
+
+import { ModelStudent } from '../model/student.ts';
+
+export const studentAnalysis = $defineAnalysis(() => ModelStudent, {
+  groups: ['level'],
+  aggrs: { count: ['*', 'imageId'] },
+  defaults: {
+    group: { groups: ['level'], aggrs: { count: ['*'] } },
+    aggregate: { aggrs: { count: ['*', 'imageId'] } },
+  },
+});

package/vona/src/suite/a-training/modules/training-student/src/service/student.ts

@@ -1,11 +1,18 @@
 import type { TableIdentity } from 'table-identity';
-import type { IQueryParams } from 'vona-module-a-orm';
+import type {
+  IQueryParams,
+  TypeAnalysisAggregateParams,
+  TypeAnalysisGroupParams,
+} from 'vona-module-a-orm';
 
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 import { Core } from 'vona-module-a-core';
+import { $executeAnalysisAggregate, $executeAnalysisGroup } from 'vona-module-a-orm';
 
+import type { DtoStudentAggregateRes } from '../dto/studentAggregateRes.tsx';
 import type { DtoStudentCreate } from '../dto/studentCreate.tsx';
+import type { DtoStudentGroupResItem } from '../dto/studentGroupResItem.tsx';
 import type { DtoStudentSelectRes } from '../dto/studentSelectRes.tsx';
 import type { DtoStudentSummary } from '../dto/studentSummary.tsx';
 import type { DtoStudentUpdate } from '../dto/studentUpdate.tsx';
@@ -13,6 +20,8 @@ import type { DtoStudentView } from '../dto/studentView.tsx';
 import type { EntityStudent } from '../entity/student.tsx';
 import type { ModelStudent } from '../model/student.ts';
 
+import { studentAnalysis } from '../lib/studentAnalysis.ts';
+
 type StudentContentInput = {
   descriptionMarkdown?: string;
 };
@@ -43,6 +52,18 @@ export class ServiceStudent extends BeanBase {
     return await this.scope.model.student.selectAndCount(params);
   }
 
+  async group(
+    params?: TypeAnalysisGroupParams<typeof studentAnalysis>,
+  ): Promise<DtoStudentGroupResItem[]> {
+    return await $executeAnalysisGroup(this.scope.model.student, studentAnalysis, params);
+  }
+
+  async aggregate(
+    params?: TypeAnalysisAggregateParams<typeof studentAnalysis>,
+  ): Promise<DtoStudentAggregateRes> {
+    return await $executeAnalysisAggregate(this.scope.model.student, studentAnalysis, params);
+  }
+
   async view(id: TableIdentity): Promise<DtoStudentView | undefined> {
     return await this.scope.model.student.getById(id, {
       include: getStudentRelationsInclude(),

package/vona/src/suite/a-training/modules/training-student/test/student.test.ts

@@ -78,6 +78,8 @@ describe('student.test.ts', { concurrency: false }, () => {
       const expectedSummaries = {
         create: ['post', '/api/training/student', 'Create Student'],
         select: ['get', '/api/training/student', 'List Students'],
+        group: ['get', '/api/training/student/group', 'Group Students'],
+        aggregate: ['get', '/api/training/student/aggregate', 'Aggregate Students'],
         view: ['get', '/api/training/student/{id}', 'View Student'],
         update: ['patch', '/api/training/student/{id}', 'Update Student'],
         summary: ['get', '/api/training/student/summary/{id}', 'View Student Summary'],
@@ -685,6 +687,8 @@ describe('student.test.ts', { concurrency: false }, () => {
       const expectedInherits = {
         create: undefined,
         select: undefined,
+        group: `${controllerBeanFullName}#select`,
+        aggregate: `${controllerBeanFullName}#select`,
         view: undefined,
         update: undefined,
         summary: `${controllerBeanFullName}#view`,