cabloy 5.1.149 → 5.1.150

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

@@ -178,12 +178,21 @@ describe('skuPresentation.test.ts', () => {
         listComponent.properties.productId.rest?.table?.columnProps,
         productPickerOptions,
       );
+      assert.equal(listComponent.properties.available.rest?.table?.order, undefined);
+      assert.equal(listComponent.properties.available.rest?.table?.render, undefined);
+      assert.equal(listComponent.properties.available.type, 'integer');
+      assert.equal(listComponent.properties.available.minimum, 0);
+      assert.equal(listComponent.properties.available.title.toJSON(), 'Available');
+      const actions = listComponent.properties._operationsRow.rest.table.columnProps.actions;
       assert.deepEqual(
-        listComponent.properties._operationsRow.rest.table.columnProps.actions.map(
-          (action: any) => action.render,
-        ),
-        ['basic-table:actionUpdate', 'basic-table:actionDelete'],
+        actions.map((action: any) => action.render),
+        [
+          'commerce-trade:actionAdjustStock',
+          'basic-table:actionUpdate',
+          'basic-table:actionDelete',
+        ],
       );
+      assert.deepEqual(actions[0].options.permission, { actionInherit: 'update' });
 
       const filterBlock = listComponent.rest.blocks[0].options.blocks[0];
       const filterLayout = filterBlock.options.blocks[0].options.formLayout;
@@ -204,6 +213,7 @@ describe('skuPresentation.test.ts', () => {
       let categoryId: number | string | undefined;
       let productId: number | string | undefined;
       let skuId: number | string | undefined;
+      let skuIdWithBalance: number | string | undefined;
       await app.bean.passport.signinMock();
       try {
         categoryId = await app.bean.executor.performAction('post', '/commerce/catalog/category', {
@@ -224,6 +234,26 @@ describe('skuPresentation.test.ts', () => {
             lifecycle: 'draft',
           },
         });
+        const skuIdWithBalance = await app.bean.executor.performAction(
+          'post',
+          '/commerce/catalog/sku',
+          {
+            body: {
+              code: `presentation-sku-balance-${suffix}`,
+              productId,
+              priceCents: 2345,
+              lifecycle: 'draft',
+            },
+          },
+        );
+        await app.bean.executor.performAction('post', '/commerce/trade/stockBalance/adjustStock', {
+          body: {
+            skuId: skuIdWithBalance,
+            delta: 7,
+            reason: `presentation stock ${suffix}`,
+            correlationId: `presentation-${suffix}`,
+          },
+        });
 
         const view: any = await app.bean.executor.performAction(
           'get',
@@ -247,12 +277,31 @@ describe('skuPresentation.test.ts', () => {
         });
         assert.equal(select.list.length, 1);
         assert.equal(String(select.list[0].id), String(skuId));
+        assert.equal(select.list[0].available, 0);
         assert.deepEqual(select.list[0].product, {
           id: productId,
           title: `presentation-sku-product-${suffix}`,
         });
         assert.equal(select.list[0].attributes, undefined);
+
+        const balanceSelect: any = await app.bean.executor.performAction(
+          'get',
+          '/commerce/catalog/sku',
+          { query: { code: `presentation-sku-balance-${suffix}` } },
+        );
+        assert.equal(balanceSelect.list.length, 1);
+        assert.equal(String(balanceSelect.list[0].id), String(skuIdWithBalance));
+        assert.equal(balanceSelect.list[0].available, 7);
       } finally {
+        const tradeScope = app.scope('commerce-trade');
+        if (skuIdWithBalance) {
+          await tradeScope.model.stockAudit.delete({ skuId: skuIdWithBalance });
+          await tradeScope.model.stockReservation.delete({ skuId: skuIdWithBalance });
+          await tradeScope.model.stockBalance.delete({ skuId: skuIdWithBalance });
+          await app.bean.executor.performAction('delete', '/commerce/catalog/sku/:id', {
+            params: { id: skuIdWithBalance },
+          });
+        }
         if (skuId) {
           await app.bean.executor.performAction('delete', '/commerce/catalog/sku/:id', {
             params: { id: skuId },

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

@@ -675,154 +675,6 @@ declare module 'vona-module-a-orm' {
   }
 }
 /** model: end */
-/** bean: begin */
-export * from '../bean/bean.scheduleOrderExpiry.ts';
-
-import 'vona';
-declare module 'vona' {
-
-
-}
-declare module 'vona-module-commerce-trade' {
-
-        export interface BeanScheduleOrderExpiry {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-}
-/** bean: end */
-/** bean: begin */
-import type { BeanScheduleOrderExpiry } from '../bean/bean.scheduleOrderExpiry.ts';
-import 'vona';
-declare module 'vona' {
-  export interface IBeanRecordGlobal {
-    'scheduleOrderExpiry': BeanScheduleOrderExpiry;
-  }
-}
-/** bean: end */
-/** service: begin */
-export * from '../service/cart.ts';
-export * from '../service/order.ts';
-export * from '../service/stockAudit.ts';
-export * from '../service/stockBalance.ts';
-
-import 'vona-module-a-bean';
-declare module 'vona-module-a-bean' {
-
-    export interface IServiceRecord {
-      'commerce-trade:cart': never;
-'commerce-trade:order': never;
-'commerce-trade:stockAudit': never;
-'commerce-trade:stockBalance': never;
-    }
-
-
-}
-declare module 'vona-module-commerce-trade' {
-
-        export interface ServiceCart {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-
-          export interface ServiceCart {
-            get $beanFullName(): 'commerce-trade.service.cart';
-            get $onionName(): 'commerce-trade:cart';
-          }
-
-        export interface ServiceOrder {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-
-          export interface ServiceOrder {
-            get $beanFullName(): 'commerce-trade.service.order';
-            get $onionName(): 'commerce-trade:order';
-          }
-
-        export interface ServiceStockAudit {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-
-          export interface ServiceStockAudit {
-            get $beanFullName(): 'commerce-trade.service.stockAudit';
-            get $onionName(): 'commerce-trade:stockAudit';
-          }
-
-        export interface ServiceStockBalance {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-
-          export interface ServiceStockBalance {
-            get $beanFullName(): 'commerce-trade.service.stockBalance';
-            get $onionName(): 'commerce-trade:stockBalance';
-          }
-}
-/** service: end */
-/** service: begin */
-import type { ServiceCart } from '../service/cart.ts';
-import type { ServiceOrder } from '../service/order.ts';
-import type { ServiceStockAudit } from '../service/stockAudit.ts';
-import type { ServiceStockBalance } from '../service/stockBalance.ts';
-export interface IModuleService {
-  'cart': ServiceCart;
-'order': ServiceOrder;
-'stockAudit': ServiceStockAudit;
-'stockBalance': ServiceStockBalance;
-}
-/** service: end */
-/** service: begin */
-
-import 'vona';
-declare module 'vona' {
-  export interface IBeanRecordGeneral {
-    'commerce-trade.service.cart': ServiceCart;
-'commerce-trade.service.order': ServiceOrder;
-'commerce-trade.service.stockAudit': ServiceStockAudit;
-'commerce-trade.service.stockBalance': ServiceStockBalance;
-  }
-}
-/** service: end */
-/** meta: begin */
-export * from '../bean/meta.index.ts';
-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-trade:index': IMetaOptionsIndex;
-'commerce-trade:version': never;
-    }
-
-
-}
-declare module 'vona-module-commerce-trade' {
-
-        export interface MetaIndex {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-
-          export interface MetaIndex {
-            get $beanFullName(): 'commerce-trade.meta.index';
-            get $onionName(): 'commerce-trade:index';
-            get $onionOptions(): IMetaOptionsIndex;
-          }
-
-        export interface MetaVersion {
-          /** @internal */
-          get scope(): ScopeModuleCommerceTrade;
-        }
-
-          export interface MetaVersion {
-            get $beanFullName(): 'commerce-trade.meta.version';
-            get $onionName(): 'commerce-trade:version';
-          }
-}
-/** meta: end */
 /** dto: begin */
 export * from '../dto/cartAddItem.tsx';
 export * from '../dto/cartItem.tsx';
@@ -1368,6 +1220,154 @@ import 'vona-module-a-openapi';
   }
 
 /** controller: end */
+/** bean: begin */
+export * from '../bean/bean.scheduleOrderExpiry.ts';
+
+import 'vona';
+declare module 'vona' {
+
+
+}
+declare module 'vona-module-commerce-trade' {
+
+        export interface BeanScheduleOrderExpiry {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+}
+/** bean: end */
+/** bean: begin */
+import type { BeanScheduleOrderExpiry } from '../bean/bean.scheduleOrderExpiry.ts';
+import 'vona';
+declare module 'vona' {
+  export interface IBeanRecordGlobal {
+    'scheduleOrderExpiry': BeanScheduleOrderExpiry;
+  }
+}
+/** bean: end */
+/** service: begin */
+export * from '../service/cart.ts';
+export * from '../service/order.ts';
+export * from '../service/stockAudit.ts';
+export * from '../service/stockBalance.ts';
+
+import 'vona-module-a-bean';
+declare module 'vona-module-a-bean' {
+
+    export interface IServiceRecord {
+      'commerce-trade:cart': never;
+'commerce-trade:order': never;
+'commerce-trade:stockAudit': never;
+'commerce-trade:stockBalance': never;
+    }
+
+
+}
+declare module 'vona-module-commerce-trade' {
+
+        export interface ServiceCart {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+
+          export interface ServiceCart {
+            get $beanFullName(): 'commerce-trade.service.cart';
+            get $onionName(): 'commerce-trade:cart';
+          }
+
+        export interface ServiceOrder {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+
+          export interface ServiceOrder {
+            get $beanFullName(): 'commerce-trade.service.order';
+            get $onionName(): 'commerce-trade:order';
+          }
+
+        export interface ServiceStockAudit {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+
+          export interface ServiceStockAudit {
+            get $beanFullName(): 'commerce-trade.service.stockAudit';
+            get $onionName(): 'commerce-trade:stockAudit';
+          }
+
+        export interface ServiceStockBalance {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+
+          export interface ServiceStockBalance {
+            get $beanFullName(): 'commerce-trade.service.stockBalance';
+            get $onionName(): 'commerce-trade:stockBalance';
+          }
+}
+/** service: end */
+/** service: begin */
+import type { ServiceCart } from '../service/cart.ts';
+import type { ServiceOrder } from '../service/order.ts';
+import type { ServiceStockAudit } from '../service/stockAudit.ts';
+import type { ServiceStockBalance } from '../service/stockBalance.ts';
+export interface IModuleService {
+  'cart': ServiceCart;
+'order': ServiceOrder;
+'stockAudit': ServiceStockAudit;
+'stockBalance': ServiceStockBalance;
+}
+/** service: end */
+/** service: begin */
+
+import 'vona';
+declare module 'vona' {
+  export interface IBeanRecordGeneral {
+    'commerce-trade.service.cart': ServiceCart;
+'commerce-trade.service.order': ServiceOrder;
+'commerce-trade.service.stockAudit': ServiceStockAudit;
+'commerce-trade.service.stockBalance': ServiceStockBalance;
+  }
+}
+/** service: end */
+/** meta: begin */
+export * from '../bean/meta.index.ts';
+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-trade:index': IMetaOptionsIndex;
+'commerce-trade:version': never;
+    }
+
+
+}
+declare module 'vona-module-commerce-trade' {
+
+        export interface MetaIndex {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+
+          export interface MetaIndex {
+            get $beanFullName(): 'commerce-trade.meta.index';
+            get $onionName(): 'commerce-trade:index';
+            get $onionOptions(): IMetaOptionsIndex;
+          }
+
+        export interface MetaVersion {
+          /** @internal */
+          get scope(): ScopeModuleCommerceTrade;
+        }
+
+          export interface MetaVersion {
+            get $beanFullName(): 'commerce-trade.meta.version';
+            get $onionName(): 'commerce-trade:version';
+          }
+}
+/** meta: end */
 /** ssrMenu: begin */
 export * from '../bean/ssrMenu.order.ts';
 export * from '../bean/ssrMenu.stockAudit.ts';

package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/stockAdjust.tsx

@@ -4,19 +4,47 @@ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import { z } from 'zod';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
 
 export interface IDtoOptionsStockAdjust extends IDecoratorDtoOptions {}
 
-@Dto<IDtoOptionsStockAdjust>({ openapi: { title: $locale('AdjustStock') } })
+@Dto<IDtoOptionsStockAdjust>({
+  openapi: { title: $locale('AdjustStock') },
+  blocks: [
+    ZovaRender.block('basic-pageentry:blockPageEntry', {
+      blocks: [
+        ZovaRender.block('basic-pageentry:blockForm', {
+          blocks: [
+            ZovaRender.block('basic-form:blockFormLayout', {
+              formLayout: {
+                children: [
+                  {
+                    type: 'section',
+                    layout: 'flow',
+                    children: [
+                      { type: 'field', name: 'delta' },
+                      { type: 'field', name: 'reason' },
+                    ],
+                  },
+                ],
+              },
+            }),
+          ],
+        }),
+      ],
+    }),
+  ],
+})
 export class DtoStockAdjust {
-  @Api.field(v.title($locale('SkuId')), v.required(), v.tableIdentity())
+  @Api.field(v.title($locale('SkuId')), v.required(), v.tableIdentity(), ZovaRender.visible(false))
   skuId: TableIdentity;
 
   @Api.field(
     v.title($locale('Delta')),
     v.required(),
+    ZovaRender.field('basic-input:formFieldInput', { type: 'number' }),
     z
       .number()
       .int()
@@ -27,6 +55,12 @@ export class DtoStockAdjust {
   @Api.field(v.title($locale('Reason')), v.required(), v.min(1), v.max(255))
   reason: string;
 
-  @Api.field(v.title($locale('CorrelationId')), v.required(), v.min(1), v.max(100))
+  @Api.field(
+    v.title($locale('CorrelationId')),
+    v.required(),
+    v.min(1),
+    v.max(100),
+    ZovaRender.visible(false),
+  )
   correlationId: string;
 }

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

@@ -116,8 +116,8 @@ declare module 'vona-module-training-student' {
   export interface IModelOptionsStudent {
         relations: {
           trainingRecords: IModelRelationHasMany<'training-record:record', 'studentId', false, 'id'|'name'|'subjectCount'|'totalScore'|'averageScore'|'trainingTime'|'sceneImageIds'|'dossierFileIds'|'description', undefined, undefined, undefined>;
-studentContent: IModelRelationHasOne<'training-student:studentContent', 'studentId', false, 'id'|'studentId'|'descriptionMarkdown'|'descriptionHtml'>;
-studentContentForm: IModelRelationHasOne<'training-student:studentContent', 'studentId', false, 'id'|'studentId'|'descriptionMarkdown'>;
+content: IModelRelationHasOne<'training-student:studentContent', 'studentId', false, 'id'|'descriptionMarkdown'>;
+contentHtml: IModelRelationHasOne<'training-student:studentContent', 'studentId', false, 'id'|'descriptionHtml'>;
         };
       }
 export interface IModelOptionsStudentContent {

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

@@ -10,12 +10,12 @@ import { ModelStudent } from '../model/student.ts';
 import { DtoDetailRecordMutate } from './detailRecordMutate.tsx';
 import { DtoDetailRecordResItem } from './detailRecordResItem.tsx';
 
-const studentContentFormField = $makeMetadata(
-  ZovaRender.fieldSource('studentContentForm.descriptionMarkdown'),
+const studentContentField = $makeMetadata(
+  ZovaRender.fieldSource('content.descriptionMarkdown'),
   ZovaRender.field('basic-markdown:formFieldMarkdown'),
 );
 
-export interface IDtoOptionsStudentCreate extends IDecoratorDtoOptions<'studentContentForm'> {}
+export interface IDtoOptionsStudentCreate extends IDecoratorDtoOptions<'content'> {}
 
 @Dto<IDtoOptionsStudentCreate>({
   blocks: [
@@ -54,7 +54,7 @@ export interface IDtoOptionsStudentCreate extends IDecoratorDtoOptions<'studentC
                             children: [
                               {
                                 type: 'section',
-                                children: [{ type: 'field', name: 'studentContentForm' }],
+                                children: [{ type: 'field', name: 'content' }],
                               },
                             ],
                           },
@@ -93,7 +93,7 @@ export interface IDtoOptionsStudentCreate extends IDecoratorDtoOptions<'studentC
     }),
   ],
   fields: {
-    studentContentForm: studentContentFormField,
+    content: studentContentField,
     trainingRecords: $makeMetadata(
       v.title($locale('TrainingRecords')),
       ZovaRender.order(6),
@@ -103,8 +103,9 @@ export interface IDtoOptionsStudentCreate extends IDecoratorDtoOptions<'studentC
   },
 })
 export class DtoStudentCreate extends $Dto.create(() => ModelStudent, {
+  columns: ['name', 'mobile', 'imageId', 'level'],
   include: {
-    studentContentForm: true,
+    content: { columns: ['descriptionMarkdown'] },
     trainingRecords: { dtoClass: DtoDetailRecordMutate },
   },
 }) {

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

@@ -14,7 +14,7 @@ export class DtoStudentSummary extends $Dto.get(() => ModelStudent, {
   columns: ['id', 'name', 'mobile', 'level'],
 }) {
   @Api.field(v.title($locale('Description')), v.optional())
-  description?: string;
+  descriptionMarkdown?: string;
 
   @Api.field(v.title($locale('DescriptionHtml')), v.optional())
   descriptionHtml?: string;

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

@@ -10,12 +10,12 @@ import { ModelStudent } from '../model/student.ts';
 import { DtoDetailRecordMutate } from './detailRecordMutate.tsx';
 import { DtoDetailRecordResItem } from './detailRecordResItem.tsx';
 
-const studentContentFormField = $makeMetadata(
-  ZovaRender.fieldSource('studentContentForm.descriptionMarkdown'),
+const studentContentField = $makeMetadata(
+  ZovaRender.fieldSource('content.descriptionMarkdown'),
   ZovaRender.field('basic-markdown:formFieldMarkdown'),
 );
 
-export interface IDtoOptionsStudentUpdate extends IDecoratorDtoOptions<'studentContentForm'> {}
+export interface IDtoOptionsStudentUpdate extends IDecoratorDtoOptions<'content'> {}
 
 @Dto<IDtoOptionsStudentUpdate>({
   blocks: [
@@ -54,7 +54,7 @@ export interface IDtoOptionsStudentUpdate extends IDecoratorDtoOptions<'studentC
                             children: [
                               {
                                 type: 'section',
-                                children: [{ type: 'field', name: 'studentContentForm' }],
+                                children: [{ type: 'field', name: 'content' }],
                               },
                             ],
                           },
@@ -90,7 +90,7 @@ export interface IDtoOptionsStudentUpdate extends IDecoratorDtoOptions<'studentC
     }),
   ],
   fields: {
-    studentContentForm: studentContentFormField,
+    content: studentContentField,
     trainingRecords: $makeMetadata(
       v.title($locale('TrainingRecords')),
       ZovaRender.order(6),
@@ -99,8 +99,9 @@ export interface IDtoOptionsStudentUpdate extends IDecoratorDtoOptions<'studentC
   },
 })
 export class DtoStudentUpdate extends $Dto.update(() => ModelStudent, {
+  columns: ['name', 'mobile', 'imageId', 'level'],
   include: {
-    studentContentForm: true,
+    content: { columns: ['descriptionMarkdown'] },
     trainingRecords: { dtoClass: DtoDetailRecordMutate },
   },
 }) {

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

@@ -1,9 +1,10 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
 import { DtoImageView } from 'vona-module-a-image';
-import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
+import { $makeMetadata, $makeSchema, Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
+import z from 'zod';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
@@ -11,12 +12,14 @@ import { ModelStudent } from '../model/student.ts';
 import { DtoDetailRecordResItem } from './detailRecordResItem.tsx';
 import { DtoDetailRecordView } from './detailRecordView.tsx';
 
-const studentContentFormField = $makeMetadata(
-  ZovaRender.fieldSource('studentContentForm.descriptionMarkdown'),
+const studentContentField = $makeSchema(
+  ZovaRender.fieldSource('content.descriptionMarkdown'),
   ZovaRender.field('basic-markdown:formFieldMarkdown'),
+  v.optional(),
+  z.string(),
 );
 
-export interface IDtoOptionsStudentView extends IDecoratorDtoOptions<'studentContentForm'> {}
+export interface IDtoOptionsStudentView extends IDecoratorDtoOptions<'_descriptionMarkdown'> {}
 
 @Dto<IDtoOptionsStudentView>({
   blocks: [
@@ -55,7 +58,7 @@ export interface IDtoOptionsStudentView extends IDecoratorDtoOptions<'studentCon
                             children: [
                               {
                                 type: 'section',
-                                children: [{ type: 'field', name: 'studentContentForm' }],
+                                children: [{ type: 'field', name: '_descriptionMarkdown' }],
                               },
                             ],
                           },
@@ -88,7 +91,7 @@ export interface IDtoOptionsStudentView extends IDecoratorDtoOptions<'studentCon
     }),
   ],
   fields: {
-    studentContentForm: studentContentFormField,
+    _descriptionMarkdown: studentContentField,
     trainingRecords: $makeMetadata(
       v.title($locale('TrainingRecords')),
       ZovaRender.order(6),
@@ -98,7 +101,7 @@ export interface IDtoOptionsStudentView extends IDecoratorDtoOptions<'studentCon
 })
 export class DtoStudentView extends $Dto.get(() => ModelStudent, {
   include: {
-    studentContentForm: true,
+    content: { columns: ['descriptionMarkdown'] },
     trainingRecords: { dtoClass: DtoDetailRecordView },
   },
 }) {

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

@@ -22,11 +22,11 @@ export interface IModelOptionsStudent extends IDecoratorModelOptions<EntityStude
         'description',
       ],
     }),
-    studentContent: $relation.hasOne('training-student:studentContent', 'studentId', {
-      columns: ['id', 'studentId', 'descriptionMarkdown', 'descriptionHtml'],
+    content: $relation.hasOne('training-student:studentContent', 'studentId', {
+      columns: ['id', 'descriptionMarkdown'],
     }),
-    studentContentForm: $relation.hasOne('training-student:studentContent', 'studentId', {
-      columns: ['id', 'studentId', 'descriptionMarkdown'],
+    contentHtml: $relation.hasOne('training-student:studentContent', 'studentId', {
+      columns: ['id', 'descriptionHtml'],
     }),
   },
 })