fix: account name unique validation.

This commit is contained in:
Ahmed Bouhuolia
2020-09-07 17:43:07 +02:00
parent ffb0499280
commit 98bba3d3a0
2 changed files with 34 additions and 4 deletions

View File

@@ -204,9 +204,7 @@ export default class AccountsController extends BaseController{
try {
const account = await this.accountsService.editAccount(tenantId, accountId, accountDTO);
return res.status(200).send({ id: account.id });
} catch (error) {
console.log(error);
if (error instanceof ServiceError) {
this.transformServiceErrorToResponse(res, error);
}
@@ -251,7 +249,6 @@ export default class AccountsController extends BaseController{
return res.status(200).send({ id: accountId });
} catch (error) {
console.log(error);
if (error instanceof ServiceError) {
this.transformServiceErrorToResponse(res, error);
@@ -366,6 +363,12 @@ export default class AccountsController extends BaseController{
errors: [{ type: 'ACCOUNT.NOT.FOUND', code: 100 }] }
);
}
if (error.errorType === 'account_name_not_unqiue') {
return res.boom.badRequest(
'The given account not unique.',
{ errors: [{ type: 'ACCOUNT.NAME.NOT.UNIQUE', code: 150 }], }
);
}
if (error.errorType === 'account_type_not_found') {
return res.boom.badRequest(
'The given account type not found.', {

View File

@@ -3,6 +3,7 @@ import TenancyService from '@/services/Tenancy/TenancyService';
import { ServiceError } from '@/exceptions';
import { IAccountDTO, IAccount } from '@/interfaces';
import { difference } from 'lodash';
import { Account } from 'src/models';
@Service()
export default class AccountsService {
@@ -127,14 +128,37 @@ export default class AccountsService {
}
}
/**
* Validates the account name uniquiness.
* @param {number} tenantId
* @param {string} accountName
* @param {number} notAccountId - Ignore the account id.
*/
private async validateAccountNameUniquiness(tenantId: number, accountName: string, notAccountId?: number) {
const { Account } = this.tenancy.models(tenantId);
this.logger.info('[accounts] validating account name uniquiness.', { tenantId, accountName, notAccountId });
const foundAccount = await Account.query().findOne('name', accountName).onBuild((query) => {
if (notAccountId) {
query.whereNot('id', notAccountId);
}
});
if (foundAccount) {
throw new ServiceError('account_name_not_unqiue');
}
}
/**
* Creates a new account on the storage.
* @param {number} tenantId
* @param {IAccount} accountDTO
* @returns {IAccount}
* @returns {IAccount}
*/
public async newAccount(tenantId: number, accountDTO: IAccountDTO) {
const { Account } = this.tenancy.models(tenantId);
// Validate account name uniquiness.
await this.validateAccountNameUniquiness(tenantId, accountDTO.name);
// Validate the account code uniquiness.
if (accountDTO.code) {
@@ -165,6 +189,9 @@ export default class AccountsService {
const { Account } = this.tenancy.models(tenantId);
const oldAccount = await this.getAccountOrThrowError(tenantId, accountId);
// Validate account name uniquiness.
await this.validateAccountNameUniquiness(tenantId, accountDTO.name, accountId);
await this.isAccountTypeChangedOrThrowError(oldAccount, accountDTO);
// Validate the account code not exists on the storage.