verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

Bug #310 Error en client.credit

This commit is contained in:
gerard 2018-05-17 13:18:16 +02:00
parent 0fdb4a4785
commit 5203755fd1
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
services/loopback/common/models/client.js
View File

@ -129,6 +129,11 @@ module.exports = Self => {
async function validateCreditChange(ctx, finalState) { async function validateCreditChange(ctx, finalState) {
let models = Self.app.models; let models = Self.app.models;
let userId = ctx.options.accessToken.userId; let userId = ctx.options.accessToken.userId;
let currentUserIsManager = await models.Account.hasRole(userId, 'manager');
if (currentUserIsManager)
return;
let filter = { let filter = {
fields: ['roleFk'], fields: ['roleFk'],
where: { where: {
@ -162,22 +167,22 @@ module.exports = Self => {
let query = 'SELECT * FROM clientCredit WHERE clientFk = ? ORDER BY created DESC LIMIT 1'; let query = 'SELECT * FROM clientCredit WHERE clientFk = ? ORDER BY created DESC LIMIT 1';
let instances = await Self.rawSql(query, [finalState.id]); let instances = await Self.rawSql(query, [finalState.id]);
if (instances.length !== 1 || instances[0].workerFk == userId || instances[0].amount > 0) if (instances.length !== 1 || instances[0].amount > 0)
return; return;
query = `SELECT COUNT(distinct r.id) > 0 as hasManagerRole query = `
FROM clientCredit cc SELECT COUNT(*) AS hasRoleManager
JOIN worker em ON em.id = cc.workerFk FROM worker em
JOIN account.user ac ON ac.id = em.userFk JOIN account.user ac ON ac.id = em.userFk
JOIN salix.RoleMapping rm ON rm.principalId = ac.id JOIN salix.RoleMapping rm ON rm.principalId = ac.id
JOIN account.role r on r.id = rm.roleId JOIN account.role r on r.id = rm.roleId
WHERE rm.principalType = 'USER' WHERE em.id = ?
AND cc.workerFk = ? AND rm.principalType = 'USER'
AND r.name = 'manager'`; AND r.name = 'manager'`;
let instance = await Self.rawSql(query, [instances[0].workerFk]); let instance = await Self.rawSql(query, [instances[0].workerFk]);
if (instance[0].hasManagerRole > 0) if (instance[0].hasRoleManager)
throw new Error('Only manager can change the credit'); throw new Error('Only manager can change the credit');
} }
}; };