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

fix: refs #7917 fix methods, tests, acls #3085

Closed
carlossa wants to merge 35 commits from 7917-freelancerRoute into dev
pull from: 7917-freelancerRoute
merge into: verdnatura:dev
Conversation 1 Commits 35 Files Changed 9 +34 -7
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 13d7df052a - Show all commits

9
db/dump/fixtures.before.sql
View File

@ -4049,3 +4049,12 @@ INSERT IGNORE INTO vn.osrmConfig (id,url,tolerance)
INSERT IGNORE INTO vn.inventoryConfig
SET id = 1,
supplierFk = 4;
UPDATE vn.worker
SET isFreelance=1
WHERE firstName='deliveryFreelancer';
INSERT INTO vn.route (workerFk,firstEditorFk,created,vehicleFk,agencyModeFk,`time`,isOk,started,finished,cost,m3,description,zoneFk,priority,invoiceInFk,editorFk,dated)
VALUES (132,100,'2001-01-01 00:00:00.000',1,1,'1899-12-30 12:15:00.000',0,'2001-01-01 00:00:00.000','2001-01-02 00:00:00.000',10.0,1.8,'eighth route',1,0,1,100,'2001-01-01');
INSERT INTO vn.route (workerFk,firstEditorFk,created,vehicleFk,agencyModeFk,`time`,isOk,started,finished,cost,m3,description,zoneFk,priority,invoiceInFk,editorFk,dated)
VALUES (132,100,'2001-01-01 00:00:00.000',1,2,'1899-12-30 13:20:00.000',0,'2001-01-01 00:00:00.000','2001-01-02 00:00:00.000',20.0,0.2,'ninth route',9,0,2,100,'2001-01-01');

17
db/versions/11292-tealChrysanthemum/00-firstScript.sql
View File

@ -1,7 +1,16 @@
INSERT INTO account.`role` (name,description,hasLogin,created,modified)
VALUES ('deliveryFreelancer','Repartidor autónomo',1,'2024-07-05 10:18:58.000','2024-07-05 10:18:58.000');
-- INSERT INTO account.roleInherit (`role`, inheritsFrom) VALUES(132, 2);
-- CALL account.role_sync();
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
VALUES
('Route', 'getTickets', 'READ', 'ALLOW', 'ROLE', 'delivery'),
('AgencyTerm', 'filter', 'READ', 'ALLOW', 'ROLE', 'delivery'),
('Route', 'summary', 'READ', 'ALLOW', 'ROLE', 'delivery'),
('AgencyTerm', 'getRouteByAgency', 'READ', 'ALLOW', 'ROLE', 'delivery');
('Route', 'getTickets', 'READ', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
('AgencyTerm', 'filter', 'READ', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
('Route', 'summary', 'READ', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
('Route', 'getRouteByAgency', 'WRITE', 'ALLOW', 'ROLE', 'deliveryFreelancer'),
('Route','filter','READ','ALLOW','ROLE','deliveryFreelancer'),
('UserConfig','getUserConfig','*','ALLOW','ROLE','deliveryFreelancer');

15
modules/route/back/methods/route/filter.js
View File

@ -112,12 +112,21 @@ module.exports = Self => {
filter = mergeFilters(filter, {where});
const worker = await models.Worker.findById(userId, {fields: ['isFreelance']});
const getRouteByAgency = await models.ACL.checkAccessAcl(ctx, 'Route', 'getRouteByAgency', 'WRITE');
if (userId && getRouteByAgency && worker.isFreelance) {
console.log('worker: ', worker);
// const user = await models.VnUser.findById(userId, {fields: ['roleFk']});
// console.log('user', user);
// console.log('user.roleFk', user.roleFk);
console.log('filter', filter);
console.log('filter.where', filter.where);
console.log('usedId', userId);
const getMyRoute = await models.ACL.checkAccessAcl(ctx, 'Route', 'getRouteByAgency', 'WRITE');
console.log('getMyRoute: ', getMyRoute);
console.log('worker.isFreelance', worker.isFreelance !== 0);
if (userId && getMyRoute && worker.isFreelance !== 0) {
if (!filter.where) filter.where = {};
filter.where[`workerFk`] = userId;
}
console.log('filter', filter);
let stmts = [];
let stmt;