diff --git a/codbex-methods/codbex-methods.edm b/codbex-methods/codbex-methods.edm index 8b1d6d1..5d8c647 100644 --- a/codbex-methods/codbex-methods.edm +++ b/codbex-methods/codbex-methods.edm @@ -1,17 +1,17 @@ - - + + - - + + - + \ No newline at end of file diff --git a/codbex-methods/codbex-methods.gen b/codbex-methods/codbex-methods.gen index 48837ed..bcae8bf 100644 --- a/codbex-methods/codbex-methods.gen +++ b/codbex-methods/codbex-methods.gen @@ -4,13 +4,26 @@ "brandUrl": "https://www.codbex.com/", "title": "Methods Management Module", "description": "Managing Methods Data", + "fileName": "codbex-methods", + "genFolderName": "codbex-methods", + "dataSource": "DefaultDB", + "roles": [ + { + "entityName": "PaymentMethod", + "roleRead": "codbex-methods.PaymentMethod.PaymentMethodReadOnly", + "roleWrite": "codbex-methods.PaymentMethod.PaymentMethodFullAccess" + }, + { + "entityName": "SentMethod", + "roleRead": "codbex-methods.SentMethod.SentMethodReadOnly", + "roleWrite": "codbex-methods.SentMethod.SentMethodFullAccess" + } + ], + "tprefix": "codbex-methods-model", "projectName": "codbex-methods", "workspaceName": "workspace", "filePath": "codbex-methods.model", "templateId": "template-application-angular-v2/template/template.js", - "fileName": "codbex-methods", - "genFolderName": "codbex-methods", - "dataSource": "DefaultDB", "perspectives": { "Settings": { "views": [ @@ -26,23 +39,11 @@ "role": "" } }, - "roles": [ - { - "entityName": "PaymentMethod", - "roleRead": "codbex-methods.PaymentMethod.PaymentMethodReadOnly", - "roleWrite": "codbex-methods.PaymentMethod.PaymentMethodFullAccess" - }, - { - "entityName": "SentMethod", - "roleRead": "codbex-methods.SentMethod.SentMethodReadOnly", - "roleWrite": "codbex-methods.SentMethod.SentMethodFullAccess" - } - ], - "tprefix": "codbex-methods-model", "models": [ { "properties": [ { + "auditType": "NONE", "dataAutoIncrement": true, "dataName": "PAYMENTMETHOD_ID", "dataNullable": true, @@ -67,22 +68,23 @@ "inputRule": "" }, { + "auditType": "NONE", "dataLength": "20", "dataName": "PAYMENTMETHOD_NAME", - "dataNullable": true, + "dataNullable": false, "dataType": "VARCHAR", + "dataUnique": true, "description": "", + "isRequiredProperty": true, "name": "Name", "tooltip": "", "widgetIsMajor": true, "widgetLength": "20", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, - "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "widgetLabel": "Name", "widgetDropdownUrl": "", @@ -130,6 +132,7 @@ { "properties": [ { + "auditType": "NONE", "dataAutoIncrement": true, "dataName": "SENTMETHOD_ID", "dataNullable": true, @@ -154,22 +157,23 @@ "inputRule": "" }, { + "auditType": "NONE", "dataLength": "20", "dataName": "SENTMETHOD_NAME", - "dataNullable": true, + "dataNullable": false, "dataType": "VARCHAR", + "dataUnique": true, "description": "", + "isRequiredProperty": true, "name": "Name", "tooltip": "", "widgetIsMajor": true, "widgetLength": "20", "widgetSize": "", "widgetType": "TEXTBOX", - "dataNotNull": false, + "dataNotNull": true, "dataAutoIncrement": false, "dataPrimaryKey": false, - "dataUnique": false, - "isRequiredProperty": false, "isCalculatedProperty": false, "widgetLabel": "Name", "widgetDropdownUrl": "", diff --git a/codbex-methods/codbex-methods.model b/codbex-methods/codbex-methods.model index 2674164..bea3cdc 100644 --- a/codbex-methods/codbex-methods.model +++ b/codbex-methods/codbex-methods.model @@ -4,6 +4,7 @@ { "properties": [ { + "auditType": "NONE", "dataAutoIncrement": "true", "dataName": "PAYMENTMETHOD_ID", "dataNullable": "true", @@ -18,11 +19,14 @@ "widgetType": "TEXTBOX" }, { + "auditType": "NONE", "dataLength": "20", "dataName": "PAYMENTMETHOD_NAME", - "dataNullable": "true", + "dataNullable": "false", "dataType": "VARCHAR", + "dataUnique": "true", "description": "", + "isRequiredProperty": "true", "name": "Name", "tooltip": "", "widgetIsMajor": "true", @@ -63,6 +67,7 @@ { "properties": [ { + "auditType": "NONE", "dataAutoIncrement": "true", "dataName": "SENTMETHOD_ID", "dataNullable": "true", @@ -77,11 +82,14 @@ "widgetType": "TEXTBOX" }, { + "auditType": "NONE", "dataLength": "20", "dataName": "SENTMETHOD_NAME", - "dataNullable": "true", + "dataNullable": "false", "dataType": "VARCHAR", + "dataUnique": "true", "description": "", + "isRequiredProperty": "true", "name": "Name", "tooltip": "", "widgetIsMajor": "true", diff --git a/codbex-methods/gen/codbex-methods/api/Settings/PaymentMethodController.ts b/codbex-methods/gen/codbex-methods/api/Settings/PaymentMethodController.ts index d43b7c1..6bff5d0 100644 --- a/codbex-methods/gen/codbex-methods/api/Settings/PaymentMethodController.ts +++ b/codbex-methods/gen/codbex-methods/api/Settings/PaymentMethodController.ts @@ -164,6 +164,9 @@ class PaymentMethodController { } private validateEntity(entity: any): void { + if (entity.Name === null || entity.Name === undefined) { + throw new ValidationError(`The 'Name' property is required, provide a valid value`); + } if (entity.Name?.length > 20) { throw new ValidationError(`The 'Name' exceeds the maximum length of [20] characters`); } diff --git a/codbex-methods/gen/codbex-methods/api/Settings/SentMethodController.ts b/codbex-methods/gen/codbex-methods/api/Settings/SentMethodController.ts index 5134981..5a34fe5 100644 --- a/codbex-methods/gen/codbex-methods/api/Settings/SentMethodController.ts +++ b/codbex-methods/gen/codbex-methods/api/Settings/SentMethodController.ts @@ -164,6 +164,9 @@ class SentMethodController { } private validateEntity(entity: any): void { + if (entity.Name === null || entity.Name === undefined) { + throw new ValidationError(`The 'Name' property is required, provide a valid value`); + } if (entity.Name?.length > 20) { throw new ValidationError(`The 'Name' exceeds the maximum length of [20] characters`); } diff --git a/codbex-methods/gen/codbex-methods/dao/Settings/PaymentMethodRepository.ts b/codbex-methods/gen/codbex-methods/dao/Settings/PaymentMethodRepository.ts index 8cd2d94..44bcbfe 100644 --- a/codbex-methods/gen/codbex-methods/dao/Settings/PaymentMethodRepository.ts +++ b/codbex-methods/gen/codbex-methods/dao/Settings/PaymentMethodRepository.ts @@ -5,11 +5,11 @@ import { dao as daoApi } from "@aerokit/sdk/db"; export interface PaymentMethodEntity { readonly Id: number; - Name?: string; + Name: string; } export interface PaymentMethodCreateEntity { - readonly Name?: string; + readonly Name: string; } export interface PaymentMethodUpdateEntity extends PaymentMethodCreateEntity { @@ -86,6 +86,7 @@ export class PaymentMethodRepository { name: "Name", column: "PAYMENTMETHOD_NAME", type: "VARCHAR", + required: true } ] }; diff --git a/codbex-methods/gen/codbex-methods/dao/Settings/SentMethodRepository.ts b/codbex-methods/gen/codbex-methods/dao/Settings/SentMethodRepository.ts index d73c521..4700392 100644 --- a/codbex-methods/gen/codbex-methods/dao/Settings/SentMethodRepository.ts +++ b/codbex-methods/gen/codbex-methods/dao/Settings/SentMethodRepository.ts @@ -5,11 +5,11 @@ import { dao as daoApi } from "@aerokit/sdk/db"; export interface SentMethodEntity { readonly Id: number; - Name?: string; + Name: string; } export interface SentMethodCreateEntity { - readonly Name?: string; + readonly Name: string; } export interface SentMethodUpdateEntity extends SentMethodCreateEntity { @@ -86,6 +86,7 @@ export class SentMethodRepository { name: "Name", column: "SENTMETHOD_NAME", type: "VARCHAR", + required: true } ] }; diff --git a/codbex-methods/gen/codbex-methods/data/Settings/PaymentMethodEntity.ts b/codbex-methods/gen/codbex-methods/data/Settings/PaymentMethodEntity.ts index d495907..89ebe64 100644 --- a/codbex-methods/gen/codbex-methods/data/Settings/PaymentMethodEntity.ts +++ b/codbex-methods/gen/codbex-methods/data/Settings/PaymentMethodEntity.ts @@ -1,4 +1,4 @@ -import { Entity, Table, Id, Generated, Column, Documentation } from '@aerokit/sdk/db' +import { Entity, Table, Id, Generated, Column, Documentation, CreatedAt, CreatedBy, UpdatedAt, UpdatedBy} from '@aerokit/sdk/db' @Entity('PaymentMethodEntity') @Table('CODBEX_PAYMENTMETHOD') @@ -19,9 +19,8 @@ export class PaymentMethodEntity { name: 'PAYMENTMETHOD_NAME', type: 'string', length: 20, - nullable: true, }) - public Name?: string; + public Name!: string; } diff --git a/codbex-methods/gen/codbex-methods/data/Settings/SentMethodEntity.ts b/codbex-methods/gen/codbex-methods/data/Settings/SentMethodEntity.ts index 57127e2..4b25f50 100644 --- a/codbex-methods/gen/codbex-methods/data/Settings/SentMethodEntity.ts +++ b/codbex-methods/gen/codbex-methods/data/Settings/SentMethodEntity.ts @@ -1,4 +1,4 @@ -import { Entity, Table, Id, Generated, Column, Documentation } from '@aerokit/sdk/db' +import { Entity, Table, Id, Generated, Column, Documentation, CreatedAt, CreatedBy, UpdatedAt, UpdatedBy} from '@aerokit/sdk/db' @Entity('SentMethodEntity') @Table('CODBEX_SENTMETHOD') @@ -19,9 +19,8 @@ export class SentMethodEntity { name: 'SENTMETHOD_NAME', type: 'string', length: 20, - nullable: true, }) - public Name?: string; + public Name!: string; } diff --git a/codbex-methods/gen/codbex-methods/schema/codbex-methods.schema b/codbex-methods/gen/codbex-methods/schema/codbex-methods.schema index 7b8f22f..601e036 100644 --- a/codbex-methods/gen/codbex-methods/schema/codbex-methods.schema +++ b/codbex-methods/gen/codbex-methods/schema/codbex-methods.schema @@ -15,7 +15,7 @@ { "type": "VARCHAR", "length": 20, - "nullable": true, + "unique": true, "name": "PAYMENTMETHOD_NAME" } ] @@ -34,7 +34,7 @@ { "type": "VARCHAR", "length": 20, - "nullable": true, + "unique": true, "name": "SENTMETHOD_NAME" } ] diff --git a/codbex-methods/gen/codbex-methods/ui/Settings/PaymentMethod/dialog-window/index.html b/codbex-methods/gen/codbex-methods/ui/Settings/PaymentMethod/dialog-window/index.html index 2c86434..6b3e062 100644 --- a/codbex-methods/gen/codbex-methods/ui/Settings/PaymentMethod/dialog-window/index.html +++ b/codbex-methods/gen/codbex-methods/ui/Settings/PaymentMethod/dialog-window/index.html @@ -20,14 +20,14 @@
- {{ 'codbex-methods:codbex-methods-model.t.PAYMENTMETHOD_NAME' | t }} + {{ 'codbex-methods:codbex-methods-model.t.PAYMENTMETHOD_NAME' | t }}
- {{ 'codbex-methods:codbex-methods-model.t.SENTMETHOD_NAME' | t }} + {{ 'codbex-methods:codbex-methods-model.t.SENTMETHOD_NAME' | t }}