kasperdokter/bigcapital
1
0
Fork 0
Code Activity

chore: format all packages

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2026-03-27 18:44:40 +02:00
parent a1d1f53773
commit 423dca5fa2
751 changed files with 4062 additions and 3168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/common/config/inventory.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import { registerAs } from "@nestjs/config";
import { registerAs } from '@nestjs/config';
export default registerAs('inventory', () => ({
scheduleComputeItemCost: process.env.INVENTORY_SCHEDULE_COMPUTE_ITEM_COST,
packages/server/src/common/config/loops.ts
-1
View File
@@ -1,4 +1,3 @@
import { registerAs } from '@nestjs/config';
export default registerAs('loops', () => ({
packages/server/src/common/config/system-database.ts
+2 -1
View File
@@ -7,6 +7,7 @@ export default registerAs('systemDatabase', () => ({
user: process.env.SYSTEM_DB_USER || process.env.DB_USER,
password: process.env.SYSTEM_DB_PASSWORD || process.env.DB_PASSWORD,
databaseName: process.env.SYSTEM_DB_NAME || process.env.DB_NAME,
migrationDir: process.env.SYSTEM_DB_MIGRATION_DIR || './src/database/system/migrations',
migrationDir:
process.env.SYSTEM_DB_MIGRATION_DIR || './src/database/system/migrations',
seedsDir: process.env.SYSTEM_DB_SEEDS_DIR || './src/database/system/seeds',
}));
packages/server/src/common/config/throttle.ts
-2
View File
@@ -10,5 +10,3 @@ export default registerAs('throttle', () => ({
limit: parseInt(process.env.THROTTLE_AUTH_LIMIT ?? '10', 10),
},
}));
packages/server/src/common/constants/multer.constants.ts
-2
View File
@@ -20,5 +20,3 @@ export const busboyExceptions = {
MULTIPART_UNEXPECTED_END_OF_FORM: 'Unexpected end of form',
MULTIPART_UNEXPECTED_END_OF_FILE: 'Unexpected end of file',
};
packages/server/src/common/dtos/BulkDelete.dto.ts
+12 -4
View File
@@ -1,4 +1,10 @@
import { IsArray, IsInt, ArrayNotEmpty, IsBoolean, IsOptional } from 'class-validator';
import {
IsArray,
IsInt,
ArrayNotEmpty,
IsBoolean,
IsOptional,
} from 'class-validator';
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
import { Transform } from 'class-transformer';
import { parseBoolean } from '@/utils/parse-boolean';
@@ -16,9 +22,12 @@ export class BulkDeleteDto {
@IsOptional()
@IsBoolean()
@Transform(({ value, obj }) => parseBoolean(value ?? obj?.skip_undeletable, false))
@Transform(({ value, obj }) =>
parseBoolean(value ?? obj?.skip_undeletable, false),
)
@ApiPropertyOptional({
description: 'When true, undeletable items will be skipped and only deletable ones will be removed.',
description:
'When true, undeletable items will be skipped and only deletable ones will be removed.',
type: Boolean,
default: false,
})
@@ -52,4 +61,3 @@ export class ValidateBulkDeleteResponseDto {
})
nonDeletableIds: number[];
}
packages/server/src/common/filters/service-error.filter.ts
+2 -2
View File
@@ -21,8 +21,8 @@ export class ServiceErrorFilter implements ExceptionFilter {
type: exception.errorType,
message: exception.message,
payload: exception.payload,
}
]
},
],
});
}
}
packages/server/src/common/interceptors/file.interceptor.ts
+3 -4
View File
@@ -29,11 +29,10 @@ export function FileInterceptor(
constructor(
@Optional()
@Inject(MULTER_MODULE_OPTIONS)
options: (() => MulterModuleOptions | MulterModuleOptions) = () => ({}),
options: () => MulterModuleOptions | MulterModuleOptions = () => ({}),
) {
const resolvedOptions = typeof localOptions === 'function'
? localOptions(this)
: localOptions;
const resolvedOptions =
typeof localOptions === 'function' ? localOptions(this) : localOptions;
this.multer = (multer as any)({
...(typeof options === 'function' ? options() : options),
packages/server/src/common/interceptors/serialize.interceptor.ts
+1 -1
View File
@@ -56,7 +56,7 @@ export const DEFAULT_STRATEGY = {
@Injectable()
export class SerializeInterceptor implements NestInterceptor<any, any> {
constructor(@Optional() readonly strategy = DEFAULT_STRATEGY) { }
constructor(@Optional() readonly strategy = DEFAULT_STRATEGY) {}
intercept(
context: ExecutionContext,
packages/server/src/common/interceptors/to-json.interceptor.ts
+5 -1
View File
@@ -16,7 +16,11 @@ export class ToJsonInterceptor implements NestInterceptor {
return data;
}
return mapValuesDeep(data, (value) => {
if (value !== null && value !== undefined && typeof value.toJSON === 'function') {
if (
value !== null &&
value !== undefined &&
typeof value.toJSON === 'function'
) {
return value.toJSON();
}
return value;
packages/server/src/common/repository/TenantRepository.ts
+1 -3
View File
@@ -1,6 +1,4 @@
// import { CachableRepository } from './CachableRepository';
import { EntityRepository } from './EntityRepository';
export class TenantRepository extends EntityRepository {
}
export class TenantRepository extends EntityRepository {}
packages/server/src/database/tenant/migrations/20190822214303_create_accounts_table.ts
+21 -15
View File
@@ -1,19 +1,25 @@
exports.up = function (knex) {
return knex.schema.createTable('accounts', (table) => {
table.increments('id').comment('Auto-generated id');
table.string('name').index();
table.string('slug');
table.string('account_type').index();
table.integer('parent_account_id').unsigned().references('id').inTable('accounts');
table.string('code', 10).index();
table.text('description');
table.boolean('active').defaultTo(true).index();
table.integer('index').unsigned();
table.boolean('predefined').defaultTo(false).index();
table.decimal('amount', 15, 5);
table.string('currency_code', 3).index();
table.timestamps();
}).raw('ALTER TABLE `ACCOUNTS` AUTO_INCREMENT = 1000');
return knex.schema
.createTable('accounts', (table) => {
table.increments('id').comment('Auto-generated id');
table.string('name').index();
table.string('slug');
table.string('account_type').index();
table
.integer('parent_account_id')
.unsigned()
.references('id')
.inTable('accounts');
table.string('code', 10).index();
table.text('description');
table.boolean('active').defaultTo(true).index();
table.integer('index').unsigned();
table.boolean('predefined').defaultTo(false).index();
table.decimal('amount', 15, 5);
table.string('currency_code', 3).index();
table.timestamps();
})
.raw('ALTER TABLE `ACCOUNTS` AUTO_INCREMENT = 1000');
};
exports.down = (knex) => knex.schema.dropTableIfExists('accounts');
packages/server/src/database/tenant/migrations/20190822214304_create_items_categories_table.ts
+15 -4
View File
@@ -1,4 +1,3 @@
exports.up = function (knex) {
return knex.schema.createTable('items_categories', (table) => {
table.increments();
@@ -7,9 +6,21 @@ exports.up = function (knex) {
table.text('description');
table.integer('user_id').unsigned().index();
table.integer('cost_account_id').unsigned().references('id').inTable('accounts');
table.integer('sell_account_id').unsigned().references('id').inTable('accounts');
table.integer('inventory_account_id').unsigned().references('id').inTable('accounts');
table
.integer('cost_account_id')
.unsigned()
.references('id')
.inTable('accounts');
table
.integer('sell_account_id')
.unsigned()
.references('id')
.inTable('accounts');
table
.integer('inventory_account_id')
.unsigned()
.references('id')
.inTable('accounts');
table.string('cost_method');
table.timestamps();
packages/server/src/database/tenant/migrations/20190822214306_create_items_table.ts
+45 -25
View File
@@ -1,30 +1,50 @@
exports.up = function (knex) {
return knex.schema.createTable('items', (table) => {
table.increments();
table.string('name').index();
table.string('type').index();
table.string('code');
table.boolean('sellable').index();
table.boolean('purchasable').index();
table.decimal('sell_price', 13, 3).unsigned();
table.decimal('cost_price', 13, 3).unsigned();
table.string('currency_code', 3);
table.string('picture_uri');
table.integer('cost_account_id').nullable().unsigned().references('id').inTable('accounts');
table.integer('sell_account_id').nullable().unsigned().references('id').inTable('accounts');
table.integer('inventory_account_id').unsigned().references('id').inTable('accounts');
table.text('sell_description').nullable();
table.text('purchase_description').nullable();
table.integer('quantity_on_hand');
table.boolean('landed_cost').nullable();
return knex.schema
.createTable('items', (table) => {
table.increments();
table.string('name').index();
table.string('type').index();
table.string('code');
table.boolean('sellable').index();
table.boolean('purchasable').index();
table.decimal('sell_price', 13, 3).unsigned();
table.decimal('cost_price', 13, 3).unsigned();
table.string('currency_code', 3);
table.string('picture_uri');
table
.integer('cost_account_id')
.nullable()
.unsigned()
.references('id')
.inTable('accounts');
table
.integer('sell_account_id')
.nullable()
.unsigned()
.references('id')
.inTable('accounts');
table
.integer('inventory_account_id')
.unsigned()
.references('id')
.inTable('accounts');
table.text('sell_description').nullable();
table.text('purchase_description').nullable();
table.integer('quantity_on_hand');
table.boolean('landed_cost').nullable();
table.text('note').nullable();
table.boolean('active');
table.integer('category_id').unsigned().index().references('id').inTable('items_categories');
table.integer('user_id').unsigned().index();
table.timestamps();
}).raw('ALTER TABLE `ITEMS` AUTO_INCREMENT = 1000');
table.text('note').nullable();
table.boolean('active');
table
.integer('category_id')
.unsigned()
.index()
.references('id')
.inTable('items_categories');
table.integer('user_id').unsigned().index();
table.timestamps();
})
.raw('ALTER TABLE `ITEMS` AUTO_INCREMENT = 1000');
};
exports.down = (knex) => knex.schema.dropTableIfExists('items');
packages/server/src/database/tenant/migrations/20190822214903_create_views_table.ts
+12 -11
View File
@@ -1,15 +1,16 @@
exports.up = function (knex) {
return knex.schema.createTable('views', (table) => {
table.increments();
table.string('name').index();
table.string('slug').index();
table.boolean('predefined');
table.string('resource_model').index();
table.boolean('favourite');
table.string('roles_logic_expression');
table.timestamps();
}).raw('ALTER TABLE `VIEWS` AUTO_INCREMENT = 1000');
return knex.schema
.createTable('views', (table) => {
table.increments();
table.string('name').index();
table.string('slug').index();
table.boolean('predefined');
table.string('resource_model').index();
table.boolean('favourite');
table.string('roles_logic_expression');
table.timestamps();
})
.raw('ALTER TABLE `VIEWS` AUTO_INCREMENT = 1000');
};
exports.down = (knex) => knex.schema.dropTableIfExists('views');
packages/server/src/database/tenant/migrations/20190822214904_create_settings_table.ts
+10 -9
View File
@@ -1,13 +1,14 @@
exports.up = function (knex) {
return knex.schema.createTable('settings', (table) => {
table.increments();
table.integer('user_id').unsigned().index();
table.string('group').index();
table.string('type');
table.string('key').index();
table.string('value');
}).raw('ALTER TABLE `SETTINGS` AUTO_INCREMENT = 2000');
return knex.schema
.createTable('settings', (table) => {
table.increments();
table.integer('user_id').unsigned().index();
table.string('group').index();
table.string('type');
table.string('key').index();
table.string('value');
})
.raw('ALTER TABLE `SETTINGS` AUTO_INCREMENT = 2000');
};
exports.down = (knex) => knex.schema.dropTableIfExists('settings');
packages/server/src/database/tenant/migrations/20190822214905_create_views_columns.ts
+13 -7
View File
@@ -1,11 +1,17 @@
exports.up = function (knex) {
return knex.schema.createTable('view_has_columns', (table) => {
table.increments();
table.integer('view_id').unsigned().index().references('id').inTable('views');
table.string('field_key');
table.integer('index').unsigned();
}).raw('ALTER TABLE `ITEMS_CATEGORIES` AUTO_INCREMENT = 1000');
return knex.schema
.createTable('view_has_columns', (table) => {
table.increments();
table
.integer('view_id')
.unsigned()
.index()
.references('id')
.inTable('views');
table.string('field_key');
table.integer('index').unsigned();
})
.raw('ALTER TABLE `ITEMS_CATEGORIES` AUTO_INCREMENT = 1000');
};
exports.down = (knex) => knex.schema.dropTableIfExists('view_has_columns');
packages/server/src/database/tenant/migrations/20200104232644_create_contacts_table.ts
+4 -6
View File
@@ -1,6 +1,5 @@
exports.up = function(knex) {
return knex.schema.createTable('contacts', table => {
exports.up = function (knex) {
return knex.schema.createTable('contacts', (table) => {
table.increments();
table.string('contact_service');
@@ -32,8 +31,7 @@ exports.up = function(knex) {
table.string('billing_address_postcode').nullable();
table.string('billing_address_phone').nullable();
table.string('billing_address_state').nullable(),
table.string('shipping_address_1').nullable();
table.string('shipping_address_1').nullable();
table.string('shipping_address_2').nullable();
table.string('shipping_address_city').nullable();
table.string('shipping_address_country').nullable();
@@ -49,6 +47,6 @@ exports.up = function(knex) {
});
};
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.dropTableIfExists('contacts');
};
packages/server/src/database/tenant/migrations/20200105195823_create_manual_journals_table.ts
+18 -17
View File
@@ -1,21 +1,22 @@
exports.up = function(knex) {
return knex.schema.createTable('manual_journals', (table) => {
table.increments();
table.string('journal_number').index();
table.string('reference').index();
table.string('journal_type').index();
table.decimal('amount', 13, 3);
table.string('currency_code', 3);
table.date('date').index();
table.string('description');
table.date('published_at').index();
table.string('attachment_file');
table.integer('user_id').unsigned().index();
table.timestamps();
}).raw('ALTER TABLE `MANUAL_JOURNALS` AUTO_INCREMENT = 1000');
exports.up = function (knex) {
return knex.schema
.createTable('manual_journals', (table) => {
table.increments();
table.string('journal_number').index();
table.string('reference').index();
table.string('journal_type').index();
table.decimal('amount', 13, 3);
table.string('currency_code', 3);
table.date('date').index();
table.string('description');
table.date('published_at').index();
table.string('attachment_file');
table.integer('user_id').unsigned().index();
table.timestamps();
})
.raw('ALTER TABLE `MANUAL_JOURNALS` AUTO_INCREMENT = 1000');
};
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.dropTableIfExists('manual_journals');
};
packages/server/src/database/tenant/migrations/20200105195825_create_manual_journals_entries_table.ts
+24 -13
View File
@@ -1,17 +1,28 @@
exports.up = function(knex) {
return knex.schema.createTable('manual_journals_entries', (table) => {
table.increments();
table.decimal('credit', 13, 3);
table.decimal('debit', 13, 3);
table.integer('index').unsigned();
table.integer('account_id').unsigned().index().references('id').inTable('accounts');
table.integer('contact_id').unsigned().nullable().index();
table.string('note');
table.integer('manual_journal_id').unsigned().index().references('id').inTable('manual_journals');
}).raw('ALTER TABLE `MANUAL_JOURNALS_ENTRIES` AUTO_INCREMENT = 1000');
exports.up = function (knex) {
return knex.schema
.createTable('manual_journals_entries', (table) => {
table.increments();
table.decimal('credit', 13, 3);
table.decimal('debit', 13, 3);
table.integer('index').unsigned();
table
.integer('account_id')
.unsigned()
.index()
.references('id')
.inTable('accounts');
table.integer('contact_id').unsigned().nullable().index();
table.string('note');
table
.integer('manual_journal_id')
.unsigned()
.index()
.references('id')
.inTable('manual_journals');
})
.raw('ALTER TABLE `MANUAL_JOURNALS_ENTRIES` AUTO_INCREMENT = 1000');
};
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.dropTableIfExists('manual_journals_entries');
};
packages/server/src/database/tenant/migrations/20200419171451_create_currencies_table.ts
+11 -10
View File
@@ -1,14 +1,15 @@
exports.up = function(knex) {
return knex.schema.createTable('currencies', table => {
table.increments();
table.string('currency_name').index();
table.string('currency_code', 4).index();
table.string('currency_sign').index();
table.timestamps();
}).raw('ALTER TABLE `CURRENCIES` AUTO_INCREMENT = 1000');
exports.up = function (knex) {
return knex.schema
.createTable('currencies', (table) => {
table.increments();
table.string('currency_name').index();
table.string('currency_code', 4).index();
table.string('currency_sign').index();
table.timestamps();
})
.raw('ALTER TABLE `CURRENCIES` AUTO_INCREMENT = 1000');
};
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.dropTableIfExists('currencies');
};
packages/server/src/database/tenant/migrations/20200419191832_create_exchange_rates_table.ts
+11 -10
View File
@@ -1,14 +1,15 @@
exports.up = function(knex) {
return knex.schema.createTable('exchange_rates', table => {
table.increments();
table.string('currency_code', 4).index();
table.decimal('exchange_rate');
table.date('date').index();
table.timestamps();
}).raw('ALTER TABLE `EXCHANGE_RATES` AUTO_INCREMENT = 1000');
exports.up = function (knex) {
return knex.schema
.createTable('exchange_rates', (table) => {
table.increments();
table.string('currency_code', 4).index();
table.decimal('exchange_rate');
table.date('date').index();
table.timestamps();
})
.raw('ALTER TABLE `EXCHANGE_RATES` AUTO_INCREMENT = 1000');
};
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.dropTableIfExists('exchange_rates');
};
packages/server/src/database/tenant/migrations/20200423201600_create_media_table.ts
+2 -3
View File
@@ -1,5 +1,4 @@
exports.up = function(knex) {
exports.up = function (knex) {
return knex.schema.createTable('media', (table) => {
table.increments();
table.string('attachment_file');
@@ -7,6 +6,6 @@ exports.up = function(knex) {
});
};
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.dropTableIfExists('media');
};
packages/server/src/database/tenant/migrations/20200503032011_create_media_links_table.ts
+4 -5
View File
@@ -1,13 +1,12 @@
exports.up = function(knex) {
return knex.schema.createTable('media_links', table => {
exports.up = function (knex) {
return knex.schema.createTable('media_links', (table) => {
table.increments();
table.string('model_name').index();
table.integer('media_id').unsigned().references('id').inTable('media');
table.integer('model_id').unsigned().index();
})
});
};
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.dropTableIfExists('media_links');
};
packages/server/src/database/tenant/migrations/20200713213303_create_sales_receipt_table.ts
+16 -7
View File
@@ -1,11 +1,20 @@
exports.up = function(knex) {
return knex.schema.createTable('sales_receipts', table => {
exports.up = function (knex) {
return knex.schema.createTable('sales_receipts', (table) => {
table.increments();
table.decimal('amount', 13, 3);
table.string('currency_code', 3);
table.integer('deposit_account_id').unsigned().index().references('id').inTable('accounts');
table.integer('customer_id').unsigned().index().references('id').inTable('contacts');
table
.integer('deposit_account_id')
.unsigned()
.index()
.references('id')
.inTable('accounts');
table
.integer('customer_id')
.unsigned()
.index()
.references('id')
.inTable('contacts');
table.date('receipt_date').index();
table.string('receipt_number').index();
table.string('reference_no').index();
@@ -14,9 +23,9 @@ exports.up = function(knex) {
table.text('statement');
table.date('closed_at').index();
table.timestamps();
})
});
};
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.dropTableIfExists('sales_receipts');
};
packages/server/src/database/tenant/migrations/20200719153909_create_bills_payments_table.ts
+14 -8
View File
@@ -1,11 +1,19 @@
exports.up = function(knex) {
return knex.schema.createTable('bills_payments', table => {
exports.up = function (knex) {
return knex.schema.createTable('bills_payments', (table) => {
table.increments();
table.integer('vendor_id').unsigned().index().references('id').inTable('contacts');
table
.integer('vendor_id')
.unsigned()
.index()
.references('id')
.inTable('contacts');
table.decimal('amount', 13, 3).defaultTo(0);
table.string('currency_code');
table.integer('payment_account_id').unsigned().references('id').inTable('accounts');
table
.integer('payment_account_id')
.unsigned()
.references('id')
.inTable('accounts');
table.string('payment_number').nullable().index();
table.date('payment_date').index();
table.string('payment_method');
@@ -16,6 +24,4 @@ exports.up = function(knex) {
});
};
exports.down = function(knex) {
};
exports.down = function (knex) {};
packages/server/src/database/tenant/migrations/20200722164255_create_inventory_transaction_meta_table.ts
+8 -9
View File
@@ -1,11 +1,10 @@
exports.up = function (knex) {
return knex.schema.createTable('inventory_transaction_meta', (table) => {
table.increments('id');
table.string('transaction_number');
table.text('description');
table.integer('inventory_transaction_id').unsigned();
});
};
exports.down = function (knex) {};
return knex.schema.createTable('inventory_transaction_meta', (table) => {
table.increments('id');
table.string('transaction_number');
table.text('description');
table.integer('inventory_transaction_id').unsigned();
});
};
exports.down = function (knex) {};
packages/server/src/database/tenant/migrations/20200810121809_create_inventory_adjustments_table.ts
+8 -5
View File
@@ -1,10 +1,13 @@
exports.up = function(knex) {
return knex.schema.createTable('inventory_adjustments', table => {
exports.up = function (knex) {
return knex.schema.createTable('inventory_adjustments', (table) => {
table.increments();
table.date('date').index();
table.string('type').index();
table.integer('adjustment_account_id').unsigned().references('id').inTable('accounts');
table
.integer('adjustment_account_id')
.unsigned()
.references('id')
.inTable('accounts');
table.string('reason');
table.string('reference_no').index();
table.string('description');
@@ -14,6 +17,6 @@ exports.up = function(knex) {
});
};
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.dropTableIfExists('inventory_adjustments');
};
packages/server/src/database/tenant/migrations/20220229121920_rename_contacts_shipping_billing_addresses.ts
+4 -4
View File
@@ -1,16 +1,16 @@
exports.up = (knex) => {
return knex.schema
.raw(
'ALTER TABLE CONTACTS CHANGE SHIPPING_ADDRESS_1 SHIPPING_ADDRESS1 VARCHAR(255)'
'ALTER TABLE CONTACTS CHANGE SHIPPING_ADDRESS_1 SHIPPING_ADDRESS1 VARCHAR(255)',
)
.raw(
'ALTER TABLE CONTACTS CHANGE SHIPPING_ADDRESS_2 SHIPPING_ADDRESS2 VARCHAR(255)'
'ALTER TABLE CONTACTS CHANGE SHIPPING_ADDRESS_2 SHIPPING_ADDRESS2 VARCHAR(255)',
)
.raw(
'ALTER TABLE CONTACTS CHANGE BILLING_ADDRESS_1 BILLING_ADDRESS1 VARCHAR(255)'
'ALTER TABLE CONTACTS CHANGE BILLING_ADDRESS_1 BILLING_ADDRESS1 VARCHAR(255)',
)
.raw(
'ALTER TABLE CONTACTS CHANGE BILLING_ADDRESS_2 BILLING_ADDRESS2 VARCHAR(255)'
'ALTER TABLE CONTACTS CHANGE BILLING_ADDRESS_2 BILLING_ADDRESS2 VARCHAR(255)',
);
};
packages/server/src/database/tenant/migrations/20240228183404_create_uncateogrized_cashflow_transactions_table.ts
+1 -1
View File
@@ -19,7 +19,7 @@ exports.up = function (knex) {
table.boolean('categorized').defaultTo(false);
table.string('plaid_transaction_id');
table.timestamps();
}
},
);
};
packages/server/src/database/tenant/migrations/20240801130829_change_tax_amount_withheld_column_precision_in_bills_and_sales_invoices_tables.ts
+16 -12
View File
@@ -1,18 +1,22 @@
// This migration changes the precision of the tax_amount_withheld column in the bills and sales_invoices tables from 8, 2 to 13, 2.
// This migration is necessary to allow tax_amount_withheld filed to store values bigger than 999,999.99.
exports.up = function(knex) {
return knex.schema.alterTable('bills', function (table) {
table.decimal('tax_amount_withheld', 13, 2).alter();
}).alterTable('sales_invoices', function (table) {
table.decimal('tax_amount_withheld', 13, 2).alter();
});
exports.up = function (knex) {
return knex.schema
.alterTable('bills', function (table) {
table.decimal('tax_amount_withheld', 13, 2).alter();
})
.alterTable('sales_invoices', function (table) {
table.decimal('tax_amount_withheld', 13, 2).alter();
});
};
exports.down = function(knex) {
return knex.schema.alterTable('bills', function (table) {
table.decimal('tax_amount_withheld', 8, 2).alter();
}).alterTable('sales_invoices', function (table) {
table.decimal('tax_amount_withheld', 8, 2).alter();
});
exports.down = function (knex) {
return knex.schema
.alterTable('bills', function (table) {
table.decimal('tax_amount_withheld', 8, 2).alter();
})
.alterTable('sales_invoices', function (table) {
table.decimal('tax_amount_withheld', 8, 2).alter();
});
};
packages/server/src/database/tenant/migrations/20241128081259_add_discount_to_estimates_table.ts
+2 -2
View File
@@ -2,7 +2,7 @@
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.up = function(knex) {
exports.up = function (knex) {
return knex.schema.alterTable('sales_estimates', (table) => {
table.decimal('discount', 10, 2).nullable().after('amount');
table.string('discount_type').nullable().after('discount');
@@ -15,7 +15,7 @@ exports.up = function(knex) {
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.alterTable('sales_estimates', (table) => {
table.dropColumn('discount');
table.dropColumn('discount_type');
packages/server/src/database/tenant/migrations/20241128084550_add_discount_to_receipts_table.ts
+2 -2
View File
@@ -2,7 +2,7 @@
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.up = function(knex) {
exports.up = function (knex) {
return knex.schema.alterTable('sales_receipts', (table) => {
table.decimal('discount', 10, 2).nullable().after('amount');
table.string('discount_type').nullable().after('discount');
@@ -15,7 +15,7 @@ exports.up = function(knex) {
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.alterTable('sales_receipts', (table) => {
table.dropColumn('discount');
table.dropColumn('discount_type');
packages/server/src/database/tenant/migrations/20241128085243_add_discount_to_bills_table.ts
+2 -2
View File
@@ -2,7 +2,7 @@
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.up = function(knex) {
exports.up = function (knex) {
return knex.schema.alterTable('bills', (table) => {
// Discount.
table.decimal('discount', 10, 2).nullable().after('amount');
@@ -17,7 +17,7 @@ exports.up = function(knex) {
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.alterTable('bills', (table) => {
table.dropColumn('discount');
table.dropColumn('discount_type');
packages/server/src/database/tenant/migrations/20241128090222_add_discount_to_credit_notes_table.ts
+2 -2
View File
@@ -2,7 +2,7 @@
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.up = function(knex) {
exports.up = function (knex) {
return knex.schema.alterTable('credit_notes', (table) => {
table.decimal('discount', 10, 2).nullable().after('exchange_rate');
table.string('discount_type').nullable().after('discount');
@@ -14,7 +14,7 @@ exports.up = function(knex) {
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.alterTable('credit_notes', (table) => {
table.dropColumn('discount');
table.dropColumn('discount_type');
packages/server/src/database/tenant/migrations/20241128160604_add_discount_to_vendor_credits_table.ts
+2 -2
View File
@@ -2,7 +2,7 @@
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.up = function(knex) {
exports.up = function (knex) {
return knex.schema.alterTable('vendor_credits', (table) => {
table.decimal('discount', 10, 2).nullable().after('amount');
table.string('discount_type').nullable().after('discount');
@@ -14,7 +14,7 @@ exports.up = function(knex) {
* @param { import("knex").Knex } knex
* @returns { Promise<void> }
*/
exports.down = function(knex) {
exports.down = function (knex) {
return knex.schema.alterTable('vendor_credits', (table) => {
table.dropColumn('discount');
table.dropColumn('discount_type');
packages/server/src/database/tenant/migrations/20250326120000_add_contact_code_to_contacts.ts
+4 -5
View File
@@ -1,12 +1,11 @@
exports.up = function(knex) {
return knex.schema.alterTable('contacts', table => {
exports.up = function (knex) {
return knex.schema.alterTable('contacts', (table) => {
table.string('code').nullable().unique();
});
};
exports.down = function(knex) {
return knex.schema.alterTable('contacts', table => {
exports.down = function (knex) {
return knex.schema.alterTable('contacts', (table) => {
table.dropColumn('code');
});
};
packages/server/src/libs/chromiumly/ConvertUtils.ts
+7 -7
View File
@@ -5,12 +5,12 @@ import { PageProperties } from './_types';
export class ConverterUtils {
public static injectPageProperties(
data: FormData,
pageProperties: PageProperties
pageProperties: PageProperties,
): void {
if (pageProperties.size) {
GotenbergUtils.assert(
pageProperties.size.width >= 1.0 && pageProperties.size.height >= 1.5,
'size is smaller than the minimum printing requirements (i.e. 1.0 x 1.5 in)'
'size is smaller than the minimum printing requirements (i.e. 1.0 x 1.5 in)',
);
data.append('paperWidth', pageProperties.size.width);
@@ -22,7 +22,7 @@ export class ConverterUtils {
pageProperties.margins.bottom >= 0 &&
pageProperties.margins.left >= 0 &&
pageProperties.margins.left >= 0,
'negative margins are not allowed'
'negative margins are not allowed',
);
data.append('marginTop', pageProperties.margins.top);
data.append('marginBottom', pageProperties.margins.bottom);
@@ -32,7 +32,7 @@ export class ConverterUtils {
if (pageProperties.preferCssPageSize) {
data.append(
'preferCssPageSize',
String(pageProperties.preferCssPageSize)
String(pageProperties.preferCssPageSize),
);
}
if (pageProperties.printBackground) {
@@ -44,7 +44,7 @@ export class ConverterUtils {
if (pageProperties.scale) {
GotenbergUtils.assert(
pageProperties.scale >= 0.1 && pageProperties.scale <= 2.0,
'scale is outside of [0.1 - 2] range'
'scale is outside of [0.1 - 2] range',
);
data.append('scale', pageProperties.scale);
}
@@ -55,11 +55,11 @@ export class ConverterUtils {
pageProperties.nativePageRanges.to > 0 &&
pageProperties.nativePageRanges.to >=
pageProperties.nativePageRanges.from,
'page ranges syntax error'
'page ranges syntax error',
);
data.append(
'nativePageRanges',
`${pageProperties.nativePageRanges.from}-${pageProperties.nativePageRanges.to}`
`${pageProperties.nativePageRanges.from}-${pageProperties.nativePageRanges.to}`,
);
}
}
packages/server/src/libs/chromiumly/UrlConvert.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import * as FormData from 'form-data';
import * as FormData from 'form-data';
import { IConverter, PageProperties, PdfFormat, ChromiumRoute } from './_types';
import { ConverterUtils } from './ConvertUtils';
import { Converter } from './Converter';
packages/server/src/libs/dependency-graph/index.ts
+311 -311
View File
@@ -14,337 +14,337 @@
* @param circular A boolean to allow circular dependencies
*/
function createDFS(edges, leavesOnly, result, circular) {
var visited = {};
return function (start) {
if (visited[start]) {
return;
}
var inCurrentPath = {};
var currentPath = [];
var todo = []; // used as a stack
todo.push({ node: start, processed: false });
while (todo.length > 0) {
var current = todo[todo.length - 1]; // peek at the todo stack
var processed = current.processed;
var node = current.node;
if (!processed) {
// Haven't visited edges yet (visiting phase)
if (visited[node]) {
todo.pop();
continue;
} else if (inCurrentPath[node]) {
// It's not a DAG
if (circular) {
todo.pop();
// If we're tolerating cycles, don't revisit the node
continue;
}
currentPath.push(node);
throw new DepGraphCycleError(currentPath);
}
inCurrentPath[node] = true;
currentPath.push(node);
var nodeEdges = edges[node];
// (push edges onto the todo stack in reverse order to be order-compatible with the old DFS implementation)
for (var i = nodeEdges.length - 1; i >= 0; i--) {
todo.push({ node: nodeEdges[i], processed: false });
}
current.processed = true;
} else {
// Have visited edges (stack unrolling phase)
var visited = {};
return function (start) {
if (visited[start]) {
return;
}
var inCurrentPath = {};
var currentPath = [];
var todo = []; // used as a stack
todo.push({ node: start, processed: false });
while (todo.length > 0) {
var current = todo[todo.length - 1]; // peek at the todo stack
var processed = current.processed;
var node = current.node;
if (!processed) {
// Haven't visited edges yet (visiting phase)
if (visited[node]) {
todo.pop();
currentPath.pop();
inCurrentPath[node] = false;
visited[node] = true;
if (!leavesOnly || edges[node].length === 0) {
result.push(node);
continue;
} else if (inCurrentPath[node]) {
// It's not a DAG
if (circular) {
todo.pop();
// If we're tolerating cycles, don't revisit the node
continue;
}
currentPath.push(node);
throw new DepGraphCycleError(currentPath);
}
}
};
}
/**
* Simple Dependency Graph
*/
var DepGraph = (DepGraph = function DepGraph(opts) {
this.nodes = {}; // Node -> Node/Data (treated like a Set)
this.outgoingEdges = {}; // Node -> [Dependency Node]
this.incomingEdges = {}; // Node -> [Dependant Node]
this.circular = opts && !!opts.circular; // Allows circular deps
});
DepGraph.fromArray = (
items,
options = { itemId: 'id', parentItemId: 'parent_id' }
) => {
const depGraph = new DepGraph();
items.forEach((item) => {
depGraph.addNode(item[options.itemId], item);
});
items.forEach((item) => {
if (item[options.parentItemId]) {
depGraph.addDependency(item[options.parentItemId], item[options.itemId]);
}
});
return depGraph;
};
DepGraph.prototype = {
/**
* The number of nodes in the graph.
*/
size: function () {
return Object.keys(this.nodes).length;
},
/**
* Add a node to the dependency graph. If a node already exists, this method will do nothing.
*/
addNode: function (node, data) {
if (!this.hasNode(node)) {
// Checking the arguments length allows the user to add a node with undefined data
if (arguments.length === 2) {
this.nodes[node] = data;
} else {
this.nodes[node] = node;
inCurrentPath[node] = true;
currentPath.push(node);
var nodeEdges = edges[node];
// (push edges onto the todo stack in reverse order to be order-compatible with the old DFS implementation)
for (var i = nodeEdges.length - 1; i >= 0; i--) {
todo.push({ node: nodeEdges[i], processed: false });
}
this.outgoingEdges[node] = [];
this.incomingEdges[node] = [];
}
},
/**
* Remove a node from the dependency graph. If a node does not exist, this method will do nothing.
*/
removeNode: function (node) {
if (this.hasNode(node)) {
delete this.nodes[node];
delete this.outgoingEdges[node];
delete this.incomingEdges[node];
[this.incomingEdges, this.outgoingEdges].forEach(function (edgeList) {
Object.keys(edgeList).forEach(function (key) {
var idx = edgeList[key].indexOf(node);
if (idx >= 0) {
edgeList[key].splice(idx, 1);
}
}, this);
});
}
},
/**
* Check if a node exists in the graph
*/
hasNode: function (node) {
return this.nodes.hasOwnProperty(node);
},
/**
* Get the data associated with a node name
*/
getNodeData: function (node) {
if (this.hasNode(node)) {
return this.nodes[node];
current.processed = true;
} else {
throw new Error('Node does not exist: ' + node);
// Have visited edges (stack unrolling phase)
todo.pop();
currentPath.pop();
inCurrentPath[node] = false;
visited[node] = true;
if (!leavesOnly || edges[node].length === 0) {
result.push(node);
}
}
},
}
};
}
/**
* Set the associated data for a given node name. If the node does not exist, this method will throw an error
*/
setNodeData: function (node, data) {
if (this.hasNode(node)) {
/**
* Simple Dependency Graph
*/
var DepGraph = (DepGraph = function DepGraph(opts) {
this.nodes = {}; // Node -> Node/Data (treated like a Set)
this.outgoingEdges = {}; // Node -> [Dependency Node]
this.incomingEdges = {}; // Node -> [Dependant Node]
this.circular = opts && !!opts.circular; // Allows circular deps
});
DepGraph.fromArray = (
items,
options = { itemId: 'id', parentItemId: 'parent_id' },
) => {
const depGraph = new DepGraph();
items.forEach((item) => {
depGraph.addNode(item[options.itemId], item);
});
items.forEach((item) => {
if (item[options.parentItemId]) {
depGraph.addDependency(item[options.parentItemId], item[options.itemId]);
}
});
return depGraph;
};
DepGraph.prototype = {
/**
* The number of nodes in the graph.
*/
size: function () {
return Object.keys(this.nodes).length;
},
/**
* Add a node to the dependency graph. If a node already exists, this method will do nothing.
*/
addNode: function (node, data) {
if (!this.hasNode(node)) {
// Checking the arguments length allows the user to add a node with undefined data
if (arguments.length === 2) {
this.nodes[node] = data;
} else {
throw new Error('Node does not exist: ' + node);
this.nodes[node] = node;
}
},
/**
* Add a dependency between two nodes. If either of the nodes does not exist,
* an Error will be thrown.
*/
addDependency: function (from, to) {
if (!this.hasNode(from)) {
throw new Error('Node does not exist: ' + from);
}
if (!this.hasNode(to)) {
throw new Error('Node does not exist: ' + to);
}
if (this.outgoingEdges[from].indexOf(to) === -1) {
this.outgoingEdges[from].push(to);
}
if (this.incomingEdges[to].indexOf(from) === -1) {
this.incomingEdges[to].push(from);
}
return true;
},
/**
* Remove a dependency between two nodes.
*/
removeDependency: function (from, to) {
var idx;
if (this.hasNode(from)) {
idx = this.outgoingEdges[from].indexOf(to);
if (idx >= 0) {
this.outgoingEdges[from].splice(idx, 1);
}
}
if (this.hasNode(to)) {
idx = this.incomingEdges[to].indexOf(from);
if (idx >= 0) {
this.incomingEdges[to].splice(idx, 1);
}
}
},
/**
* Return a clone of the dependency graph. If any custom data is attached
* to the nodes, it will only be shallow copied.
*/
clone: function () {
var source = this;
var result = new DepGraph();
var keys = Object.keys(source.nodes);
keys.forEach(function (n) {
result.nodes[n] = source.nodes[n];
result.outgoingEdges[n] = source.outgoingEdges[n].slice(0);
result.incomingEdges[n] = source.incomingEdges[n].slice(0);
this.outgoingEdges[node] = [];
this.incomingEdges[node] = [];
}
},
/**
* Remove a node from the dependency graph. If a node does not exist, this method will do nothing.
*/
removeNode: function (node) {
if (this.hasNode(node)) {
delete this.nodes[node];
delete this.outgoingEdges[node];
delete this.incomingEdges[node];
[this.incomingEdges, this.outgoingEdges].forEach(function (edgeList) {
Object.keys(edgeList).forEach(function (key) {
var idx = edgeList[key].indexOf(node);
if (idx >= 0) {
edgeList[key].splice(idx, 1);
}
}, this);
});
return result;
},
/**
* Get an array containing the nodes that the specified node depends on (transitively).
*
* Throws an Error if the graph has a cycle, or the specified node does not exist.
*
* If `leavesOnly` is true, only nodes that do not depend on any other nodes will be returned
* in the array.
*/
dependenciesOf: function (node, leavesOnly) {
if (this.hasNode(node)) {
var result = [];
var DFS = createDFS(
this.outgoingEdges,
leavesOnly,
result,
this.circular
);
DFS(node);
var idx = result.indexOf(node);
if (idx >= 0) {
result.splice(idx, 1);
}
return result;
} else {
throw new Error('Node does not exist: ' + node);
}
},
/**
* get an array containing the nodes that depend on the specified node (transitively).
*
* Throws an Error if the graph has a cycle, or the specified node does not exist.
*
* If `leavesOnly` is true, only nodes that do not have any dependants will be returned in the array.
*/
dependantsOf: function (node, leavesOnly) {
if (this.hasNode(node)) {
var result = [];
var DFS = createDFS(
this.incomingEdges,
leavesOnly,
result,
this.circular
);
DFS(node);
var idx = result.indexOf(node);
if (idx >= 0) {
result.splice(idx, 1);
}
return result;
} else {
throw new Error('Node does not exist: ' + node);
}
},
/**
* Construct the overall processing order for the dependency graph.
*
* Throws an Error if the graph has a cycle.
*
* If `leavesOnly` is true, only nodes that do not depend on any other nodes will be returned.
*/
overallOrder: function (leavesOnly) {
var self = this;
var result = [];
var keys = Object.keys(this.nodes);
if (keys.length === 0) {
return result; // Empty graph
} else {
if (!this.circular) {
// Look for cycles - we run the DFS starting at all the nodes in case there
// are several disconnected subgraphs inside this dependency graph.
var CycleDFS = createDFS(this.outgoingEdges, false, [], this.circular);
keys.forEach(function (n) {
CycleDFS(n);
});
}
}
},
/**
* Check if a node exists in the graph
*/
hasNode: function (node) {
return this.nodes.hasOwnProperty(node);
},
/**
* Get the data associated with a node name
*/
getNodeData: function (node) {
if (this.hasNode(node)) {
return this.nodes[node];
} else {
throw new Error('Node does not exist: ' + node);
}
},
var DFS = createDFS(
this.outgoingEdges,
leavesOnly,
result,
this.circular
);
// Find all potential starting points (nodes with nothing depending on them) an
// run a DFS starting at these points to get the order
/**
* Set the associated data for a given node name. If the node does not exist, this method will throw an error
*/
setNodeData: function (node, data) {
if (this.hasNode(node)) {
this.nodes[node] = data;
} else {
throw new Error('Node does not exist: ' + node);
}
},
/**
* Add a dependency between two nodes. If either of the nodes does not exist,
* an Error will be thrown.
*/
addDependency: function (from, to) {
if (!this.hasNode(from)) {
throw new Error('Node does not exist: ' + from);
}
if (!this.hasNode(to)) {
throw new Error('Node does not exist: ' + to);
}
if (this.outgoingEdges[from].indexOf(to) === -1) {
this.outgoingEdges[from].push(to);
}
if (this.incomingEdges[to].indexOf(from) === -1) {
this.incomingEdges[to].push(from);
}
return true;
},
/**
* Remove a dependency between two nodes.
*/
removeDependency: function (from, to) {
var idx;
if (this.hasNode(from)) {
idx = this.outgoingEdges[from].indexOf(to);
if (idx >= 0) {
this.outgoingEdges[from].splice(idx, 1);
}
}
if (this.hasNode(to)) {
idx = this.incomingEdges[to].indexOf(from);
if (idx >= 0) {
this.incomingEdges[to].splice(idx, 1);
}
}
},
/**
* Return a clone of the dependency graph. If any custom data is attached
* to the nodes, it will only be shallow copied.
*/
clone: function () {
var source = this;
var result = new DepGraph();
var keys = Object.keys(source.nodes);
keys.forEach(function (n) {
result.nodes[n] = source.nodes[n];
result.outgoingEdges[n] = source.outgoingEdges[n].slice(0);
result.incomingEdges[n] = source.incomingEdges[n].slice(0);
});
return result;
},
/**
* Get an array containing the nodes that the specified node depends on (transitively).
*
* Throws an Error if the graph has a cycle, or the specified node does not exist.
*
* If `leavesOnly` is true, only nodes that do not depend on any other nodes will be returned
* in the array.
*/
dependenciesOf: function (node, leavesOnly) {
if (this.hasNode(node)) {
var result = [];
var DFS = createDFS(
this.outgoingEdges,
leavesOnly,
result,
this.circular,
);
DFS(node);
var idx = result.indexOf(node);
if (idx >= 0) {
result.splice(idx, 1);
}
return result;
} else {
throw new Error('Node does not exist: ' + node);
}
},
/**
* get an array containing the nodes that depend on the specified node (transitively).
*
* Throws an Error if the graph has a cycle, or the specified node does not exist.
*
* If `leavesOnly` is true, only nodes that do not have any dependants will be returned in the array.
*/
dependantsOf: function (node, leavesOnly) {
if (this.hasNode(node)) {
var result = [];
var DFS = createDFS(
this.incomingEdges,
leavesOnly,
result,
this.circular,
);
DFS(node);
var idx = result.indexOf(node);
if (idx >= 0) {
result.splice(idx, 1);
}
return result;
} else {
throw new Error('Node does not exist: ' + node);
}
},
/**
* Construct the overall processing order for the dependency graph.
*
* Throws an Error if the graph has a cycle.
*
* If `leavesOnly` is true, only nodes that do not depend on any other nodes will be returned.
*/
overallOrder: function (leavesOnly) {
var self = this;
var result = [];
var keys = Object.keys(this.nodes);
if (keys.length === 0) {
return result; // Empty graph
} else {
if (!this.circular) {
// Look for cycles - we run the DFS starting at all the nodes in case there
// are several disconnected subgraphs inside this dependency graph.
var CycleDFS = createDFS(this.outgoingEdges, false, [], this.circular);
keys.forEach(function (n) {
CycleDFS(n);
});
}
var DFS = createDFS(
this.outgoingEdges,
leavesOnly,
result,
this.circular,
);
// Find all potential starting points (nodes with nothing depending on them) an
// run a DFS starting at these points to get the order
keys
.filter(function (node) {
return self.incomingEdges[node].length === 0;
})
.forEach(function (n) {
DFS(n);
});
// If we're allowing cycles - we need to run the DFS against any remaining
// nodes that did not end up in the initial result (as they are part of a
// subgraph that does not have a clear starting point)
if (this.circular) {
keys
.filter(function (node) {
return self.incomingEdges[node].length === 0;
return result.indexOf(node) === -1;
})
.forEach(function (n) {
DFS(n);
});
// If we're allowing cycles - we need to run the DFS against any remaining
// nodes that did not end up in the initial result (as they are part of a
// subgraph that does not have a clear starting point)
if (this.circular) {
keys
.filter(function (node) {
return result.indexOf(node) === -1;
})
.forEach(function (n) {
DFS(n);
});
}
return result;
}
},
mapNodes(mapper) {},
};
/**
* Cycle error, including the path of the cycle.
*/
var DepGraphCycleError = (exports.DepGraphCycleError = function (cyclePath) {
var message = 'Dependency Cycle Found: ' + cyclePath.join(' -> ');
var instance = new Error(message);
instance.cyclePath = cyclePath;
Object.setPrototypeOf(instance, Object.getPrototypeOf(this));
if (Error.captureStackTrace) {
Error.captureStackTrace(instance, DepGraphCycleError);
return result;
}
return instance;
});
DepGraphCycleError.prototype = Object.create(Error.prototype, {
constructor: {
value: Error,
enumerable: false,
writable: true,
configurable: true,
},
});
Object.setPrototypeOf(DepGraphCycleError, Error);
},
export default DepGraph;
mapNodes(mapper) {},
};
/**
* Cycle error, including the path of the cycle.
*/
var DepGraphCycleError = (exports.DepGraphCycleError = function (cyclePath) {
var message = 'Dependency Cycle Found: ' + cyclePath.join(' -> ');
var instance = new Error(message);
instance.cyclePath = cyclePath;
Object.setPrototypeOf(instance, Object.getPrototypeOf(this));
if (Error.captureStackTrace) {
Error.captureStackTrace(instance, DepGraphCycleError);
}
return instance;
});
DepGraphCycleError.prototype = Object.create(Error.prototype, {
constructor: {
value: Error,
enumerable: false,
writable: true,
configurable: true,
},
});
Object.setPrototypeOf(DepGraphCycleError, Error);
export default DepGraph;
packages/server/src/libs/logic-evaluation/Lexer.ts
+8 -5
View File
@@ -1,4 +1,3 @@
const OperationType = {
LOGIC: 'LOGIC',
STRING: 'STRING',
@@ -20,7 +19,7 @@ export class Lexer {
'?': OperationType.LOGIC,
':': OperationType.LOGIC,
'\'': OperationType.STRING,
"'": OperationType.STRING,
'"': OperationType.STRING,
'!': OperationType.COMPARISON,
@@ -79,11 +78,13 @@ export class Lexer {
// we must move the pos forward
// so here we should throw error, for example `1 & 2`
if (pos === this.currentIndex && tok !== undefined) {
const err = new Error(`unkonw token ${tok} from input string ${this.input}`);
const err = new Error(
`unkonw token ${tok} from input string ${this.input}`,
);
err.name = 'UnknowToken';
throw err;
}
} while (tok !== undefined)
} while (tok !== undefined);
return this.tokenList;
}
@@ -103,7 +104,9 @@ export class Lexer {
* @param index
*/
receiveToken(index = 1) {
const tok = this.input.slice(this.currentIndex, this.currentIndex + index).trim();
const tok = this.input
.slice(this.currentIndex, this.currentIndex + index)
.trim();
// skip empty string
if (tok) {
this.tokenList.push(tok);
packages/server/src/libs/logic-evaluation/Parser.ts
+20 -8
View File
@@ -67,7 +67,9 @@ export class Parser {
root.right = this.parseStatement();
} else {
if (typeof tok !== 'string') {
throw new Error('operation must be string, but get ' + JSON.stringify(tok));
throw new Error(
'operation must be string, but get ' + JSON.stringify(tok),
);
}
root = this.addNode(tok, this.parseStatement(), root);
}
@@ -95,10 +97,12 @@ export class Parser {
let pre = root;
if (this.compare(pre.operation, operation) < 0 && !pre.grouped) {
while (pre.right !== null &&
while (
pre.right !== null &&
typeof pre.right !== 'string' &&
this.compare(pre.right.operation, operation) < 0 && !pre.right.grouped) {
this.compare(pre.right.operation, operation) < 0 &&
!pre.right.grouped
) {
pre = pre.right;
}
@@ -113,7 +117,7 @@ export class Parser {
left: pre,
right,
operation,
}
};
}
/**
@@ -149,12 +153,20 @@ export class Parser {
}
if (token === '!') {
return { left: null, operation: token, right: this.parseStatement() }
return { left: null, operation: token, right: this.parseStatement() };
}
// 3 > -12 or -12 + 10
if (token === '-' && (OPERATION[this.prevToken()] > 0 || this.prevToken() === undefined)) {
return { left: '0', operation: token, right: this.parseStatement(), grouped: true };
if (
token === '-' &&
(OPERATION[this.prevToken()] > 0 || this.prevToken() === undefined)
) {
return {
left: '0',
operation: token,
right: this.parseStatement(),
grouped: true,
};
}
return token;
packages/server/src/libs/logic-evaluation/QueryParser.ts
+21 -9
View File
@@ -22,7 +22,9 @@ export class QueryParser {
parseNode(node) {
if (typeof node === 'string') {
const nodeQuery = this.getQuery(node);
return (query) => { nodeQuery(query); };
return (query) => {
nodeQuery(query);
};
}
if (OPERATION[node.operation] === undefined) {
throw new Error(`unknow expression ${node.operation}`);
@@ -34,16 +36,26 @@ export class QueryParser {
case '&&':
case 'AND':
default:
return (nodeQuery) => nodeQuery.where((query) => {
query.where((q) => { leftQuery(q); });
query.andWhere((q) => { rightQuery(q); });
});
return (nodeQuery) =>
nodeQuery.where((query) => {
query.where((q) => {
leftQuery(q);
});
query.andWhere((q) => {
rightQuery(q);
});
});
case '||':
case 'OR':
return (nodeQuery) => nodeQuery.where((query) => {
query.where((q) => { leftQuery(q); });
query.orWhere((q) => { rightQuery(q); });
});
return (nodeQuery) =>
nodeQuery.where((query) => {
query.where((q) => {
leftQuery(q);
});
query.orWhere((q) => {
rightQuery(q);
});
});
}
}
packages/server/src/libs/migration-seed/Seeder.ts
-2
View File
@@ -1,4 +1,3 @@
export class Seeder {
knex: any;
@@ -8,4 +7,3 @@ export class Seeder {
up(knex) {}
down(knex) {}
}
packages/server/src/libs/migration-seed/SeederConfig.ts
+1 -1
View File
@@ -37,7 +37,7 @@ export default function getMergedConfig(config, currentConfig) {
mergedConfig.migrationSource = new FsMigrations(
mergedConfig.directory,
mergedConfig.sortDirsSeparately,
mergedConfig.loadExtensions
mergedConfig.loadExtensions,
);
}
return mergedConfig;
packages/server/src/libs/migration-seed/TableUtils.ts
+1 -1
View File
@@ -35,7 +35,7 @@ export function getLockTableName(tableName: string): string {
*/
export function getLockTableNameWithSchema(
tableName: string,
schemaName = null
schemaName = null,
): string {
return schemaName
? `${schemaName} + ${getLockTableName(tableName)}`
packages/server/src/models/Model.ts
+4 -3
View File
@@ -54,9 +54,10 @@ export class PaginationQueryBuilder<
// foreign key references and shouldn't prevent deletion. Only dependent records should block deletion.
const dependentRelationNames = relationNames.filter((name) => {
const relation = relationMappings[name];
return relation && (
relation.relation === Model.HasManyRelation ||
relation.relation === Model.ManyToManyRelation
return (
relation &&
(relation.relation === Model.HasManyRelation ||
relation.relation === Model.ManyToManyRelation)
);
});
packages/server/src/models/withDateSessionMixin.ts
+5 -3
View File
@@ -3,7 +3,9 @@ import { Model } from 'objection';
type Constructor<T = {}> = new (...args: any[]) => T;
export const withDateSessionMixin = <T extends Constructor<Model>>(BaseModel: T) => {
export const withDateSessionMixin = <T extends Constructor<Model>>(
BaseModel: T,
) => {
return class DateSession extends BaseModel {
constructor(...args: any[]) {
super(...args);
@@ -36,5 +38,5 @@ export const withDateSessionMixin = <T extends Constructor<Model>>(BaseModel: T)
}
});
}
}
}
};
};
packages/server/src/modules/Accounts/Accounts.controller.ts
+1 -1
View File
@@ -48,7 +48,7 @@ import { AccountAction } from './Accounts.types';
@ApiCommonHeaders()
@UseGuards(AuthorizationGuard, PermissionGuard)
export class AccountsController {
constructor(private readonly accountsApplication: AccountsApplication) { }
constructor(private readonly accountsApplication: AccountsApplication) {}
@Post('validate-bulk-delete')
@HttpCode(200)
packages/server/src/modules/Accounts/AccountsApplication.service.ts
+1 -1
View File
@@ -42,7 +42,7 @@ export class AccountsApplication {
private readonly getAccountsService: GetAccountsService,
private readonly bulkDeleteAccountsService: BulkDeleteAccountsService,
private readonly validateBulkDeleteAccountsService: ValidateBulkDeleteAccountsService,
) { }
) {}
/**
* Creates a new account.
packages/server/src/modules/Accounts/AccountsImportable.service.ts
+1 -4
View File
@@ -23,10 +23,7 @@ export class AccountsImportable extends Importable {
createAccountDTO: CreateAccountDTO,
trx?: Knex.Transaction,
) {
return this.createAccountService.createAccount(
createAccountDTO,
trx,
);
return this.createAccountService.createAccount(createAccountDTO, trx);
}
/**
packages/server/src/modules/Accounts/BulkDeleteAccounts.service.ts
+1 -2
View File
@@ -6,7 +6,7 @@ import { DeleteAccount } from './DeleteAccount.service';
@Injectable()
export class BulkDeleteAccountsService {
constructor(private readonly deleteAccountService: DeleteAccount) { }
constructor(private readonly deleteAccountService: DeleteAccount) {}
/**
* Deletes multiple accounts.
@@ -38,4 +38,3 @@ export class BulkDeleteAccountsService {
}
}
}
packages/server/src/modules/Accounts/CommandAccountValidators.service.ts
+1 -1
View File
@@ -17,7 +17,7 @@ export class CommandAccountValidators {
@Inject(Account.name)
private readonly accountModel: TenantModelProxy<typeof Account>,
private readonly accountRepository: AccountRepository,
) { }
) {}
/**
* Throws error if the account was prefined.
packages/server/src/modules/Accounts/DeleteAccount.service.ts
+1 -1
View File
@@ -18,7 +18,7 @@ export class DeleteAccount {
private eventEmitter: EventEmitter2,
private uow: UnitOfWork,
private validator: CommandAccountValidators,
) { }
) {}
/**
* Authorize account delete.
packages/server/src/modules/Accounts/GetAccounts.service.ts
+1 -1
View File
@@ -19,7 +19,7 @@ export class GetAccountsService {
@Inject(Account.name)
private readonly accountModel: TenantModelProxy<typeof Account>,
) { }
) {}
/**
* Retrieve accounts datatable list.
packages/server/src/modules/Accounts/ValidateBulkDeleteAccounts.service.ts
-1
View File
@@ -60,4 +60,3 @@ export class ValidateBulkDeleteAccountsService {
}
}
}
packages/server/src/modules/Accounts/dtos/GetAccountsQuery.dto.ts
+13 -3
View File
@@ -1,9 +1,20 @@
import { IsArray, IsBoolean, IsEnum, IsInt, IsOptional, IsString, Min } from 'class-validator';
import {
IsArray,
IsBoolean,
IsEnum,
IsInt,
IsOptional,
IsString,
Min,
} from 'class-validator';
import { ApiPropertyOptional } from '@nestjs/swagger';
import { Transform } from 'class-transformer';
import { parseBoolean } from '@/utils/parse-boolean';
import { IAccountsStructureType } from '../Accounts.types';
import { IFilterRole, ISortOrder } from '@/modules/DynamicListing/DynamicFilter/DynamicFilter.types';
import {
IFilterRole,
ISortOrder,
} from '@/modules/DynamicListing/DynamicFilter/DynamicFilter.types';
import { ToNumber } from '@/common/decorators/Validators';
export class GetAccountsQueryDto {
@@ -114,4 +125,3 @@ export class GetAccountsQueryDto {
@Min(1)
pageSize?: number;
}
packages/server/src/modules/Accounts/models/Account.meta.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import { ACCOUNT_TYPES } from "../Accounts.constants";
import { ACCOUNT_TYPES } from '../Accounts.constants';
export const AccountMeta = {
defaultFilterField: 'name',
packages/server/src/modules/Accounts/susbcribers/MutateBaseCurrencyAccounts.subscriber.ts
+3 -5
View File
@@ -14,11 +14,9 @@ export class MutateBaseCurrencyAccountsSubscriber {
* of the organization is mutated.
*/
@OnEvent(events.organization.baseCurrencyUpdated)
async updateAccountsCurrencyOnBaseCurrencyMutated({
organizationDTO,
}) {
async updateAccountsCurrencyOnBaseCurrencyMutated({ organizationDTO }) {
await this.mutateBaseCurrencyAccounts.mutateAllAccountsCurrency(
organizationDTO.baseCurrency
organizationDTO.baseCurrency,
);
};
}
}
packages/server/src/modules/App/App.controller.spec.ts
+1 -2
View File
@@ -15,7 +15,6 @@ describe('AppController', () => {
});
describe('root', () => {
it('should return "Hello World!"', () => {
});
it('should return "Hello World!"', () => {});
});
});
packages/server/src/modules/App/AppThrottle.module.ts
+4 -4
View File
@@ -10,7 +10,9 @@ import { ThrottlerStorageRedisService } from '@nest-lab/throttler-storage-redis'
inject: [ConfigService],
useFactory: (configService: ConfigService) => {
// Use in-memory storage with very high limits for test environment
const isTest = process.env.NODE_ENV === 'test' || process.env.JEST_WORKER_ID !== undefined;
const isTest =
process.env.NODE_ENV === 'test' ||
process.env.JEST_WORKER_ID !== undefined;
if (isTest) {
return {
@@ -64,6 +66,4 @@ import { ThrottlerStorageRedisService } from '@nest-lab/throttler-storage-redis'
}),
],
})
export class AppThrottleModule { }
export class AppThrottleModule {}
packages/server/src/modules/Attachments/Attachment.module.ts
+33 -33
View File
@@ -1,32 +1,32 @@
import { Module } from "@nestjs/common";
import { Module } from '@nestjs/common';
import * as multerS3 from 'multer-s3';
import { S3_CLIENT, S3Module } from "../S3/S3.module";
import { DeleteAttachment } from "./DeleteAttachment";
import { GetAttachment } from "./GetAttachment";
import { GetAttachmentPresignedUrl } from "./GetAttachmentPresignedUrl";
import { LinkAttachment } from "./LinkAttachment";
import { UnlinkAttachment } from "./UnlinkAttachment";
import { ValidateAttachments } from "./ValidateAttachments";
import { AttachmentsOnBillPayments } from "./events/AttachmentsOnPaymentsMade";
import { AttachmentsOnBills } from "./events/AttachmentsOnBills";
import { AttachmentsOnCreditNote } from "./events/AttachmentsOnCreditNote";
import { AttachmentsOnExpenses } from "./events/AttachmentsOnExpenses";
import { AttachmentsOnPaymentsReceived } from "./events/AttachmentsOnPaymentsReceived";
import { AttachmentsOnManualJournals } from "./events/AttachmentsOnManualJournals";
import { AttachmentsOnVendorCredits } from "./events/AttachmentsOnVendorCredits";
import { AttachmentsOnSaleInvoiceCreated } from "./events/AttachmentsOnSaleInvoice";
import { AttachmentsOnSaleReceipt } from "./events/AttachmentsOnSaleReceipts";
import { AttachmentsOnSaleEstimates } from "./events/AttachmentsOnSaleEstimates";
import { AttachmentsController } from "./Attachments.controller";
import { RegisterTenancyModel } from "../Tenancy/TenancyModels/Tenancy.module";
import { DocumentModel } from "./models/Document.model";
import { DocumentLinkModel } from "./models/DocumentLink.model";
import { AttachmentsApplication } from "./AttachmentsApplication";
import { UploadDocument } from "./UploadDocument";
import { AttachmentUploadPipeline } from "./S3UploadPipeline";
import { MULTER_MODULE_OPTIONS } from "@/common/constants/files.constants";
import { ConfigService } from "@nestjs/config";
import { S3Client } from "@aws-sdk/client-s3";
import { S3_CLIENT, S3Module } from '../S3/S3.module';
import { DeleteAttachment } from './DeleteAttachment';
import { GetAttachment } from './GetAttachment';
import { GetAttachmentPresignedUrl } from './GetAttachmentPresignedUrl';
import { LinkAttachment } from './LinkAttachment';
import { UnlinkAttachment } from './UnlinkAttachment';
import { ValidateAttachments } from './ValidateAttachments';
import { AttachmentsOnBillPayments } from './events/AttachmentsOnPaymentsMade';
import { AttachmentsOnBills } from './events/AttachmentsOnBills';
import { AttachmentsOnCreditNote } from './events/AttachmentsOnCreditNote';
import { AttachmentsOnExpenses } from './events/AttachmentsOnExpenses';
import { AttachmentsOnPaymentsReceived } from './events/AttachmentsOnPaymentsReceived';
import { AttachmentsOnManualJournals } from './events/AttachmentsOnManualJournals';
import { AttachmentsOnVendorCredits } from './events/AttachmentsOnVendorCredits';
import { AttachmentsOnSaleInvoiceCreated } from './events/AttachmentsOnSaleInvoice';
import { AttachmentsOnSaleReceipt } from './events/AttachmentsOnSaleReceipts';
import { AttachmentsOnSaleEstimates } from './events/AttachmentsOnSaleEstimates';
import { AttachmentsController } from './Attachments.controller';
import { RegisterTenancyModel } from '../Tenancy/TenancyModels/Tenancy.module';
import { DocumentModel } from './models/Document.model';
import { DocumentLinkModel } from './models/DocumentLink.model';
import { AttachmentsApplication } from './AttachmentsApplication';
import { UploadDocument } from './UploadDocument';
import { AttachmentUploadPipeline } from './S3UploadPipeline';
import { MULTER_MODULE_OPTIONS } from '@/common/constants/files.constants';
import { ConfigService } from '@nestjs/config';
import { S3Client } from '@aws-sdk/client-s3';
const models = [
RegisterTenancyModel(DocumentModel),
@@ -71,15 +71,15 @@ const models = [
key: function (req, file, cb) {
cb(null, Date.now().toString());
},
acl: function(req, file, cb) {
acl: function (req, file, cb) {
// Conditionally set file to public or private based on isPublic flag
const aclValue = true ? 'public-read' : 'private';
// Set ACL based on the isPublic flag
cb(null, aclValue);
}
},
}),
})
}
]
}),
},
],
})
export class AttachmentsModule {}
packages/server/src/modules/Attachments/Attachment.transformer.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import { Transformer } from "../Transformer/Transformer";
import { Transformer } from '../Transformer/Transformer';
export class AttachmentTransformer extends Transformer {
/**
packages/server/src/modules/Attachments/AttachmentTransformer.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import { Transformer } from "../Transformer/Transformer";
import { Transformer } from '../Transformer/Transformer';
export class AttachmentTransformer extends Transformer{
export class AttachmentTransformer extends Transformer {
/**
* Exclude attributes.
* @returns {string[]}
packages/server/src/modules/Attachments/GetAttachmentPresignedUrl.ts
+3 -1
View File
@@ -36,7 +36,9 @@ export class GetAttachmentPresignedUrl {
Key: key,
ResponseContentDisposition,
});
const signedUrl = await getSignedUrl(this.s3Client, command, { expiresIn: 300 });
const signedUrl = await getSignedUrl(this.s3Client, command, {
expiresIn: 300,
});
return signedUrl;
}
packages/server/src/modules/Attachments/S3UploadPipeline.ts
+2 -8
View File
@@ -4,9 +4,7 @@ import { Injectable } from '@nestjs/common';
@Injectable()
export class AttachmentUploadPipeline {
constructor(
private readonly configService: ConfigService
) {}
constructor(private readonly configService: ConfigService) {}
/**
* Middleware to ensure that S3 configuration is properly set before proceeding.
@@ -18,11 +16,7 @@ export class AttachmentUploadPipeline {
public validateS3Configured(req: Request, res: Response, next: NextFunction) {
const config = this.configService.get('s3');
if (
!config.region ||
!config.accessKeyId ||
!config.secretAccessKey
) {
if (!config.region || !config.accessKeyId || !config.secretAccessKey) {
const missingKeys = [];
if (!config.region) missingKeys.push('region');
if (!config.accessKeyId) missingKeys.push('accessKeyId');
packages/server/src/modules/Attachments/UnlinkAttachment.ts
+5 -2
View File
@@ -47,10 +47,13 @@ export class UnlinkAttachment {
const foundLinkModel = await LinkModel().query(trx).findById(modelId);
validateLinkModelEntryExists(foundLinkModel);
const document = await this.documentModel().query(trx).findOne('key', filekey);
const document = await this.documentModel()
.query(trx)
.findOne('key', filekey);
// Delete the document link.
await this.documentLinkModel().query(trx)
await this.documentLinkModel()
.query(trx)
.where('modelRef', modelRef)
.where('modelId', modelId)
.where('documentId', document.id)
packages/server/src/modules/Attachments/constants.ts
+1 -1
View File
@@ -1,5 +1,5 @@
export enum ERRORS {
DOCUMENT_LINK_REF_INVALID = 'DOCUMENT_LINK_REF_INVALID',
DOCUMENT_LINK_ID_INVALID = 'DOCUMENT_LINK_ID_INVALID',
DOCUMENT_LINK_ALREADY_LINKED = 'DOCUMENT_LINK_ALREADY_LINKED'
DOCUMENT_LINK_ALREADY_LINKED = 'DOCUMENT_LINK_ALREADY_LINKED',
}
packages/server/src/modules/Attachments/decorators/InjectAttachable.decorator.ts
-1
View File
@@ -20,4 +20,3 @@ export function InjectAttachable() {
export function getAttachableModelsMap() {
return attachableModelsMap;
}
packages/server/src/modules/Attachments/dtos/Attachment.dto.ts
+2 -6
View File
@@ -1,6 +1,5 @@
import { ApiProperty } from "@nestjs/swagger";
import { IsNotEmpty, IsString } from "class-validator";
import { ApiProperty } from '@nestjs/swagger';
import { IsNotEmpty, IsString } from 'class-validator';
export class AttachmentLinkDto {
@IsString()
@@ -8,12 +7,10 @@ export class AttachmentLinkDto {
key: string;
}
export class UnlinkAttachmentDto {
@IsNotEmpty()
modelRef: string;
@IsNotEmpty()
modelId: number;
}
@@ -22,7 +19,6 @@ export class LinkAttachmentDto {
@IsNotEmpty()
modelRef: string;
@IsNotEmpty()
modelId: number;
}
packages/server/src/modules/Attachments/events/AttachmentsOnExpenses.ts
+1 -6
View File
@@ -52,12 +52,7 @@ export class AttachmentsOnExpenses {
const keys = expenseDTO.attachments?.map((attachment) => attachment.key);
await this.linkAttachmentService.bulkLink(
keys,
'Expense',
expense.id,
trx,
);
await this.linkAttachmentService.bulkLink(keys, 'Expense', expense.id, trx);
}
/**
packages/server/src/modules/Auth/Auth.controller.ts
+15 -5
View File
@@ -44,7 +44,7 @@ export class AuthController {
@Inject(TenantModel.name)
private readonly tenantModel: typeof TenantModel,
) { }
) {}
@Post('/signin')
@UseGuards(LocalAuthGuard)
@@ -52,7 +52,8 @@ export class AuthController {
@ApiBody({ type: AuthSigninDto })
@ApiResponse({
status: 200,
description: 'Sign-in successful. Returns access token and tenant/organization IDs.',
description:
'Sign-in successful. Returns access token and tenant/organization IDs.',
schema: { $ref: getSchemaPath(AuthSigninResponseDto) },
})
async signin(
@@ -73,7 +74,10 @@ export class AuthController {
@Post('/signup')
@ApiOperation({ summary: 'Sign up a new user' })
@ApiBody({ type: AuthSignupDto })
@ApiResponse({ status: 201, description: 'Sign-up initiated. Check email for confirmation.' })
@ApiResponse({
status: 201,
description: 'Sign-up initiated. Check email for confirmation.',
})
signup(@Request() req: Request, @Body() signupDto: AuthSignupDto) {
return this.authApp.signUp(signupDto);
}
@@ -89,14 +93,20 @@ export class AuthController {
@Post('/send_reset_password')
@ApiOperation({ summary: 'Send reset password email' })
@ApiBody({ type: AuthSendResetPasswordDto })
@ApiResponse({ status: 200, description: 'Reset password email sent if the account exists.' })
@ApiResponse({
status: 200,
description: 'Reset password email sent if the account exists.',
})
sendResetPassword(@Body() body: AuthSendResetPasswordDto) {
return this.authApp.sendResetPassword(body.email);
}
@Post('/reset_password/:token')
@ApiOperation({ summary: 'Reset password using token' })
@ApiParam({ name: 'token', description: 'Reset password token from email link' })
@ApiParam({
name: 'token',
description: 'Reset password token from email link',
})
@ApiBody({ type: AuthResetPasswordDto })
@ApiResponse({ status: 200, description: 'Password reset successfully.' })
resetPassword(
packages/server/src/modules/Auth/AuthApiKeys.controllers.ts
+1 -1
View File
@@ -45,7 +45,7 @@ export class AuthApiKeysController {
constructor(
private readonly getApiKeysService: GetApiKeysService,
private readonly generateApiKeyService: GenerateApiKey,
) { }
) {}
@Post('generate')
@ApiOperation({ summary: 'Generate a new API key' })
packages/server/src/modules/Auth/AuthMailMessages.esrvice.ts
+3 -7
View File
@@ -41,9 +41,9 @@ export class AuthenticationMailMesssages {
}
sendResetPasswordMail(user: ModelObject<SystemUser>, token: string) {
const mail = this.resetPasswordMessage(user, token);
const mail = this.resetPasswordMessage(user, token);
return this.mailTransporter.send(mail);
return this.mailTransporter.send(mail);
}
/**
@@ -72,11 +72,7 @@ export class AuthenticationMailMesssages {
}
sendSignupVerificationMail(email: string, fullName: string, token: string) {
const mail = this.signupVerificationMail(
email,
fullName,
token,
);
const mail = this.signupVerificationMail(email, fullName, token);
return this.mailTransporter.send(mail);
}
}
packages/server/src/modules/Auth/Authed.controller.ts
+1 -1
View File
@@ -20,7 +20,7 @@ export class AuthedController {
constructor(
private readonly getAuthedAccountService: GetAuthenticatedAccount,
private readonly authApp: AuthenticationApplication,
) { }
) {}
@Post('/signup/verify/resend')
@ApiOperation({ summary: 'Resend the signup confirmation message' })
packages/server/src/modules/Auth/commands/AuthSendResetPassword.service.ts
+2 -4
View File
@@ -24,16 +24,14 @@ export class AuthSendResetPasswordService {
@Inject(SystemUser.name)
private readonly systemUserModel: typeof SystemUser,
) { }
) {}
/**
* Sends the given email reset password email.
* @param {string} email - Email address.
*/
async sendResetPassword(email: string): Promise<void> {
const user = await this.systemUserModel
.query()
.findOne({ email });
const user = await this.systemUserModel.query().findOne({ email });
if (!user) return;
packages/server/src/modules/Auth/commands/AuthSignin.service.ts
+1 -1
View File
@@ -14,7 +14,7 @@ export class AuthSigninService {
private readonly systemUserModel: typeof SystemUser,
private readonly jwtService: JwtService,
private readonly clsService: ClsService,
) { }
) {}
/**
* Validates the given email and password.
packages/server/src/modules/Auth/commands/AuthSignup.service.ts
+1 -1
View File
@@ -33,7 +33,7 @@ export class AuthSignupService {
@Inject(SystemUser.name)
private readonly systemUserModel: typeof SystemUser,
) { }
) {}
/**
* Registers a new tenant with user from user input.
packages/server/src/modules/Auth/commands/GenerateApiKey.service.ts
+1 -1
View File
@@ -10,7 +10,7 @@ export class GenerateApiKey {
private readonly tenancyContext: TenancyContext,
@Inject(ApiKeyModel.name)
private readonly apiKeyModel: typeof ApiKeyModel,
) { }
) {}
/**
* Generates a new secure API key for the current tenant and system user.
packages/server/src/modules/Auth/exceptions/InvalidEmailPassword.exception.ts
-2
View File
@@ -11,5 +11,3 @@ export class InvalidEmailPasswordException extends UnauthorizedException {
});
}
}
packages/server/src/modules/Auth/queries/GetApiKeys.transformer.ts
-1
View File
@@ -1,7 +1,6 @@
import { Transformer } from '@/modules/Transformer/Transformer';
export class GetApiKeysTransformer extends Transformer {
public includeAttributes = (): string[] => {
return ['token'];
};
packages/server/src/modules/Auth/queries/GetAuthMeta.service.ts
+1 -6
View File
@@ -4,12 +4,7 @@ import { IAuthGetMetaPOJO } from '../Auth.interfaces';
@Injectable()
export class GetAuthMetaService {
constructor(
private readonly configService: ConfigService,
) {
}
constructor(private readonly configService: ConfigService) {}
/**
* Retrieves the authentication meta for SPA.
* @returns {Promise<IAuthGetMetaPOJO>}
packages/server/src/modules/BankRules/BankRulesApplication.ts
+1 -3
View File
@@ -22,9 +22,7 @@ export class BankRulesApplication {
* @param {ICreateBankRuleDTO} createRuleDTO - Bank rule data.
* @returns {Promise<void>}
*/
public createBankRule(
createRuleDTO: CreateBankRuleDto,
): Promise<BankRule> {
public createBankRule(createRuleDTO: CreateBankRuleDto): Promise<BankRule> {
return this.createBankRuleService.createBankRule(createRuleDTO);
}
packages/server/src/modules/BankRules/queries/GetBankRuleTransformer.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import { Transformer } from "@/modules/Transformer/Transformer";
import { Transformer } from '@/modules/Transformer/Transformer';
export class GetBankRuleTransformer extends Transformer {
/**
packages/server/src/modules/BankingAccounts/BankAccounts.controller.ts
+1 -1
View File
@@ -7,7 +7,7 @@ import { BankAccountResponseDto } from './dtos/BankAccountResponse.dto';
@Controller('banking/accounts')
@ApiTags('Bank Accounts')
export class BankAccountsController {
constructor(private bankAccountsApplication: BankAccountsApplication) { }
constructor(private bankAccountsApplication: BankAccountsApplication) {}
@Get()
@ApiOperation({ summary: 'Retrieve the bank accounts.' })
packages/server/src/modules/BankingAccounts/BankAccountsApplication.service.ts
+1 -1
View File
@@ -17,7 +17,7 @@ export class BankAccountsApplication {
private readonly refreshBankAccountService: RefreshBankAccountService,
private readonly resumeBankAccountFeedsService: ResumeBankAccountFeedsService,
private readonly pauseBankAccountFeedsService: PauseBankAccountFeeds,
) { }
) {}
/**
* Retrieves the bank accounts.
packages/server/src/modules/BankingAccounts/dtos/BankAccountsQuery.dto.ts
+13 -2
View File
@@ -1,8 +1,19 @@
import { ApiPropertyOptional } from '@nestjs/swagger';
import { Transform } from 'class-transformer';
import { IsArray, IsBoolean, IsEnum, IsInt, IsOptional, IsString, Min } from 'class-validator';
import {
IsArray,
IsBoolean,
IsEnum,
IsInt,
IsOptional,
IsString,
Min,
} from 'class-validator';
import { ToNumber } from '@/common/decorators/Validators';
import { IFilterRole, ISortOrder } from '@/modules/DynamicListing/DynamicFilter/DynamicFilter.types';
import {
IFilterRole,
ISortOrder,
} from '@/modules/DynamicListing/DynamicFilter/DynamicFilter.types';
import { parseBoolean } from '@/utils/parse-boolean';
export class BankAccountsQueryDto {
packages/server/src/modules/BankingAccounts/queries/GetBankAccounts.ts
+5 -4
View File
@@ -17,7 +17,7 @@ export class GetBankAccountsService {
@Inject(Account.name)
private readonly accountModel: TenantModelProxy<typeof Account>,
) { }
) {}
/**
* Retrieve the cash flow accounts.
@@ -32,9 +32,10 @@ export class GetBankAccountsService {
...filterDTO,
};
// Parsees accounts list filter DTO.
const filter = this.dynamicListService.parseStringifiedFilter<BankAccountsQueryDto>(
_filterDto,
);
const filter =
this.dynamicListService.parseStringifiedFilter<BankAccountsQueryDto>(
_filterDto,
);
// Dynamic list service.
const dynamicList = await this.dynamicListService.dynamicList(
packages/server/src/modules/BankingAccounts/types/BankAccounts.types.ts
+1 -2
View File
@@ -17,8 +17,7 @@ export const ERRORS = {
BANK_ACCOUNT_FEEDS_ALREADY_RESUMED: 'BANK_ACCOUNT_FEEDS_ALREADY_RESUMED',
};
export interface ICashflowAccountsFilter extends IDynamicListFilter{
export interface ICashflowAccountsFilter extends IDynamicListFilter {
page: number;
pageSize: number;
inactiveMode: boolean;
packages/server/src/modules/BankingCategorize/BankingCategorize.controller.ts
+2 -6
View File
@@ -53,12 +53,8 @@ export class BankingCategorizeController {
@Query('uncategorizedTransactionIds')
uncategorizedTransactionIds: number[] | number,
) {
const ids = castArray(uncategorizedTransactionIds).map((id) =>
Number(id),
);
return this.bankingCategorizeApplication.uncategorizeTransactionsBulk(
ids,
);
const ids = castArray(uncategorizedTransactionIds).map((id) => Number(id));
return this.bankingCategorizeApplication.uncategorizeTransactionsBulk(ids);
}
@Delete('/:id')
packages/server/src/modules/BankingCategorize/commands/UncategorizeBankTransactionsBulk.service.ts
+3 -3
View File
@@ -6,7 +6,7 @@ import { UncategorizeBankTransactionService } from './UncategorizeBankTransactio
@Injectable()
export class UncategorizeBankTransactionsBulk {
constructor(
private readonly uncategorizeTransactionService: UncategorizeBankTransactionService
private readonly uncategorizeTransactionService: UncategorizeBankTransactionService,
) {}
/**
@@ -14,7 +14,7 @@ export class UncategorizeBankTransactionsBulk {
* @param {number | Array<number>} uncategorizedTransactionId
*/
public async uncategorizeBulk(
uncategorizedTransactionId: number | Array<number>
uncategorizedTransactionId: number | Array<number>,
) {
const uncategorizedTransactionIds = castArray(uncategorizedTransactionId);
@@ -22,7 +22,7 @@ export class UncategorizeBankTransactionsBulk {
.for(uncategorizedTransactionIds)
.process(async (_uncategorizedTransactionId: number, index, pool) => {
await this.uncategorizeTransactionService.uncategorize(
_uncategorizedTransactionId
_uncategorizedTransactionId,
);
});
}
packages/server/src/modules/BankingCategorize/commands/UncategorizedTransaction.transformer.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import { Transformer } from "../../Transformer/Transformer";
import { Transformer } from '../../Transformer/Transformer';
export class UncategorizedTransactionTransformer extends Transformer {
/**
packages/server/src/modules/BankingCategorize/types/BankingCategorize.types.ts
+3 -4
View File
@@ -1,6 +1,6 @@
import { BankTransaction } from "@/modules/BankingTransactions/models/BankTransaction";
import { UncategorizedBankTransaction } from "@/modules/BankingTransactions/models/UncategorizedBankTransaction";
import { Knex } from "knex";
import { BankTransaction } from '@/modules/BankingTransactions/models/BankTransaction';
import { UncategorizedBankTransaction } from '@/modules/BankingTransactions/models/UncategorizedBankTransaction';
import { Knex } from 'knex';
export interface ICashflowTransactionCategorizedPayload {
uncategorizedTransactions: Array<UncategorizedBankTransaction>;
@@ -36,7 +36,6 @@ export interface ICategorizeCashflowTransactioDTO {
branchId: number;
}
export interface IUncategorizedTransactionCreatingEventPayload {
tenantId: number;
createUncategorizedTransactionDTO: CreateUncategorizedTransactionDTO;
packages/server/src/modules/BankingMatching/BankingMatching.controller.ts
+9 -1
View File
@@ -6,7 +6,15 @@ import {
ApiTags,
getSchemaPath,
} from '@nestjs/swagger';
import { Body, Controller, Get, Param, Patch, Post, Query } from '@nestjs/common';
import {
Body,
Controller,
Get,
Param,
Patch,
Post,
Query,
} from '@nestjs/common';
import { BankingMatchingApplication } from './BankingMatchingApplication';
import { MatchBankTransactionDto } from './dtos/MatchBankTransaction.dto';
import { GetMatchedTransactionsQueryDto } from './dtos/GetMatchedTransactionsQuery.dto';
packages/server/src/modules/BankingMatching/_utils.ts
+13 -16
View File
@@ -7,35 +7,32 @@ import { ServiceError } from '../Items/ServiceError';
export const sortClosestMatchTransactions = (
amount: number,
date: Date,
matches: MatchedTransactionPOJO[]
matches: MatchedTransactionPOJO[],
) => {
return R.sortWith([
// Sort by amount difference (closest to uncategorized transaction amount first)
R.ascend((match: MatchedTransactionPOJO) =>
Math.abs(match.amount - amount)
Math.abs(match.amount - amount),
),
// Sort by date difference (closest to uncategorized transaction date first)
R.ascend((match: MatchedTransactionPOJO) =>
Math.abs(moment(match.date).diff(moment(date), 'days'))
Math.abs(moment(match.date).diff(moment(date), 'days')),
),
])(matches);
};
export const sumMatchTranasctions = (transactions: Array<any>) => {
const total = transactions.reduce(
(sum, item) => {
const amount = parseFloat(item.amount) || 0;
const multiplier = item.transactionNormal === 'debit' ? 1 : -1;
return sum + multiplier * amount;
},
0
);
const total = transactions.reduce((sum, item) => {
const amount = parseFloat(item.amount) || 0;
const multiplier = item.transactionNormal === 'debit' ? 1 : -1;
return sum + multiplier * amount;
}, 0);
// Round to 2 decimal places to avoid floating-point precision issues
return round(total, 2);
};
export const sumUncategorizedTransactions = (
uncategorizedTransactions: Array<any>
uncategorizedTransactions: Array<any>,
) => {
const total = sumBy(uncategorizedTransactions, 'amount');
// Round to 2 decimal places to avoid floating-point precision issues
@@ -43,10 +40,10 @@ export const sumUncategorizedTransactions = (
};
export const validateUncategorizedTransactionsNotMatched = (
uncategorizedTransactions: any
uncategorizedTransactions: any,
) => {
const matchedTransactions = uncategorizedTransactions.filter(
(trans) => !isEmpty(trans.matchedBankTransactions)
(trans) => !isEmpty(trans.matchedBankTransactions),
);
//
if (matchedTransactions.length > 0) {
@@ -57,10 +54,10 @@ export const validateUncategorizedTransactionsNotMatched = (
};
export const validateUncategorizedTransactionsExcluded = (
uncategorizedTransactions: any
uncategorizedTransactions: any,
) => {
const excludedTransactions = uncategorizedTransactions.filter(
(trans) => trans.excluded
(trans) => trans.excluded,
);
if (excludedTransactions.length > 0) {
throw new ServiceError(ERRORS.CANNOT_MATCH_EXCLUDED_TRANSACTION, '', {
packages/server/src/modules/BankingMatching/commands/MatchTransactions.ts
+7 -3
View File
@@ -34,7 +34,7 @@ export class MatchBankTransactions {
private readonly uncategorizedBankTransactionModel: TenantModelProxy<
typeof UncategorizedBankTransaction
>,
) { }
) {}
/**
* Validates the match bank transactions DTO.
@@ -102,7 +102,9 @@ export class MatchBankTransactions {
// uncategorized transaction amount.
// Use tolerance-based comparison to handle floating-point precision issues
const tolerance = 0.01; // Allow 0.01 difference for floating-point precision
const difference = Math.abs(totalUncategorizedTransactions - totalMatchedTranasctions);
const difference = Math.abs(
totalUncategorizedTransactions - totalMatchedTranasctions,
);
if (difference > tolerance) {
throw new ServiceError(ERRORS.TOTAL_MATCHING_TRANSACTIONS_INVALID);
}
@@ -115,7 +117,9 @@ export class MatchBankTransactions {
*/
public async matchTransaction(
uncategorizedTransactionId: number | Array<number>,
matchedTransactionsDto: MatchTransactionEntryDto | Array<MatchTransactionEntryDto>,
matchedTransactionsDto:
| MatchTransactionEntryDto
| Array<MatchTransactionEntryDto>,
): Promise<void> {
const uncategorizedTransactionIds = castArray(uncategorizedTransactionId);
const matchedTransactions = castArray(matchedTransactionsDto);
packages/server/src/modules/BankingMatching/commands/MatchTransactionsTypesRegistry.ts
+1 -1
View File
@@ -28,7 +28,7 @@ export class MatchTransactionsTypesRegistry {
*/
public register(
resource: string,
importable: GetMatchedTransactionsByType
importable: GetMatchedTransactionsByType,
): void {
const _resource = this.sanitizeResourceName(resource);
this.importables[_resource] = importable;
packages/server/src/modules/BankingMatching/dtos/GetMatchedTransactionsQuery.dto.ts
+4 -1
View File
@@ -3,7 +3,10 @@ import { IsOptional, IsString, IsNumber, Min, Max } from 'class-validator';
import { Type } from 'class-transformer';
export class GetMatchedTransactionsQueryDto {
@ApiPropertyOptional({ description: 'Filter from date', example: '2024-01-01' })
@ApiPropertyOptional({
description: 'Filter from date',
example: '2024-01-01',
})
@IsOptional()
@IsString()
fromDate?: string;
packages/server/src/modules/BankingMatching/models/MatchedBankTransaction.ts
-1
View File
@@ -5,7 +5,6 @@ export class MatchedBankTransaction extends BaseModel {
public referenceType!: string;
public uncategorizedTransactionId!: number;
/**
* Table name.
*/
packages/server/src/modules/BankingMatching/queries/GetMatchedTransactionBillsTransformer.ts
+1 -1
View File
@@ -1,4 +1,4 @@
import { Transformer } from "@/modules/Transformer/Transformer";
import { Transformer } from '@/modules/Transformer/Transformer';
export class GetMatchedTransactionBillsTransformer extends Transformer {
/**

Some files were not shown because too many files have changed in this diff Show More