QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-26 17:49:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #997 from bigcapitalhq/fix/model-timestamps-missing-columns

Browse Source 
fix(models): remove timestamps from models where tables lack createdAt/updatedAt columns
This commit is contained in:
Ahmed Bouhuolia
2026-02-26 05:59:49 +02:00
committed by GitHub
parent 12eb8c32dc ad252d2e4a
commit 6991ec7780
28 changed files with 139 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/server/src/models/Model.ts
View File

@@ -1,5 +1,6 @@
import { QueryBuilder, Model } from 'objection';
import { QueryBuilder, Model, mixin } from 'objection';
import { ModelHasRelationsError } from '@/common/exceptions/ModelHasRelations.exception';
import { withDateSessionMixin } from './withDateSessionMixin';
interface PaginationResult<M extends Model> {
results: M[];
@@ -69,6 +70,7 @@ export class PaginationQueryBuilder<
dependentRelationNames.forEach((relationName: string) => {
recordQuery.withGraphFetched(relationName);
});
const record = await recordQuery;
const hasRelations = dependentRelationNames.some((name) => {
@@ -97,7 +99,7 @@ export class BaseQueryBuilder<
}
}
export class BaseModel extends Model {
export class BaseModel extends mixin(Model, [withDateSessionMixin]) {
public readonly id: number;
public readonly tableName: string;

40
packages/server/src/models/withDateSessionMixin.ts Normal file
View File

@@ -0,0 +1,40 @@
import * as moment from 'moment';
import { Model } from 'objection';
type Constructor<T = {}> = new (...args: any[]) => T;
export const withDateSessionMixin = <T extends Constructor<Model>>(BaseModel: T) => {
return class DateSession extends BaseModel {
constructor(...args: any[]) {
super(...args);
}
get timestamps() {
return [];
}
$beforeUpdate(opt, context) {
const maybePromise = super.$beforeUpdate(opt, context);
return Promise.resolve(maybePromise).then(() => {
const key = this.timestamps[1];
if (key && !this[key]) {
this[key] = moment().format('YYYY/MM/DD HH:mm:ss');
}
});
}
$beforeInsert(context) {
const maybePromise = super.$beforeInsert(context);
return Promise.resolve(maybePromise).then(() => {
const key = this.timestamps[0];
if (key && !this[key]) {
this[key] = moment().format('YYYY/MM/DD HH:mm:ss');
}
});
}
}
}

7
packages/server/src/modules/BillLandedCosts/models/BillLandedCostEntry.ts
View File

@@ -13,6 +13,13 @@ export class BillLandedCostEntry extends BaseModel {
return 'bill_located_cost_entries';
}
/**
* Timestamps columns.
*/
get timestamps() {
return [];
}
/**
* Relationship mapping.
*/

2
packages/server/src/modules/Branches/models/Branch.model.ts
View File

@@ -29,7 +29,7 @@ export class Branch extends BaseModel{
* Timestamps columns.
*/
get timestamps() {
return ['created_at', 'updated_at'];
return ['createdAt', 'updatedAt'];
}
/**

2
packages/server/src/modules/CreditNoteRefunds/models/RefundCreditNote.ts
View File

@@ -34,7 +34,7 @@ export class RefundCreditNote extends BaseModel {
* Timestamps columns.
*/
get timestamps() {
return ['created_at', 'updated_at'];
return ['createdAt', 'updatedAt'];
}
/**

2
packages/server/src/modules/CreditNotes/models/CreditNote.ts
View File

@@ -56,7 +56,7 @@ export class CreditNote extends TenantBaseModel {
* Timestamps columns.
*/
get timestamps() {
return ['created_at', 'updated_at'];
return ['createdAt', 'updatedAt'];
}
/**

2
packages/server/src/modules/CreditNotesApplyInvoice/models/CreditNoteAppliedInvoice.ts
View File

@@ -26,7 +26,7 @@ export class CreditNoteAppliedInvoice extends BaseModel {
* Timestamps columns.
*/
get timestamps() {
return ['created_at', 'updated_at'];
return ['createdAt', 'updatedAt'];
}
/**

2
packages/server/src/modules/InventoryAdjutments/models/InventoryAdjustment.ts
View File

@@ -32,7 +32,7 @@ export class InventoryAdjustment extends TenantBaseModel {
* Timestamps columns.
*/
get timestamps(): Array<string> {
return ['created_at'];
return ['createdAt'];
}
/**

7
packages/server/src/modules/InventoryAdjutments/models/InventoryAdjustmentEntry.ts
View File

@@ -20,6 +20,13 @@ export class InventoryAdjustmentEntry extends BaseModel {
return 'inventory_adjustments_entries';
}
/**
* Timestamps columns.
*/
get timestamps() {
return [];
}
/**
* Relationship mapping.
*/

7
packages/server/src/modules/InventoryCost/models/InventoryTransactionMeta.ts
View File

@@ -13,6 +13,13 @@ export class InventoryTransactionMeta extends BaseModel {
return 'inventory_transaction_meta';
}
/**
* Timestamps columns.
*/
get timestamps() {
return [];
}
/**
* Relationship mapping.
*/

7
packages/server/src/modules/Items/models/Item.ts
View File

@@ -44,6 +44,13 @@ export class Item extends TenantBaseModel {
return 'items';
}
/**
* Timestamps columns.
*/
get timestamps() {
return ['createdAt', 'updatedAt'];
}
/**
* Model modifiers.
*/

2
packages/server/src/modules/PaymentReceived/models/PaymentReceived.ts
View File

@@ -43,7 +43,7 @@ export class PaymentReceived extends TenantBaseModel {
* Timestamps columns.
*/
get timestamps() {
return ['created_at', 'updated_at'];
return ['createdAt', 'updatedAt'];
}
/**

7
packages/server/src/modules/Roles/models/Role.model.ts
View File

@@ -16,6 +16,13 @@ export class Role extends TenantBaseModel {
return 'roles';
}
/**
* Timestamps columns.
*/
get timestamps() {
return [];
}
/**
* Relationship mapping.
*/

7
packages/server/src/modules/Roles/models/RolePermission.model.ts
View File

@@ -13,6 +13,13 @@ export class RolePermission extends TenantBaseModel {
return 'role_permissions';
}
/**
* Timestamps columns.
*/
get timestamps() {
return [];
}
/**
* Relationship mapping.
*/

2
packages/server/src/modules/SaleInvoices/models/SaleInvoice.ts
View File

@@ -74,7 +74,7 @@ export class SaleInvoice extends TenantBaseModel {
* Timestamps columns.
*/
get timestamps() {
return ['created_at', 'updated_at'];
return ['createdAt', 'updatedAt'];
}
/**

2
packages/server/src/modules/SaleReceipts/models/SaleReceipt.ts
View File

@@ -72,7 +72,7 @@ export class SaleReceipt extends ExtendedModel {
* Timestamps columns.
*/
get timestamps() {
return ['created_at', 'updated_at'];
return ['createdAt', 'updatedAt'];
}
/**

4
packages/server/src/modules/Settings/models/Setting.ts
View File

@@ -10,6 +10,10 @@ export class Setting extends BaseModel {
return 'settings';
}
get timestamps() {
return [];
}
/**
* Extra metadata query to query with the current authenticate user.
* @param {Object} query

7
packages/server/src/modules/System/models/TenantMetadataModel.ts
View File

@@ -50,6 +50,13 @@ export class TenantMetadata extends BaseModel {
*/
static tableName = 'tenants_metadata';
/**
* Timestamps columns.
*/
get timestamps() {
return [];
}
/**
* Virtual attributes.
*/

2
packages/server/src/modules/Tenancy/TenancyModels/models/TenantUser.model.ts
View File

@@ -24,7 +24,7 @@ export class TenantUser extends TenantBaseModel {
* Timestamps columns.
*/
get timestamps() {
return ['created_at', 'updated_at'];
return ['createdAt', 'updatedAt'];
}
/**

2
packages/server/src/modules/TransactionItemEntry/models/ItemEntry.ts
View File

@@ -53,7 +53,7 @@ export class ItemEntry extends BaseModel {
* @returns {string[]}
*/
get timestamps() {
return ['created_at', 'updated_at'];
return ['createdAt', 'updatedAt'];
}
/**

2
packages/server/src/modules/VendorCreditsApplyBills/models/VendorCreditAppliedBill.ts
View File

@@ -26,7 +26,7 @@ export class VendorCreditAppliedBill extends BaseModel {
* Timestamps columns.
*/
public get timestamps() {
return ['created_at', 'updated_at'];
return ['createdAt', 'updatedAt'];
}
/**

2
packages/server/src/modules/VendorCreditsRefund/models/RefundVendorCredit.ts
View File

@@ -32,7 +32,7 @@ export class RefundVendorCredit extends BaseModel {
* Timestamps columns.
*/
get timestamps() {
return ['created_at', 'updated_at'];
return ['createdAt', 'updatedAt'];
}
/*

7
packages/server/src/modules/Views/models/ViewColumn.model.ts
View File

@@ -8,6 +8,13 @@ export class ViewColumn extends BaseModel {
return 'view_has_columns';
}
/**
* Timestamps columns.
*/
get timestamps() {
return [];
}
/**
* Relationship mapping.
*/

7
packages/server/src/modules/Views/models/ViewRole.model.ts
View File

@@ -25,6 +25,13 @@ export class ViewRole extends BaseModel {
return 'view_roles';
}
/**
* Timestamps columns.
*/
get timestamps() {
return [];
}
/**
* Relationship mapping.
*/

7
packages/server/src/modules/Warehouses/models/ItemWarehouseQuantity.ts
View File

@@ -9,6 +9,13 @@ export class ItemWarehouseQuantity extends BaseModel{
return 'items_warehouses_quantity';
}
/**
* Timestamps columns.
*/
get timestamps() {
return [];
}
/**
* Relation mappings.
*/

2
packages/server/src/modules/Warehouses/models/Warehouse.model.ts
View File

@@ -24,7 +24,7 @@ export class Warehouse extends BaseModel {
* Timestamps columns.
*/
get timestamps() {
return ['created_at', 'updated_at'];
return ['createdAt', 'updatedAt'];
}
/**

2
packages/server/src/modules/WarehousesTransfers/models/WarehouseTransfer.ts
View File

@@ -28,7 +28,7 @@ export class WarehouseTransfer extends TenantBaseModel {
* Timestamps columns.
*/
get timestamps() {
return ['created_at', 'updated_at'];
return ['createdAt', 'updatedAt'];
}
/**

7
packages/server/src/modules/WarehousesTransfers/models/WarehouseTransferEntry.ts
View File

@@ -19,6 +19,13 @@ export class WarehouseTransferEntry extends TenantBaseModel {
return 'warehouses_transfers_entries';
}
/**
* Timestamps columns.
*/
get timestamps() {
return [];
}
/**
* Virtual attributes.
*/