QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 12:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: delete and bulk delete accounts.

Browse Source 
fix: activate and inactivate accounts.
This commit is contained in:
Ahmed Bouhuolia
2020-12-03 12:20:44 +02:00
parent 353cc2aece
commit 0359003d3a
7 changed files with 85 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/src/api/controllers/Accounts.ts
View File

@@ -155,7 +155,7 @@ export default class AccountsController extends BaseController{
get bulkSelectIdsQuerySchema() {
return [
query('ids').isArray({ min: 2 }),
query('ids').isArray({ min: 1 }),
query('ids.*').isNumeric().toInt(),
];
}
@@ -240,7 +240,11 @@ export default class AccountsController extends BaseController{
try {
await this.accountsService.deleteAccount(tenantId, accountId);
return res.status(200).send({ id: accountId });
return res.status(200).send({
id: accountId,
message: 'The deleted account has been deleted successfully.',
});
} catch (error) {
next(error);
}
@@ -298,7 +302,12 @@ export default class AccountsController extends BaseController{
const isActive = (type === 'activate' ? true : false);
await this.accountsService.activateAccounts(tenantId, accountsIds, isActive);
return res.status(200).send({ ids: accountsIds });
const activatedText = isActive ? 'activated' : 'inactivated';
return res.status(200).send({
ids: accountsIds,
message: `The given accounts have been ${activatedText} successfully`,
});
} catch (error) {
next(error);
}
@@ -316,8 +325,11 @@ export default class AccountsController extends BaseController{
try {
await this.accountsService.deleteAccounts(tenantId, accountsIds);
return res.status(200).send({ ids: accountsIds });
return res.status(200).send({
ids: accountsIds,
message: 'The given accounts have been deleted successfully.',
});
} catch (error) {
next(error);
}
@@ -426,12 +438,6 @@ export default class AccountsController extends BaseController{
{ errors: [{ type: 'NOT_UNIQUE_CODE', code: 600 }] }
);
}
if (error.errorType === 'account_has_children') {
return res.boom.badRequest(
'You could not delete account has children.',
{ errors: [{ type: 'ACCOUNT.HAS.CHILD.ACCOUNTS', code: 700 }] }
);
}
if (error.errorType === 'account_has_associated_transactions') {
return res.boom.badRequest(
'You could not delete account has associated transactions.',