verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

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

Draft
carlossa wants to merge 12 commits from 7917-freelancerRoute into dev
pull from: 7917-freelancerRoute
merge into: verdnatura:dev
Conversation 0 Commits 12 Files Changed 11 +171 -185
11 changed files with 171 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/versions/11292-tealChrysanthemum/00-firstScript.sql Normal file
View File

@ -0,0 +1,6 @@
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
VALUES
('Route', 'getTickets', 'READ', 'ALLOW', 'ROLE', 'supplier'),
jgallego commented 2024-11-13 08:54:10 +00:00
Review
Copy Link

confirmar con jbreso que rol tienen los autonomos que van a usar esto

confirmar con jbreso que rol tienen los autonomos que van a usar esto
carlossa commented 2024-11-19 10:41:48 +00:00
Review
Copy Link

Lo van a ver usuarios delivery

Lo van a ver usuarios delivery
('AgencyTerm', 'filter', 'READ', 'ALLOW', 'ROLE', 'supplier'),
('Route', 'summary', 'READ', 'ALLOW', 'ROLE', 'supplier');

4
modules/entry/back/methods/entry/filter.js
View File

@ -173,9 +173,7 @@ module.exports = Self => {
} }
}); });
filter = mergeFilters(ctx.args.filter, {where}); filter = mergeFilters(ctx.args.filter, {where});
const userId = ctx.req.accessToken.userId; const supplier = await Self.app.models.Supplier.isSupplier(ctx);
const client = await Self.app.models.Client.findById(userId, myOptions);
const supplier = await Self.app.models.Supplier.findOne({where: {nif: client.fi}}, myOptions);
if (supplier) { if (supplier) {
if (!filter.where) filter.where = {}; if (!filter.where) filter.where = {};
filter.where[`e.supplierFk`] = supplier.id; filter.where[`e.supplierFk`] = supplier.id;

8
modules/route/back/methods/agency-term/filter.js
View File

@ -72,7 +72,13 @@ module.exports = Self => {
} }
}); });
filter = mergeFilters(filter, {where}); filter = mergeFilters(ctx.args?.filter ?? {}, {where});
const supplier = await Self.app.models.Supplier.isSupplier(ctx, myOptions);
if (supplier) {
if (!filter.where) filter.where = {};
filter.where[`a.supplierFk`] = supplier.id;
}
const date = Date.vnNew(); const date = Date.vnNew();
date.setHours(0, 0, 0, 0); date.setHours(0, 0, 0, 0);

85
modules/route/back/methods/agency-term/specs/filter.spec.js
View File

@ -1,109 +1,62 @@
const app = require('vn-loopback/server/server');
const models = require('vn-loopback/server/server').models; const models = require('vn-loopback/server/server').models;
describe('AgencyTerm filter()', () => { describe('AgencyTerm filter()', () => {
const authUserId = 9; const ctx = beforeAll.getCtx();
const today = Date.vnNew();
today.setHours(2, 0, 0, 0);
it('should return all results matching the filter', async() => { it('should return all results matching the filter', async() => {
const tx = await models.AgencyTerm.beginTransaction({}); ctx.args = {};
const agencyTerms = await models.AgencyTerm.filter(ctx);
try {
const options = {transaction: tx};
const filter = {};
const ctx = {req: {accessToken: {userId: authUserId}}};
const agencyTerms = await models.AgencyTerm.filter(ctx, filter, options);
const firstAgencyTerm = agencyTerms[0]; const firstAgencyTerm = agencyTerms[0];
expect(firstAgencyTerm.routeFk).toEqual(1); expect(firstAgencyTerm.routeFk).toEqual(1);
expect(agencyTerms.length).toEqual(5); expect(agencyTerms.length).toEqual(5);
await tx.rollback();
} catch (e) {
await tx.rollback();
throw e;
}
}); });
it('should return results matching "search" searching by integer', async() => { it('should return results matching "search" searching by integer', async() => {
let ctx = { const search = 1;
args: { ctx.args = {search};
search: 1,
}
};
let result = await app.models.AgencyTerm.filter(ctx); const [result] = await models.AgencyTerm.filter(ctx);
expect(result.length).toEqual(1); expect(result.invoiceInFk).toEqual(search);
expect(result[0].routeFk).toEqual(1);
}); });
it('should return results matching "search" searching by string', async() => { it('should return results matching "search" searching by string', async() => {
let ctx = { ctx.args = {search: 'Plants SL'};
args: {
search: 'Plants SL',
}
};
let result = await app.models.AgencyTerm.filter(ctx); let result = await models.AgencyTerm.filter(ctx);
expect(result.length).toEqual(2); expect(result.length).toEqual(2);
}); });
it('should return results matching "from" and "to"', async() => { it('should return results matching "from" and "to"', async() => {
const tx = await models.Buy.beginTransaction({});
const options = {transaction: tx};
try {
const from = Date.vnNew(); const from = Date.vnNew();
jgallego commented 2024-11-13 08:48:05 +00:00
Outdated
Review
Copy Link

posau comú en la par superior, en el beforeall hi ha exemples

posau comú en la par superior, en el beforeall hi ha exemples
from.setHours(0, 0, 0, 0); from.setHours(0, 0, 0, 0);
const to = Date.vnNew(); const to = Date.vnNew();
to.setHours(23, 59, 59, 999); to.setHours(23, 59, 59, 999);
const ctx = { ctx.args = {from, to};
args: {
from: from,
to: to
}
};
const results = await models.AgencyTerm.filter(ctx, options); const results = await models.AgencyTerm.filter(ctx);
expect(results.length).toBe(5); expect(results.length).toBe(5);
await tx.rollback();
} catch (e) {
await tx.rollback();
throw e;
}
}); });
it('should return results matching "agencyModeFk"', async() => { it('should return results matching "agencyModeFk"', async() => {
let ctx = { const agencyModeFk = 1;
args: { ctx.args = {agencyModeFk};
agencyModeFk: 1,
}
};
let result = await app.models.AgencyTerm.filter(ctx); const [result] = await models.AgencyTerm.filter(ctx);
expect(result.length).toEqual(1); expect(result.agencyModeFk).toEqual(agencyModeFk);
expect(result[0].routeFk).toEqual(1);
}); });
it('should return results matching "agencyFk"', async() => { it('should return results matching "agencyFk"', async() => {
let ctx = { const agencyFk = 1;
args: { ctx.args = {agencyFk};
agencyFk: 2, const [result] = await models.AgencyTerm.filter(ctx);
}
};
let result = await app.models.AgencyTerm.filter(ctx); expect(result.agencyFk).toEqual(agencyFk);
expect(result.length).toEqual(1);
expect(result[0].routeFk).toEqual(2);
}); });
}); });

168
modules/route/back/methods/roadmap/specs/clone.spec.js
View File

@ -1,109 +1,109 @@
const app = require('vn-loopback/server/server'); // const app = require('vn-loopback/server/server');
const models = require('vn-loopback/server/server').models; // const models = require('vn-loopback/server/server').models;
describe('AgencyTerm filter()', () => { // describe('Clone ', () => {
const authUserId = 9; // const authUserId = 9;
const today = Date.vnNew(); // const today = Date.vnNew();
today.setHours(2, 0, 0, 0); // today.setHours(2, 0, 0, 0);
it('should return all results matching the filter', async() => { // it('should return all results matching the filter', async() => {
const tx = await models.AgencyTerm.beginTransaction({}); // const tx = await models.AgencyTerm.beginTransaction({});
try { // try {
const options = {transaction: tx}; // const options = {transaction: tx};
const filter = {}; // const filter = {};
const ctx = {req: {accessToken: {userId: authUserId}}}; // const ctx = {req: {accessToken: {userId: authUserId}}};
const agencyTerms = await models.AgencyTerm.filter(ctx, filter, options); // const agencyTerms = await models.AgencyTerm.filter(ctx, filter, options);
const firstAgencyTerm = agencyTerms[0]; // const firstAgencyTerm = agencyTerms[0];
expect(firstAgencyTerm.routeFk).toEqual(1); // expect(firstAgencyTerm.routeFk).toEqual(1);
expect(agencyTerms.length).toEqual(5); // expect(agencyTerms.length).toEqual(5);
await tx.rollback(); // await tx.rollback();
} catch (e) { // } catch (e) {
await tx.rollback(); // await tx.rollback();
throw e; // throw e;
} // }
}); // });
it('should return results matching "search" searching by integer', async() => { // it('should return results matching "search" searching by integer', async() => {
let ctx = { // let ctx = {
args: { // args: {
search: 1, // search: 1,
} // }
}; // };
let result = await app.models.AgencyTerm.filter(ctx); // let result = await app.models.AgencyTerm.filter(ctx);
expect(result.length).toEqual(1); // expect(result.length).toEqual(1);
expect(result[0].routeFk).toEqual(1); // expect(result[0].routeFk).toEqual(1);
}); // });
it('should return results matching "search" searching by string', async() => { // it('should return results matching "search" searching by string', async() => {
let ctx = { // let ctx = {
args: { // args: {
search: 'Plants SL', // search: 'Plants SL',
} // }
}; // };
let result = await app.models.AgencyTerm.filter(ctx); // let result = await app.models.AgencyTerm.filter(ctx);
expect(result.length).toEqual(2); // expect(result.length).toEqual(2);
}); // });
it('should return results matching "from" and "to"', async() => { // it('should return results matching "from" and "to"', async() => {
const tx = await models.Buy.beginTransaction({}); // const tx = await models.Buy.beginTransaction({});
const options = {transaction: tx}; // const options = {transaction: tx};
try { // try {
const from = Date.vnNew(); // const from = Date.vnNew();
from.setHours(0, 0, 0, 0); // from.setHours(0, 0, 0, 0);
const to = Date.vnNew(); // const to = Date.vnNew();
to.setHours(23, 59, 59, 999); // to.setHours(23, 59, 59, 999);
const ctx = { // const ctx = {
args: { // args: {
from: from, // from: from,
to: to // to: to
} // }
}; // };
const results = await models.AgencyTerm.filter(ctx, options); // const results = await models.AgencyTerm.filter(ctx, options);
expect(results.length).toBe(5); // expect(results.length).toBe(5);
await tx.rollback(); // await tx.rollback();
} catch (e) { // } catch (e) {
await tx.rollback(); // await tx.rollback();
throw e; // throw e;
} // }
}); // });
it('should return results matching "agencyModeFk"', async() => { // it('should return results matching "agencyModeFk"', async() => {
let ctx = { // let ctx = {
args: { // args: {
agencyModeFk: 1, // agencyModeFk: 1,
} // }
}; // };
let result = await app.models.AgencyTerm.filter(ctx); // let result = await app.models.AgencyTerm.filter(ctx);
expect(result.length).toEqual(1); // expect(result.length).toEqual(1);
expect(result[0].routeFk).toEqual(1); // expect(result[0].routeFk).toEqual(1);
}); // });
it('should return results matching "agencyFk"', async() => { // it('should return results matching "agencyFk"', async() => {
let ctx = { // let ctx = {
args: { // args: {
agencyFk: 2, // agencyFk: 2,
} // }
}; // };
let result = await app.models.AgencyTerm.filter(ctx); // let result = await app.models.AgencyTerm.filter(ctx);
expect(result.length).toEqual(1); // expect(result.length).toEqual(1);
expect(result[0].routeFk).toEqual(2); // expect(result[0].routeFk).toEqual(2);
}); // });
}); // });

10
modules/route/back/methods/route/getTickets.js
View File

@ -2,7 +2,7 @@
const {ParameterizedSQL} = require('loopback-connector'); const {ParameterizedSQL} = require('loopback-connector');
module.exports = Self => { module.exports = Self => {
Self.remoteMethod('getTickets', { Self.remoteMethodCtx('getTickets', {
description: 'Find all instances of the model matched by filter from the data source.', description: 'Find all instances of the model matched by filter from the data source.',
accessType: 'READ', accessType: 'READ',
accepts: [ accepts: [
@ -23,7 +23,7 @@ module.exports = Self => {
} }
}); });
Self.getTickets = async(filter, options) => { Self.getTickets = async(ctx, filter, options) => {
const conn = Self.dataSource.connector; const conn = Self.dataSource.connector;
const myOptions = {}; const myOptions = {};
@ -78,6 +78,8 @@ module.exports = Self => {
AND tob2.observationTypeFk = ot2.id AND tob2.observationTypeFk = ot2.id
LEFT JOIN address a ON a.id = t.addressFk LEFT JOIN address a ON a.id = t.addressFk
LEFT JOIN agencyMode am ON am.id = t.agencyModeFk LEFT JOIN agencyMode am ON am.id = t.agencyModeFk
LEFT JOIN agency ag ON am.agencyFk = ag.id
LEFT JOIN supplierAgencyTerm sat ON sat.agencyFk = ag.id
LEFT JOIN account.user u ON u.id = r.workerFk LEFT JOIN account.user u ON u.id = r.workerFk
LEFT JOIN vehicle v ON v.id = r.vehicleFk LEFT JOIN vehicle v ON v.id = r.vehicleFk
LEFT JOIN workerMedia wm ON wm.workerFk = c.salesPersonFk` LEFT JOIN workerMedia wm ON wm.workerFk = c.salesPersonFk`
@ -85,6 +87,10 @@ module.exports = Self => {
if (!filter.where) filter.where = {}; if (!filter.where) filter.where = {};
const supplier = await Self.app.models.Supplier.isSupplier(ctx, myOptions);
if (supplier)
filter.where['sat.supplierFk'] = supplier.id;
const where = filter.where; const where = filter.where;
where['r.id'] = filter.id; where['r.id'] = filter.id;

4
modules/route/back/methods/route/specs/getTickets.spec.js
View File

@ -1,9 +1,11 @@
const app = require('vn-loopback/server/server'); const app = require('vn-loopback/server/server');
describe('route getTickets()', () => { describe('route getTickets()', () => {
const ctx = beforeAll.getCtx();
it('should return the tickets for a given route', async() => { it('should return the tickets for a given route', async() => {
const filter = {id: 2}; const filter = {id: 2};
let result = await app.models.Route.getTickets(filter); let result = await app.models.Route.getTickets(ctx, filter);
expect(result.length).toEqual(1); expect(result.length).toEqual(1);
}); });

13
modules/route/back/methods/route/specs/summary.spec.js
View File

@ -1,35 +1,38 @@
const app = require('vn-loopback/server/server'); const app = require('vn-loopback/server/server');
describe('route summary()', () => { describe('route summary()', () => {
const id = 1;
const ctx = beforeAll.getCtx();
it('should return a summary object containing data from one route', async() => { it('should return a summary object containing data from one route', async() => {
const result = await app.models.Route.summary(1); const result = await app.models.Route.summary(ctx, id);
expect(result.route.id).toEqual(1); expect(result.route.id).toEqual(1);
}); });
it(`should return a summary object containing it's agency`, async() => { it(`should return a summary object containing it's agency`, async() => {
const result = await app.models.Route.summary(1); const result = await app.models.Route.summary(ctx, id);
const agency = result.route.agencyMode(); const agency = result.route.agencyMode();
expect(agency.name).toEqual('inhouse pickup'); expect(agency.name).toEqual('inhouse pickup');
}); });
it(`should return a summary object containing it's vehicle`, async() => { it(`should return a summary object containing it's vehicle`, async() => {
const result = await app.models.Route.summary(1); const result = await app.models.Route.summary(ctx, id);
const vehicle = result.route.vehicle(); const vehicle = result.route.vehicle();
expect(vehicle.numberPlate).toEqual('3333-BAT'); expect(vehicle.numberPlate).toEqual('3333-BAT');
}); });
it(`should return a summary object containing it's worker`, async() => { it(`should return a summary object containing it's worker`, async() => {
const result = await app.models.Route.summary(1); const result = await app.models.Route.summary(ctx, id);
const worker = result.route.worker().user(); const worker = result.route.worker().user();
expect(worker.name).toEqual('delivery'); expect(worker.name).toEqual('delivery');
}); });
it(`should return a summary object containing data from the tickets`, async() => { it(`should return a summary object containing data from the tickets`, async() => {
const result = await app.models.Route.summary(2); const result = await app.models.Route.summary(ctx, 2);
expect(result.tickets.length).toEqual(1); expect(result.tickets.length).toEqual(1);
}); });

6
modules/route/back/methods/route/summary.js
View File

@ -1,5 +1,5 @@
module.exports = Self => { module.exports = Self => {
Self.remoteMethod('summary', { Self.remoteMethodCtx('summary', {
description: 'Returns the information of a route showed in the route summary', description: 'Returns the information of a route showed in the route summary',
accessType: 'READ', accessType: 'READ',
accepts: [{ accepts: [{
@ -19,7 +19,7 @@ module.exports = Self => {
} }
}); });
Self.summary = async id => { Self.summary = async(ctx, id) => {
let summary = {}; let summary = {};
let filter = { let filter = {
@ -53,7 +53,7 @@ module.exports = Self => {
}; };
summary.route = await Self.app.models.Route.findOne(filter); summary.route = await Self.app.models.Route.findOne(filter);
summary.tickets = await Self.app.models.Route.getTickets({id: id, order: 'priority ASC'}); summary.tickets = await Self.app.models.Route.getTickets(ctx, {id, order: 'priority ASC'});
return summary; return summary;
}; };

12
modules/supplier/back/models/supplier.js
View File

@ -163,4 +163,16 @@ module.exports = Self => {
if ((nameChanged) && !isAlpha(name)) if ((nameChanged) && !isAlpha(name))
throw new UserError('The social name has an invalid format'); throw new UserError('The social name has an invalid format');
}); });
carlossa marked this conversation as resolved
jgallego commented 2024-11-13 08:50:21 +00:00
Review
Copy Link

aci es mes sencill que pases el userId directament

aci es mes sencill que pases el userId directament
Self.isSupplier = async(ctx, options) => {
const myOptions = {};
if (typeof options == 'object')
Object.assign(myOptions, options);
const userId = ctx.req.accessToken.userId;
const client = await Self.app.models.Client.findById(userId, null, myOptions);
const supplier = await Self.app.models.Supplier.findOne({where: {nif: client.fi}}, myOptions);
return supplier;
};
}; };