Skip to content

Fix Employee Reference and Refactor Payment Model #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nedelcho-delchev-tues merged 2 commits into from
Mar 11, 2026
Merged

Fix Employee Reference and Refactor Payment Model #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30055be
add relation from employee payment to employee and replace the suppli…
NicoleNG18 Mar 11, 2026
cfbd37e
add deleted at and deleted reason to payment record
NicoleNG18 Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 39 additions & 19 deletions codbex-payments/codbex-payments.edm
View file
Open in desktop

Large diffs are not rendered by default.

898 changes: 754 additions & 144 deletions codbex-payments/codbex-payments.gen
View file
Open in desktop

Large diffs are not rendered by default.

462 changes: 377 additions & 85 deletions codbex-payments/codbex-payments.model
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions codbex-payments/gen/codbex-payments/api/CustomerPayment/CustomerPaymentController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class CustomerPaymentController {
const options: Options = {
limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : 20,
offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : 0,
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};

return this.repository.findAll(options);
Expand Down Expand Up @@ -98,7 +98,7 @@ class CustomerPaymentController {
this.checkPermissions('read');
const id = parseInt(ctx.pathParameters.id);
const options: Options = {
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};
const entity = this.repository.findById(id, options);
if (entity) {
Expand Down
7 changes: 5 additions & 2 deletions codbex-payments/gen/codbex-payments/api/EmployeePayment/EmployeePaymentController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class EmployeePaymentController {
const options: Options = {
limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : 20,
offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : 0,
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};

return this.repository.findAll(options);
Expand Down Expand Up @@ -98,7 +98,7 @@ class EmployeePaymentController {
this.checkPermissions('read');
const id = parseInt(ctx.pathParameters.id);
const options: Options = {
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};
const entity = this.repository.findById(id, options);
if (entity) {
Expand Down Expand Up @@ -166,6 +166,9 @@ class EmployeePaymentController {
}

private validateEntity(entity: any): void {
if (entity.Employee === null || entity.Employee === undefined) {
throw new ValidationError(`The 'Employee' property is required, provide a valid value`);
}
if (entity.Date === null || entity.Date === undefined) {
throw new ValidationError(`The 'Date' property is required, provide a valid value`);
}
Expand Down
4 changes: 2 additions & 2 deletions codbex-payments/gen/codbex-payments/api/PaymentAdjustment/PaymentAdjustmentController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class PaymentAdjustmentController {
const options: Options = {
limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : 20,
offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : 0,
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};

return this.repository.findAll(options);
Expand Down Expand Up @@ -96,7 +96,7 @@ class PaymentAdjustmentController {
this.checkPermissions('read');
const id = parseInt(ctx.pathParameters.id);
const options: Options = {
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};
const entity = this.repository.findById(id, options);
if (entity) {
Expand Down
7 changes: 5 additions & 2 deletions codbex-payments/gen/codbex-payments/api/PaymentRecord/PaymentRecordController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class PaymentRecordController {
const options: Options = {
limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : 20,
offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : 0,
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};

return this.repository.findAll(options);
Expand Down Expand Up @@ -96,7 +96,7 @@ class PaymentRecordController {
this.checkPermissions('read');
const id = parseInt(ctx.pathParameters.id);
const options: Options = {
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};
const entity = this.repository.findById(id, options);
if (entity) {
Expand Down Expand Up @@ -191,6 +191,9 @@ class PaymentRecordController {
if (entity.Reference?.length > 36) {
throw new ValidationError(`The 'Reference' exceeds the maximum length of [36] characters`);
}
if (entity.DeletedReason?.length > 255) {
throw new ValidationError(`The 'DeletedReason' exceeds the maximum length of [255] characters`);
}
for (const next of validationModules) {
next.validate(entity);
}
Expand Down
4 changes: 2 additions & 2 deletions codbex-payments/gen/codbex-payments/api/Settings/PaymentDirectionController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class PaymentDirectionController {
const options: Options = {
limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : 20,
offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : 0,
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};

return this.repository.findAll(options);
Expand Down Expand Up @@ -88,7 +88,7 @@ class PaymentDirectionController {
try {
const id = parseInt(ctx.pathParameters.id);
const options: Options = {
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};
const entity = this.repository.findById(id, options);
if (entity) {
Expand Down
4 changes: 2 additions & 2 deletions codbex-payments/gen/codbex-payments/api/Settings/PaymentTypeController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class PaymentTypeController {
const options: Options = {
limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : 20,
offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : 0,
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};

return this.repository.findAll(options);
Expand Down Expand Up @@ -96,7 +96,7 @@ class PaymentTypeController {
this.checkPermissions('read');
const id = parseInt(ctx.pathParameters.id);
const options: Options = {
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};
const entity = this.repository.findById(id, options);
if (entity) {
Expand Down
7 changes: 5 additions & 2 deletions codbex-payments/gen/codbex-payments/api/SupplierPayment/SupplierPaymentController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class SupplierPaymentController {
const options: Options = {
limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : 20,
offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : 0,
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};

return this.repository.findAll(options);
Expand Down Expand Up @@ -98,7 +98,7 @@ class SupplierPaymentController {
this.checkPermissions('read');
const id = parseInt(ctx.pathParameters.id);
const options: Options = {
language: request.getLocale().slice(0, 2)
language: request.getLocale().split("_")[0]
};
const entity = this.repository.findById(id, options);
if (entity) {
Expand Down Expand Up @@ -166,6 +166,9 @@ class SupplierPaymentController {
}

private validateEntity(entity: any): void {
if (entity.Supplier === null || entity.Supplier === undefined) {
throw new ValidationError(`The 'Supplier' property is required, provide a valid value`);
}
if (entity.Date === null || entity.Date === undefined) {
throw new ValidationError(`The 'Date' property is required, provide a valid value`);
}
Expand Down
192 changes: 0 additions & 192 deletions codbex-payments/gen/codbex-payments/api/Suppliers/SupplierController.ts
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions codbex-payments/gen/codbex-payments/dao/CustomerPayment/CustomerPaymentRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { NumberGeneratorService } from "/codbex-number-generator/service/generat

export interface CustomerPaymentEntity {
readonly Id: number;
Customer?: number;
Customer: number;
Date: Date;
Valor: Date;
CompanyIBAN?: string;
Expand All @@ -26,7 +26,7 @@ export interface CustomerPaymentEntity {
}

export interface CustomerPaymentCreateEntity {
readonly Customer?: number;
readonly Customer: number;
readonly Date: Date;
readonly Valor: Date;
readonly CompanyIBAN?: string;
Expand Down Expand Up @@ -213,6 +213,7 @@ export class CustomerPaymentRepository {
name: "Customer",
column: "CUSTOMERPAYMENT_CUSTOMER",
type: "INTEGER",
required: true
},
{
name: "Date",
Expand Down
Loading
Loading