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

WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2023-06-12 10:46:21 +02:00
parent d735f142a1
commit 5c1b867d05
88 changed files with 440 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
back/methods/collection/newCollection.js
View File

@ -30,11 +30,11 @@ module.exports = Self => {
Self.newCollection = async(ctx, collectionFk, sectorFk, vWagons) => {
let query = '';
const userId = ctx.req.accessToken.userId;
if (!collectionFk) {
const userId = ctx.req.accessToken.userId;
query = `CALL vn.collectionTrain_newBeta(?,?,?)`;
const [result] = await Self.rawSql(query, [sectorFk, vWagons, userId]);
const [result] = await Self.rawSql(query, [sectorFk, vWagons, userId], {userId});
if (result.length == 0)
throw new Error(`No collections for today`);
@ -42,16 +42,16 @@ module.exports = Self => {
}
query = `CALL vn.collectionTicket_get(?)`;
const [tickets] = await Self.rawSql(query, [collectionFk]);
const [tickets] = await Self.rawSql(query, [collectionFk], {userId});
query = `CALL vn.collectionSale_get(?)`;
const [sales] = await Self.rawSql(query, [collectionFk]);
const [sales] = await Self.rawSql(query, [collectionFk], {userId});
query = `CALL vn.collectionPlacement_get(?)`;
const [placements] = await Self.rawSql(query, [collectionFk]);
const [placements] = await Self.rawSql(query, [collectionFk], {userId});
query = `CALL vn.collectionSticker_print(?,?)`;
await Self.rawSql(query, [collectionFk, sectorFk]);
await Self.rawSql(query, [collectionFk, sectorFk], {userId});
return makeCollection(tickets, sales, placements, collectionFk);
};

4
back/methods/edi/updateData.js
View File

@ -16,14 +16,14 @@ module.exports = Self => {
}
});
Self.updateData = async() => {
Self.updateData = async ctx => {
const models = Self.app.models;
// Get files checksum
const tx = await Self.beginTransaction({});
try {
const options = {transaction: tx};
const options = {transaction: tx, userId: ctx.req.accessToken.userId};
const files = await Self.rawSql('SELECT name, checksum, keyValue FROM edi.fileConfig', null, options);
const updatableFiles = [];

1
back/models/vn-user.js
View File

@ -110,6 +110,7 @@ module.exports = function(Self) {
const _setPassword = Self.prototype.setPassword;
Self.prototype.setPassword = async function(newPassword, options, cb) {
console.log('ENTRY');
if (cb === undefined && typeof options === 'function') {
cb = options;
options = undefined;

44
loopback/common/models/vn-model.js
View File

@ -195,8 +195,48 @@ module.exports = function(Self) {
/*
* Shortcut to VnMySQL.executeP()
*/
rawSql(query, params, options, cb) {
return this.dataSource.connector.executeP(query, params, options, cb);
async rawSql(query, params, options) {
const userId = options?.userId;
const connector = this.dataSource.connector;
let conn;
let res;
const opts = Object.assign({}, options);
try {
if (userId) {
conn = await new Promise((resolve, reject) => {
connector.client.getConnection(function(err, conn) {
if (err)
reject(err);
else
resolve(conn);
});
});
const opts = Object.assign({}, options);
if (!opts.transaction) {
opts.transaction = {
connection: conn,
connector
};
}
await connector.executeP(
'CALL account.myUser_loginWithName((SELECT name FROM account.user WHERE id = ?))',
[userId], opts
);
}
res = await connector.executeP(query, params, opts);
if (userId) {
await connector.executeP('CALL account.myUser_logout()', null, opts);
}
} finally {
if (conn) conn.release();
}
return res;
},
/*

2
modules/account/back/methods/account/change-password.js
View File

@ -1,6 +1,6 @@
module.exports = Self => {
Self.remoteMethod('changePassword', {
Self.remoteMethodCtx('changePassword', {
description: 'Changes the user password',
accessType: 'WRITE',
accepts: [

2
modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js
View File

@ -63,7 +63,7 @@ module.exports = Self => {
};
let tx;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

2
modules/client/back/methods/client/confirmTransaction.js
View File

@ -23,7 +23,7 @@ module.exports = Self => {
const userId = ctx.req.accessToken.userId;
let tx;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

6
modules/client/back/methods/client/consumptionSendQueued.js
View File

@ -1,7 +1,7 @@
const {Email} = require('vn-print');
module.exports = Self => {
Self.remoteMethod('consumptionSendQueued', {
Self.remoteMethodCtx('consumptionSendQueued', {
description: 'Send all queued invoices',
accessType: 'WRITE',
accepts: [],
@ -15,7 +15,7 @@ module.exports = Self => {
}
});
Self.consumptionSendQueued = async() => {
Self.consumptionSendQueued = async ctx => {
const queues = await Self.rawSql(`
SELECT
id,
@ -68,7 +68,7 @@ module.exports = Self => {
SET status = 'printed',
printed = ?
WHERE id = ?`,
[Date.vnNew(), queue.id]);
[Date.vnNew(), queue.id], {userId: ctx.req.accessToken.userId});
} catch (error) {
await Self.rawSql(`
UPDATE clientConsumptionQueue

2
modules/client/back/methods/client/createReceipt.js
View File

@ -55,7 +55,7 @@ module.exports = function(Self) {
date.setHours(0, 0, 0, 0);
let tx;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

2
modules/client/back/methods/client/filter.js
View File

@ -72,7 +72,7 @@ module.exports = Self => {
Self.filter = async(ctx, filter, options) => {
const conn = Self.dataSource.connector;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
const postalCode = [];
const args = ctx.args;

6
modules/client/back/methods/client/getCard.js
View File

@ -1,5 +1,5 @@
module.exports = function(Self) {
Self.remoteMethod('getCard', {
Self.remoteMethodCtx('getCard', {
description: 'Get client basic data and debt',
accepts: {
arg: 'id',
@ -18,8 +18,8 @@ module.exports = function(Self) {
}
});
Self.getCard = async(id, options) => {
const myOptions = {};
Self.getCard = async(ctx, id, options) => {
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

6
modules/client/back/methods/client/getDebt.js
View File

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('getDebt', {
Self.remoteMethodCtx('getDebt', {
description: 'Returns the boolean debt of a client',
accessType: 'READ',
accepts: [{
@ -19,8 +19,8 @@ module.exports = Self => {
}
});
Self.getDebt = async(clientFk, options) => {
const myOptions = {};
Self.getDebt = async(ctx, clientFk, options) => {
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

3
modules/client/back/methods/client/specs/getCard.spec.js
View File

@ -5,10 +5,11 @@ describe('Client getCard()', () => {
const tx = await models.Client.beginTransaction({});
try {
const ctx = {req: {accessToken: {userId: 9}}};
const options = {transaction: tx};
const id = 1101;
const result = await models.Client.getCard(id, options);
const result = await models.Client.getCard(ctx, id, options);
expect(result.id).toEqual(id);
expect(result.name).toEqual('Bruce Wayne');

3
modules/client/back/methods/client/specs/getDebt.spec.js
View File

@ -3,11 +3,12 @@ const models = require('vn-loopback/server/server').models;
describe('client getDebt()', () => {
it('should return the client debt', async() => {
const tx = await models.Client.beginTransaction({});
const ctx = {req: {accessToken: {userId: 9}}};
try {
const options = {transaction: tx};
const result = await models.Client.getDebt(1101, options);
const result = await models.Client.getDebt(ctx, 1101, options);
expect(result.debt).toEqual(jasmine.any(Number));

15
modules/client/back/methods/client/specs/summary.spec.js
View File

@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('client summary()', () => {
const ctx = {req: {accessToken: {userId: 9}}};
it('should return a summary object containing data', async() => {
const clientId = 1101;
const tx = await models.Client.beginTransaction({});
@ -8,7 +9,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
const result = await models.Client.summary(clientId, options);
const result = await models.Client.summary(ctx, clientId, options);
expect(result.id).toEqual(clientId);
expect(result.name).toEqual('Bruce Wayne');
@ -27,7 +28,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
const result = await models.Client.summary(clientId, options);
const result = await models.Client.summary(ctx, clientId, options);
expect(result.mana.mana).toEqual(0.34);
@ -45,7 +46,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
const result = await models.Client.summary(clientId, options);
const result = await models.Client.summary(ctx, clientId, options);
expect(result.debt.debt).toEqual(jasmine.any(Number));
@ -63,7 +64,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
const result = await models.Client.summary(clientId, options);
const result = await models.Client.summary(ctx, clientId, options);
expect(result.averageInvoiced.invoiced).toEqual(1500);
@ -81,7 +82,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
const result = await models.Client.summary(clientId, options);
const result = await models.Client.summary(ctx, clientId, options);
expect(result.totalGreuge).toEqual(203.71);
@ -99,7 +100,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
const result = await models.Client.summary(clientId, options);
const result = await models.Client.summary(ctx, clientId, options);
expect(result.recovery).toEqual(null);
@ -117,7 +118,7 @@ describe('client summary()', () => {
try {
const options = {transaction: tx};
const result = await models.Client.summary(clientId, options);
const result = await models.Client.summary(ctx, clientId, options);
expect(result.recovery.id).toEqual(3);
await tx.rollback();

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

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('summary', {
Self.remoteMethodCtx('summary', {
description: 'Returns a client summary',
accessType: 'READ',
accepts: [{
@ -19,7 +19,7 @@ module.exports = Self => {
}
});
Self.summary = async(clientFk, options) => {
Self.summary = async(ctx, clientFk, options) => {
const models = Self.app.models;
const myOptions = {};
@ -28,7 +28,7 @@ module.exports = Self => {
const summaryObj = await getSummary(models.Client, clientFk, myOptions);
summaryObj.mana = await models.Client.getMana(clientFk, myOptions);
summaryObj.debt = await models.Client.getDebt(clientFk, myOptions);
summaryObj.debt = await models.Client.getDebt(ctx, clientFk, myOptions);
summaryObj.averageInvoiced = await models.Client.getAverageInvoiced(clientFk, myOptions);
summaryObj.totalGreuge = await models.Greuge.sumAmount(clientFk, myOptions);
summaryObj.recovery = await getRecoveries(models.Recovery, clientFk, myOptions);

6
modules/client/back/methods/tpv-transaction/confirm.js
View File

@ -2,7 +2,7 @@ const UserError = require('vn-loopback/util/user-error');
const base64url = require('base64url');
module.exports = Self => {
Self.remoteMethod('confirm', {
Self.remoteMethodCtx('confirm', {
description: 'Confirms electronic payment transaction',
accessType: 'WRITE',
accepts: [
@ -30,7 +30,7 @@ module.exports = Self => {
}
});
Self.confirm = async(signatureVersion, merchantParameters, signature) => {
Self.confirm = async(ctx, signatureVersion, merchantParameters, signature) => {
const $ = Self.app.models;
let transaction;
@ -83,7 +83,7 @@ module.exports = Self => {
params['Ds_Currency'],
params['Ds_Response'],
params['Ds_ErrorCode']
]);
], {userId: ctx.req.accessToken.userId});
return true;
} catch (err) {

2
modules/client/back/methods/tpv-transaction/end.js
View File

@ -34,6 +34,6 @@ module.exports = Self => {
'CALL hedera.tpvTransaction_end(?, ?)', [
orderId,
status
]);
], {userId});
};
};

2
modules/client/back/methods/tpv-transaction/start.js
View File

@ -40,7 +40,7 @@ module.exports = Self => {
amount,
companyId,
userId
]);
], {userId});
if (!row)
throw new UserError('Transaction error');

2
modules/entry/back/methods/entry/importBuys.js
View File

@ -46,7 +46,7 @@ module.exports = Self => {
const args = ctx.args;
const models = Self.app.models;
let tx;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

2
modules/invoiceIn/back/methods/invoice-in/toBook.js
View File

@ -21,7 +21,7 @@ module.exports = Self => {
Self.toBook = async(ctx, id, options) => {
let tx;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

6
modules/invoiceOut/back/methods/invoiceOut/book.js
View File

@ -1,6 +1,6 @@
module.exports = Self => {
Self.remoteMethod('book', {
Self.remoteMethodCtx('book', {
description: 'Book an invoiceOut',
accessType: 'WRITE',
accepts: {
@ -20,10 +20,10 @@ module.exports = Self => {
}
});
Self.book = async(ref, options) => {
Self.book = async(ctx, ref, options) => {
const models = Self.app.models;
let tx;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

2
modules/invoiceOut/back/methods/invoiceOut/clientsToInvoice.js
View File

@ -36,7 +36,7 @@ module.exports = Self => {
Self.clientsToInvoice = async(ctx, clientId, invoiceDate, maxShipped, companyFk, options) => {
let tx;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

2
modules/invoiceOut/back/methods/invoiceOut/createManualInvoice.js
View File

@ -51,7 +51,7 @@ module.exports = Self => {
const args = ctx.args;
let tx;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

2
modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js
View File

@ -50,7 +50,7 @@ module.exports = Self => {
Self.invoiceClient = async(ctx, options) => {
const args = ctx.args;
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

6
modules/invoiceOut/back/methods/invoiceOut/refund.js
View File

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('refund', {
Self.remoteMethodCtx('refund', {
description: 'Create refund tickets with sales and services if provided',
accessType: 'WRITE',
accepts: [
@ -25,7 +25,7 @@ module.exports = Self => {
}
});
Self.refund = async(ref, withWarehouse, options) => {
Self.refund = async(ctx, ref, withWarehouse, options) => {
const models = Self.app.models;
const myOptions = {};
let tx;
@ -43,7 +43,7 @@ module.exports = Self => {
const tickets = await models.Ticket.find(filter, myOptions);
const ticketsIds = tickets.map(ticket => ticket.id);
const refundedTickets = await models.Ticket.refund(ticketsIds, withWarehouse, myOptions);
const refundedTickets = await models.Ticket.refund(ctx, ticketsIds, withWarehouse, myOptions);
if (tx) await tx.commit();

3
modules/invoiceOut/back/methods/invoiceOut/specs/book.spec.js
View File

@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('invoiceOut book()', () => {
const ctx = {req: {accessToken: {userId: 9}}};
const invoiceOutId = 5;
it('should update the booked property', async() => {
@ -12,7 +13,7 @@ describe('invoiceOut book()', () => {
const bookedDate = originalInvoiceOut.booked;
const invoiceOutRef = originalInvoiceOut.ref;
await models.InvoiceOut.book(invoiceOutRef, options);
await models.InvoiceOut.book(ctx, invoiceOutRef, options);
const updatedInvoiceOut = await models.InvoiceOut.findById(invoiceOutId, {}, options);

3
modules/invoiceOut/back/methods/invoiceOut/specs/refund.spec.js
View File

@ -3,6 +3,7 @@ const LoopBackContext = require('loopback-context');
describe('InvoiceOut refund()', () => {
const userId = 5;
const ctx = {req: {accessToken: userId}};
const withWarehouse = true;
const activeCtx = {
accessToken: {userId: userId},
@ -16,7 +17,7 @@ describe('InvoiceOut refund()', () => {
const options = {transaction: tx};
try {
const result = await models.InvoiceOut.refund('T1111111', withWarehouse, options);
const result = await models.InvoiceOut.refund(ctx, 'T1111111', withWarehouse, options);
expect(result).toBeDefined();

6
modules/item/back/methods/item/getBalance.js
View File

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('getBalance', {
Self.remoteMethodCtx('getBalance', {
description: 'Returns the ',
accessType: 'READ',
accepts: [{
@ -19,8 +19,8 @@ module.exports = Self => {
}
});
Self.getBalance = async(filter, options) => {
const myOptions = {};
Self.getBalance = async(ctx, filter, options) => {
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

6
modules/item/back/methods/item/new.js
View File

@ -1,7 +1,7 @@
let UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethod('new', {
Self.remoteMethodCtx('new', {
description: 'returns the created item',
accessType: 'WRITE',
accepts: [{
@ -19,9 +19,9 @@ module.exports = Self => {
}
});
Self.new = async(params, options) => {
Self.new = async(ctx, params, options) => {
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

7
modules/item/back/methods/item/specs/getBalance.spec.js
View File

@ -2,6 +2,7 @@ const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('item getBalance()', () => {
const ctx = {req: {accessToken: {userId: 9}}};
it('should return the balance lines of a client type loses in which one has highlighted true', async() => {
const tx = await models.Item.beginTransaction({});
const options = {transaction: tx};
@ -25,7 +26,7 @@ describe('item getBalance()', () => {
date: null
}
};
const results = await models.Item.getBalance(filter, options);
const results = await models.Item.getBalance(ctx, filter, options);
const result = results.find(element => element.clientType == 'loses');
@ -59,8 +60,8 @@ describe('item getBalance()', () => {
}
};
const firstItemBalance = await models.Item.getBalance(firstFilter, options);
const secondItemBalance = await models.Item.getBalance(secondFilter, options);
const firstItemBalance = await models.Item.getBalance(ctx, firstFilter, options);
const secondItemBalance = await models.Item.getBalance(ctx, secondFilter, options);
expect(firstItemBalance[9].claimFk).toEqual(null);
expect(secondItemBalance[5].claimFk).toEqual(2);

3
modules/item/back/methods/item/specs/new.spec.js
View File

@ -2,6 +2,7 @@ const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('item new()', () => {
const ctx = {req: {accessToken: {userId: 9}}};
beforeAll(async() => {
const activeCtx = {
accessToken: {userId: 9},
@ -30,7 +31,7 @@ describe('item new()', () => {
tag: 1
};
let item = await models.Item.new(itemParams, options);
let item = await models.Item.new(ctx, itemParams, options);
let itemType = await models.ItemType.findById(item.typeFk, options);

6
modules/order/back/methods/order-row/addToOrder.js
View File

@ -1,7 +1,7 @@
const UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethod('addToOrder', {
Self.remoteMethodCtx('addToOrder', {
description: 'Creates rows (lines) for a order',
accessType: 'WRITE',
accepts: [{
@ -21,8 +21,8 @@ module.exports = Self => {
}
});
Self.addToOrder = async(params, options) => {
const myOptions = {};
Self.addToOrder = async(ctx, params, options) => {
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

3
modules/order/back/methods/order-row/specs/addToOrder.spec.js
View File

@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('order addToOrder()', () => {
const ctx = {req: {accessToken: {userId: 9}}};
const orderId = 8;
it('should add a row to a given order', async() => {
const tx = await models.Order.beginTransaction({});
@ -21,7 +22,7 @@ describe('order addToOrder()', () => {
}]
};
await models.OrderRow.addToOrder(params, options);
await models.OrderRow.addToOrder(ctx, params, options);
const modifiedRows = await models.OrderRow.find({where: {orderFk: orderId}}, options);

2
modules/order/back/methods/order/confirm.js
View File

@ -23,7 +23,7 @@ module.exports = Self => {
const userId = ctx.req.accessToken.userId;
const query = `CALL hedera.order_confirmWithUser(?, ?)`;
const response = await Self.rawSql(query, [orderFk, userId]);
const response = await Self.rawSql(query, [orderFk, userId], {userId});
return response;
};

6
modules/order/back/methods/order/new.js
View File

@ -1,7 +1,7 @@
let UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.remoteMethod('new', {
Self.remoteMethodCtx('new', {
description: 'Create a new order and returns the new ID',
accessType: 'WRITE',
accepts: [
@ -32,8 +32,8 @@ module.exports = Self => {
}
});
Self.new = async(landed, addressId, agencyModeId, options) => {
const myOptions = {};
Self.new = async(ctx, landed, addressId, agencyModeId, options) => {
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

6
modules/order/back/methods/order/newFromTicket.js
View File

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('newFromTicket', {
Self.remoteMethodCtx('newFromTicket', {
description: 'Create a new order and returns the new ID',
accessType: 'WRITE',
accepts: [{
@ -18,7 +18,7 @@ module.exports = Self => {
}
});
Self.newFromTicket = async(ticketFk, options) => {
Self.newFromTicket = async(ctx, ticketFk, options) => {
const myOptions = {};
let tx;
@ -39,7 +39,7 @@ module.exports = Self => {
const addressFk = ticket.addressFk;
const agencyModeFk = ticket.agencyModeFk;
const orderID = await Self.app.models.Order.new(landed, addressFk, agencyModeFk, myOptions);
const orderID = await Self.app.models.Order.new(ctx, landed, addressFk, agencyModeFk, myOptions);
if (tx) await tx.commit();

5
modules/order/back/methods/order/specs/new.spec.js
View File

@ -2,6 +2,7 @@ const models = require('vn-loopback/server/server').models;
const UserError = require('vn-loopback/util/user-error');
describe('order new()', () => {
const ctx = {req: {accessToken: {userId: 9}}};
it('should throw an error if the client isnt active', async() => {
const tx = await models.Order.beginTransaction({});
@ -13,7 +14,7 @@ describe('order new()', () => {
const addressFk = 6;
const agencyModeFk = 1;
await models.Order.new(landed, addressFk, agencyModeFk, options);
await models.Order.new(ctx, landed, addressFk, agencyModeFk, options);
await tx.rollback();
} catch (e) {
@ -34,7 +35,7 @@ describe('order new()', () => {
const addressFk = 121;
const agencyModeFk = 1;
orderId = await models.Order.new(landed, addressFk, agencyModeFk, options);
orderId = await models.Order.new(ctx, landed, addressFk, agencyModeFk, options);
const highestOrderIdInFixtures = 3;

3
modules/order/back/methods/order/specs/newFromTicket.spec.js
View File

@ -1,6 +1,7 @@
const models = require('vn-loopback/server/server').models;
describe('order newFromTicket()', () => {
const ctx = {req: {accessToken: {userId: 9}}};
it('should create a new order from an existing ticket', async() => {
const tx = await models.Order.beginTransaction({});
@ -9,7 +10,7 @@ describe('order newFromTicket()', () => {
const ticketId = 11;
const orderId = await models.Order.newFromTicket(ticketId, options);
const orderId = await models.Order.newFromTicket(ctx, ticketId, options);
const highestOrderIdInFixtures = 3;

6
modules/route/back/methods/agency-term/createInvoiceIn.js
View File

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('createInvoiceIn', {
Self.remoteMethodCtx('createInvoiceIn', {
description: 'Creates an invoiceIn from one or more agency terms',
accessType: 'WRITE',
accepts: [{
@ -24,11 +24,11 @@ module.exports = Self => {
}
});
Self.createInvoiceIn = async(rows, dms, options) => {
Self.createInvoiceIn = async(ctx, rows, dms, options) => {
const models = Self.app.models;
let tx;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

3
modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js
View File

@ -2,6 +2,7 @@ const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
describe('AgencyTerm createInvoiceIn()', () => {
const ctx = {req: {accessToken: {userId: 9}}};
beforeAll(async() => {
const activeCtx = {
accessToken: {userId: 9},
@ -42,7 +43,7 @@ describe('AgencyTerm createInvoiceIn()', () => {
const oldInvoiceInDueDay = await models.InvoiceInDueDay.findById(invoiceInDueDayId, null, options);
const oldInvoiceInTax = await models.InvoiceInTax.findById(invoiceInTaxId, null, options);
await models.AgencyTerm.createInvoiceIn(rows, dms, options);
await models.AgencyTerm.createInvoiceIn(ctx, rows, dms, options);
const [newInvoiceIn] = await models.InvoiceIn.rawSql('SELECT MAX(id) id FROM invoiceIn', null, options);

2
modules/route/back/methods/route/guessPriority.js
View File

@ -26,7 +26,7 @@ module.exports = Self => {
const tx = await Self.beginTransaction({});
try {
let options = {transaction: tx};
let options = {transaction: tx, userId};
const priority = await Self.rawSql(query, [id], options);

2
modules/route/back/methods/route/updateVolume.js
View File

@ -24,7 +24,7 @@ module.exports = Self => {
const models = Self.app.models;
let tx;
const myOptions = {};
const myOptions = {userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

2
modules/ticket/back/methods/sale/recalculatePrice.js
View File

@ -23,7 +23,7 @@ module.exports = Self => {
Self.recalculatePrice = async(ctx, sales, options) => {
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

6
modules/ticket/back/methods/sale/refund.js
View File

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('refund', {
Self.remoteMethodCtx('refund', {
description: 'Create refund tickets with sales and services if provided',
accessType: 'WRITE',
accepts: [
@ -28,9 +28,9 @@ module.exports = Self => {
}
});
Self.refund = async(salesIds, servicesIds, withWarehouse, options) => {
Self.refund = async(ctx, salesIds, servicesIds, withWarehouse, options) => {
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

7
modules/ticket/back/methods/sale/specs/refund.spec.js
View File

@ -3,8 +3,9 @@ const LoopBackContext = require('loopback-context');
describe('Sale refund()', () => {
const userId = 5;
const ctx = {req: {accessToken: userId}};
const activeCtx = {
accessToken: {userId: userId},
accessToken: {userId},
};
const servicesIds = [3];
const withWarehouse = true;
@ -22,7 +23,7 @@ describe('Sale refund()', () => {
try {
const options = {transaction: tx};
const refundedTicket = await models.Sale.refund(salesIds, servicesIds, withWarehouse, options);
const refundedTicket = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, options);
expect(refundedTicket).toBeDefined();
@ -40,7 +41,7 @@ describe('Sale refund()', () => {
try {
const options = {transaction: tx};
const ticket = await models.Sale.refund(salesIds, servicesIds, withWarehouse, options);
const ticket = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, options);
const refundedTicket = await models.Ticket.findOne({
where: {

4
modules/ticket/back/methods/sale/specs/reserve.spec.js
View File

@ -52,7 +52,7 @@ describe('sale reserve()', () => {
try {
const options = {transaction: tx};
originalTicketSales = await models.Ticket.getSales(11, options);
originalTicketSales = await models.Ticket.getSales(ctx, 11, options);
expect(originalTicketSales[0].reserved).toEqual(false);
expect(originalTicketSales[1].reserved).toEqual(false);
@ -63,7 +63,7 @@ describe('sale reserve()', () => {
await models.Sale.reserve(ctx, ticketId, sales, reserved, options);
const reservedTicketSales = await models.Ticket.getSales(ticketId, options);
const reservedTicketSales = await models.Ticket.getSales(ctx, ticketId, options);
expect(reservedTicketSales[0].reserved).toEqual(true);
expect(reservedTicketSales[1].reserved).toEqual(true);

2
modules/ticket/back/methods/sale/updatePrice.js
View File

@ -31,7 +31,7 @@ module.exports = Self => {
Self.updatePrice = async(ctx, id, newPrice, options) => {
const $t = ctx.req.__; // $translate
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

2
modules/ticket/back/methods/sale/usesMana.js
View File

@ -22,7 +22,7 @@ module.exports = Self => {
Object.assign(myOptions, options);
const salesDepartment = await models.Department.findOne({where: {code: 'VT'}, fields: 'id'}, myOptions);
const departments = await models.Department.getLeaves(salesDepartment.id, null, myOptions);
const departments = await models.Department.getLeaves(ctx, salesDepartment.id, null, myOptions);
const workerDepartment = await models.WorkerDepartment.findById(userId, null, myOptions);
if (!workerDepartment) return false;

2
modules/ticket/back/methods/ticket-request/confirm.js
View File

@ -34,7 +34,7 @@ module.exports = Self => {
const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
const $t = ctx.req.__; // $translate
const myOptions = {};
const myOptions = {userId};
let tx;
if (typeof options == 'object')

2
modules/ticket/back/methods/ticket/addSale.js
View File

@ -35,7 +35,7 @@ module.exports = Self => {
Self.addSale = async(ctx, id, itemId, quantity, options) => {
const $t = ctx.req.__; // $translate
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

8
modules/ticket/back/methods/ticket/closeAll.js
View File

@ -2,7 +2,7 @@ const UserError = require('vn-loopback/util/user-error');
const closure = require('./closure');
module.exports = Self => {
Self.remoteMethod('closeAll', {
Self.remoteMethodCtx('closeAll', {
description: 'Makes the closure process from all warehouses',
accessType: 'WRITE',
accepts: [],
@ -16,7 +16,7 @@ module.exports = Self => {
}
});
Self.closeAll = async() => {
Self.closeAll = async ctx => {
const toDate = Date.vnNew();
toDate.setHours(0, 0, 0, 0);
toDate.setDate(toDate.getDate() - 1);
@ -59,7 +59,7 @@ module.exports = Self => {
GROUP BY t.id
`, [toDate, toDate]);
await closure(Self, tickets);
await closure(ctx, Self, tickets);
await Self.rawSql(`
UPDATE ticket t
@ -73,7 +73,7 @@ module.exports = Self => {
AND util.dayEnd(?)
AND al.code NOT IN('DELIVERED','PACKED')
AND t.routeFk
AND z.name LIKE '%MADRID%'`, [toDate, toDate]);
AND z.name LIKE '%MADRID%'`, [toDate, toDate], {userId: ctx.req.accessToken.userId});
return {
message: 'Success'

13
modules/ticket/back/methods/ticket/closure.js
View File

@ -4,13 +4,14 @@ const smtp = require('vn-print/core/smtp');
const config = require('vn-print/core/config');
const storage = require('vn-print/core/storage');
module.exports = async function(Self, tickets, reqArgs = {}) {
module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
const userId = ctx.req.accessToken.userId;
if (tickets.length == 0) return;
const failedtickets = [];
for (const ticket of tickets) {
try {
await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id]);
await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id], {userId});
const [invoiceOut] = await Self.rawSql(`
SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
@ -52,7 +53,7 @@ module.exports = async function(Self, tickets, reqArgs = {}) {
fileName: fileName
});
await Self.rawSql('UPDATE invoiceOut SET hasPdf = true WHERE id = ?', [invoiceOut.id]);
await Self.rawSql('UPDATE invoiceOut SET hasPdf = true WHERE id = ?', [invoiceOut.id], {userId});
if (isToBeMailed) {
const invoiceAttachment = {
@ -118,7 +119,7 @@ module.exports = async function(Self, tickets, reqArgs = {}) {
await Self.rawSql(`
INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
`, [ticket.clientFk, sample.id, ticket.companyFk]);
`, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
}
} catch (error) {
// Domain not found
@ -152,7 +153,7 @@ module.exports = async function(Self, tickets, reqArgs = {}) {
async function invalidEmail(ticket) {
await Self.rawSql(`UPDATE client SET email = NULL WHERE id = ?`, [
ticket.clientFk
]);
], {userId});
const oldInstance = `{"email": "${ticket.recipient}"}`;
const newInstance = `{"email": ""}`;
@ -162,7 +163,7 @@ module.exports = async function(Self, tickets, reqArgs = {}) {
ticket.clientFk,
oldInstance,
newInstance
]);
], {userId});
const body = `No se ha podido enviar el albarán <strong>${ticket.id}</strong>
al cliente <strong>${ticket.clientFk} - ${ticket.clientName}</strong>

2
modules/ticket/back/methods/ticket/componentUpdate.js
View File

@ -101,7 +101,7 @@ module.exports = Self => {
Self.componentUpdate = async(ctx, options) => {
const args = ctx.args;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

6
modules/ticket/back/methods/ticket/getSales.js
View File

@ -1,6 +1,6 @@
module.exports = Self => {
Self.remoteMethod('getSales', {
Self.remoteMethodCtx('getSales', {
description: 'New filter',
accessType: 'READ',
accepts: [{
@ -20,10 +20,10 @@ module.exports = Self => {
}
});
Self.getSales = async(id, options) => {
Self.getSales = async(ctx, id, options) => {
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

2
modules/ticket/back/methods/ticket/makeInvoice.js
View File

@ -28,7 +28,7 @@ module.exports = function(Self) {
const date = Date.vnNew();
date.setHours(0, 0, 0, 0);
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

6
modules/ticket/back/methods/ticket/new.js
View File

@ -59,9 +59,9 @@ module.exports = Self => {
Self.new = async(ctx, options) => {
const args = ctx.args;
const myUserId = ctx.req.accessToken.userId;
const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId};
let tx;
if (typeof options == 'object')
@ -123,7 +123,7 @@ module.exports = Self => {
args.routeId || null,
args.landed,
true,
myUserId
userId
], myOptions);
const ticket = await models.Ticket.findById(result[1][0].newTicketId, null, myOptions);

2
modules/ticket/back/methods/ticket/priceDifference.js
View File

@ -60,7 +60,7 @@ module.exports = Self => {
Self.priceDifference = async(ctx, options) => {
const args = ctx.args;
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

2
modules/ticket/back/methods/ticket/recalculateComponents.js
View File

@ -21,7 +21,7 @@ module.exports = Self => {
});
Self.recalculateComponents = async(ctx, id, options) => {
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

6
modules/ticket/back/methods/ticket/refund.js
View File

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('refund', {
Self.remoteMethodCtx('refund', {
description: 'Create refund tickets with all their sales and services',
accessType: 'WRITE',
accepts: [
@ -24,7 +24,7 @@ module.exports = Self => {
}
});
Self.refund = async(ticketsIds, withWarehouse, options) => {
Self.refund = async(ctx, ticketsIds, withWarehouse, options) => {
const models = Self.app.models;
const myOptions = {};
let tx;
@ -46,7 +46,7 @@ module.exports = Self => {
const services = await models.TicketService.find(filter, myOptions);
const servicesIds = services.map(service => service.id);
const refundedTickets = await models.Sale.refund(salesIds, servicesIds, withWarehouse, myOptions);
const refundedTickets = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, myOptions);
if (tx) await tx.commit();

2
modules/ticket/back/methods/ticket/saveSign.js
View File

@ -31,7 +31,7 @@ module.exports = Self => {
Self.saveSign = async(ctx, tickets, location, signedTime, options) => {
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
let dms;
let gestDocCreated = false;

2
modules/ticket/back/methods/ticket/setDeleted.js
View File

@ -24,7 +24,7 @@ module.exports = Self => {
Self.setDeleted = async(ctx, id, options) => {
const models = Self.app.models;
const $t = ctx.req.__; // $translate
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

3
modules/ticket/back/methods/ticket/specs/getSales.spec.js
View File

@ -1,13 +1,14 @@
const models = require('vn-loopback/server/server').models;
describe('ticket getSales()', () => {
const ctx = {req: {accessToken: 9}};
it('should return the sales of a ticket', async() => {
const tx = await models.Ticket.beginTransaction({});
try {
const options = {transaction: tx};
const sales = await models.Ticket.getSales(16, options);
const sales = await models.Ticket.getSales(ctx, 16, options);
expect(sales.length).toEqual(4);
expect(sales[0].item).toBeDefined();

9
modules/ticket/back/methods/ticket/specs/summary.spec.js
View File

@ -1,13 +1,14 @@
const models = require('vn-loopback/server/server').models;
describe('ticket summary()', () => {
const ctx = {req: {accessToken: 9}};
it('should return a summary object containing data from 1 ticket', async() => {
const tx = await models.Ticket.beginTransaction({});
try {
const options = {transaction: tx};
const result = await models.Ticket.summary(1, options);
const result = await models.Ticket.summary(ctx, 1, options);
expect(result.id).toEqual(1);
expect(result.nickname).toEqual('Bat cave');
@ -25,7 +26,7 @@ describe('ticket summary()', () => {
try {
const options = {transaction: tx};
const result = await models.Ticket.summary(1, options);
const result = await models.Ticket.summary(ctx, 1, options);
expect(result.sales.length).toEqual(4);
@ -42,7 +43,7 @@ describe('ticket summary()', () => {
try {
const options = {transaction: tx};
const result = await models.Ticket.summary(1, options);
const result = await models.Ticket.summary(ctx, 1, options);
expect(result.totalWithoutVat).toEqual(jasmine.any(Number));
@ -59,7 +60,7 @@ describe('ticket summary()', () => {
try {
const options = {transaction: tx};
const result = await models.Ticket.summary(1, options);
const result = await models.Ticket.summary(ctx, 1, options);
expect(result.totalWithVat).toEqual(jasmine.any(Number));

16
modules/ticket/back/methods/ticket/specs/transferSales.spec.js
View File

@ -67,7 +67,7 @@ describe('sale transferSales()', () => {
const ticketId = 11;
const receiverTicketId = null;
const sales = await models.Ticket.getSales(ticketId, options);
const sales = await models.Ticket.getSales(ctx, ticketId, options);
await models.Ticket.transferSales(ctx, ticketId, receiverTicketId, sales, options);
@ -89,7 +89,7 @@ describe('sale transferSales()', () => {
const formerTicketId = 22;
let createdTicketId = undefined;
let formerTicketSales = await models.Ticket.getSales(formerTicketId, options);
let formerTicketSales = await models.Ticket.getSales(ctx, formerTicketId, options);
expect(formerTicketSales.length).toEqual(2);
@ -98,8 +98,8 @@ describe('sale transferSales()', () => {
createdTicketId = createdTicket.id;
formerTicketSales = await models.Ticket.getSales(formerTicketId, options);
let createdTicketSales = await models.Ticket.getSales(createdTicketId, options);
formerTicketSales = await models.Ticket.getSales(ctx, formerTicketId, options);
let createdTicketSales = await models.Ticket.getSales(ctx, createdTicketId, options);
expect(formerTicketSales.length).toEqual(0);
expect(createdTicketSales.length).toEqual(2);
@ -120,7 +120,7 @@ describe('sale transferSales()', () => {
const options = {transaction: tx};
const currentTicketId = 22;
const currentTicketSales = await models.Ticket.getSales(currentTicketId, options);
const currentTicketSales = await models.Ticket.getSales(ctx, currentTicketId, options);
const receiverTicketId = undefined;
@ -147,7 +147,7 @@ describe('sale transferSales()', () => {
const formerTicketId = 22;
let createdTicketId = undefined;
let formerTicketSales = await models.Ticket.getSales(formerTicketId, options);
let formerTicketSales = await models.Ticket.getSales(ctx, formerTicketId, options);
const completeSaleId = formerTicketSales[1].id;
let partialSaleTotalQuantity = formerTicketSales[0].quantity;
@ -161,8 +161,8 @@ describe('sale transferSales()', () => {
createdTicketId = createdTicket.id;
formerTicketSales = await models.Ticket.getSales(formerTicketId, options);
createdTicketSales = await models.Ticket.getSales(createdTicketId, options);
formerTicketSales = await models.Ticket.getSales(ctx, formerTicketId, options);
createdTicketSales = await models.Ticket.getSales(ctx, createdTicketId, options);
const [createdPartialSale] = createdTicketSales.filter(sale => {
return sale.id != completeSaleId;

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

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('summary', {
Self.remoteMethodCtx('summary', {
description: 'Returns a ticket summary',
accessType: 'READ',
accepts: [{
@ -19,7 +19,7 @@ module.exports = Self => {
}
});
Self.summary = async(ticketFk, options) => {
Self.summary = async(ctx, ticketFk, options) => {
const models = Self.app.models;
const myOptions = {};
@ -28,7 +28,7 @@ module.exports = Self => {
const summaryObj = await getTicketData(Self, ticketFk, myOptions);
summaryObj.sales = await models.Ticket.getSales(ticketFk, myOptions);
summaryObj.sales = await models.Ticket.getSales(ctx, ticketFk, myOptions);
summaryObj.packagings = await models.TicketPackaging.find({
where: {ticketFk: ticketFk},

2
modules/ticket/back/methods/ticket/transferSales.js
View File

@ -36,7 +36,7 @@ module.exports = Self => {
Self.transferSales = async(ctx, id, ticketId, sales, options) => {
const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId};
let tx;
if (typeof options == 'object')

2
modules/ticket/back/methods/ticket/updateDiscount.js
View File

@ -44,7 +44,7 @@ module.exports = Self => {
Self.updateDiscount = async(ctx, id, salesIds, newDiscount, manaCode, options) => {
const $t = ctx.req.__; // $translate
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
let tx;
if (typeof options == 'object')

6
modules/travel/back/methods/thermograph/createThermograph.js
View File

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('createThermograph', {
Self.remoteMethodCtx('createThermograph', {
description: 'Creates a new thermograph',
accessType: 'WRITE',
accepts: [{
@ -36,10 +36,10 @@ module.exports = Self => {
}
});
Self.createThermograph = async(thermographId, model, temperatureFk, warehouseId, options) => {
Self.createThermograph = async(ctx, thermographId, model, temperatureFk, warehouseId, options) => {
const models = Self.app.models;
let tx;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
const date = Date.vnNew();
if (typeof options == 'object')

7
modules/travel/back/methods/thermograph/specs/createThermograph.spec.js
View File

@ -5,6 +5,7 @@ describe('Termograph createThermograph()', () => {
const model = 'DISPOSABLE';
const temperatureFk = 'COOL';
const warehouseId = 1;
const ctx = {req: {accessToken: {userId: 9}}};
it(`should create a thermograph which is saved in both thermograph and travelThermograph`, async() => {
const tx = await models.Thermograph.beginTransaction({});
@ -12,7 +13,7 @@ describe('Termograph createThermograph()', () => {
try {
const options = {transaction: tx};
const createdThermograph = await models.Thermograph.createThermograph(thermographId, model, temperatureFk, warehouseId, options);
const createdThermograph = await models.Thermograph.createThermograph(ctx, thermographId, model, temperatureFk, warehouseId, options);
expect(createdThermograph.id).toEqual(thermographId);
expect(createdThermograph.model).toEqual(model);
@ -37,8 +38,8 @@ describe('Termograph createThermograph()', () => {
try {
const options = {transaction: tx};
await models.Thermograph.createThermograph(thermographId, model, temperatureFk, warehouseId, options);
await models.Thermograph.createThermograph(thermographId, model, temperatureFk, warehouseId, options);
await models.Thermograph.createThermograph(ctx, thermographId, model, temperatureFk, warehouseId, options);
await models.Thermograph.createThermograph(ctx, thermographId, model, temperatureFk, warehouseId, options);
await tx.rollback();
} catch (e) {

2
modules/travel/back/methods/travel/deleteThermograph.js
View File

@ -28,7 +28,7 @@ module.exports = Self => {
await Self.rawSql(`
UPDATE travelThermograph
SET travelFk = NULL, dmsFk = NULL
WHERE id = ?`, [id]);
WHERE id = ?`, [id], {userId});
const oldInstance = {
travelFk: travelThermograph.travelFk,

7
modules/worker/back/methods/department/getLeaves.js
View File

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('getLeaves', {
Self.remoteMethodCtx, ('getLeaves', {
description: 'Returns the nodes for a department',
accepts: [{
arg: 'parentId',
@ -20,10 +20,11 @@ module.exports = Self => {
}
});
Self.getLeaves = async(parentId = null, search) => {
Self.getLeaves = async(ctx, parentId = null, search) => {
let [res] = await Self.rawSql(
`CALL department_getLeaves(?, ?)`,
[parentId, search]
[parentId, search],
{userId: ctx.req.accessToken.userId}
);
let map = new Map();

6
modules/worker/back/methods/worker-time-control/addTimeEntry.js
View File

@ -33,15 +33,15 @@ module.exports = Self => {
Self.addTimeEntry = async(ctx, workerId, options) => {
const models = Self.app.models;
const args = ctx.args;
const currentUserId = ctx.req.accessToken.userId;
const myOptions = {};
const userId = ctx.req.accessToken.userId;
const myOptions = {userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
const isSubordinate = await models.Worker.isSubordinate(ctx, workerId, myOptions);
const isTeamBoss = await models.ACL.checkAccessAcl(ctx, 'Worker', 'isTeamBoss', 'WRITE');
const isHimself = currentUserId == workerId;
const isHimself = userId == workerId;
if (!isSubordinate || (isSubordinate && isHimself && !isTeamBoss))
throw new UserError(`You don't have enough privileges`);

6
modules/worker/back/methods/worker-time-control/deleteTimeEntry.js
View File

@ -22,10 +22,10 @@ module.exports = Self => {
});
Self.deleteTimeEntry = async(ctx, id, options) => {
const currentUserId = ctx.req.accessToken.userId;
const userId = ctx.req.accessToken.userId;
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId};
if (typeof options == 'object')
Object.assign(myOptions, options);
@ -33,7 +33,7 @@ module.exports = Self => {
const targetTimeEntry = await Self.findById(id, null, myOptions);
const isSubordinate = await models.Worker.isSubordinate(ctx, targetTimeEntry.userFk, myOptions);
const isTeamBoss = await models.ACL.checkAccessAcl(ctx, 'Worker', 'isTeamBoss', 'WRITE');
const isHimself = currentUserId == targetTimeEntry.userFk;
const isHimself = userId == targetTimeEntry.userFk;
if (isSubordinate === false || (isSubordinate && isHimself && !isTeamBoss))
throw new UserError(`You don't have enough privileges`);

2
modules/worker/back/methods/worker-time-control/sendMail.js
View File

@ -33,7 +33,7 @@ module.exports = Self => {
const conn = Self.dataSource.connector;
const args = ctx.args;
let tx;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

2
modules/worker/back/methods/worker/new.js
View File

@ -119,7 +119,7 @@ module.exports = Self => {
Self.new = async(ctx, options) => {
const models = Self.app.models;
const myOptions = {};
const myOptions = {userId: ctx.req.accessToken.userId};
const args = ctx.args;
let tx;

18
modules/worker/back/methods/worker/specs/new.spec.js
View File

@ -36,6 +36,7 @@ describe('Worker new', () => {
payMethodFk: 1,
roleFk: 1
};
const req = {accessToken: {userId: 9}};
it('should return error if personal mail already exists', async() => {
const user = await models.VnUser.findById(employeeId, {fields: ['email']});
@ -46,7 +47,8 @@ describe('Worker new', () => {
try {
const options = {transaction: tx};
const ctx = {
args: Object.assign({}, defaultWorker, {email: user.email})
args: Object.assign({}, defaultWorker, {email: user.email}),
req
};
await models.Worker.new(ctx, options);
@ -69,7 +71,8 @@ describe('Worker new', () => {
try {
const options = {transaction: tx};
const ctx = {
args: Object.assign({}, defaultWorker, {code: worker.code})
args: Object.assign({}, defaultWorker, {code: worker.code}),
req
};
await models.Worker.new(ctx, options);
@ -92,7 +95,8 @@ describe('Worker new', () => {
try {
const options = {transaction: tx};
const ctx = {
args: Object.assign({}, defaultWorker, {fi: worker.fi})
args: Object.assign({}, defaultWorker, {fi: worker.fi}),
req
};
await models.Worker.new(ctx, options);
@ -119,7 +123,8 @@ describe('Worker new', () => {
try {
const options = {transaction: tx};
const ctx = {
args: Object.assign({}, defaultWorker, {payMethodFk: payMethodIbanRequired.id})
args: Object.assign({}, defaultWorker, {payMethodFk: payMethodIbanRequired.id}),
req
};
await models.Worker.new(ctx, options);
@ -133,7 +138,7 @@ describe('Worker new', () => {
});
it('should create a new worker', async() => {
const newWorker = await models.Worker.new({args: defaultWorker});
const newWorker = await models.Worker.new({args: defaultWorker, req});
await models.Worker.destroyById(newWorker.id);
await models.Address.destroyAll({clientFk: newWorker.id});
@ -155,7 +160,8 @@ describe('Worker new', () => {
{
fi: client.fi,
email: client.email
})
}),
req
};
const newWorker = await models.Worker.new(newWorkerData);

6
modules/zone/back/methods/agency/getAgenciesWithWarehouse.js
View File

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('getAgenciesWithWarehouse', {
Self.remoteMethodCtx('getAgenciesWithWarehouse', {
description: 'Returns a list of agencies that can land a shipment on a day for an address and a warehouse',
accepts: [
{
@ -28,8 +28,8 @@ module.exports = Self => {
}
});
Self.getAgenciesWithWarehouse = async(addressFk, landed, warehouseFk, options) => {
const myOptions = {};
Self.getAgenciesWithWarehouse = async(ctx, addressFk, landed, warehouseFk, options) => {
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

6
modules/zone/back/methods/agency/landsThatDay.js
View File

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('landsThatDay', {
Self.remoteMethodCtx('landsThatDay', {
description: 'Returns a list of agencies that can land a shipment on a day for an address',
accepts: [
{
@ -22,8 +22,8 @@ module.exports = Self => {
}
});
Self.landsThatDay = async(addressFk, landed, options) => {
const myOptions = {};
Self.landsThatDay = async(ctx, addressFk, landed, options) => {
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

5
modules/zone/back/methods/agency/specs/getAgenciesWithWarehouse.spec.js
View File

@ -2,6 +2,7 @@ const app = require('vn-loopback/server/server');
describe('Agency getAgenciesWithWarehouse()', () => {
const today = Date.vnNew();
const ctx = {req: {accessToken: {userId: 9}}};
it('should return the agencies that can handle the given delivery request', async() => {
const tx = await app.models.Zone.beginTransaction({});
@ -9,7 +10,7 @@ describe('Agency getAgenciesWithWarehouse()', () => {
const options = {transaction: tx};
const addressId = 101;
const agencies = await app.models.Agency.getAgenciesWithWarehouse(addressId, today, 1, options);
const agencies = await app.models.Agency.getAgenciesWithWarehouse(ctx, addressId, today, 1, options);
expect(agencies.length).toEqual(3);
expect(agencies[0].agencyMode).toEqual('inhouse pickup');
@ -30,7 +31,7 @@ describe('Agency getAgenciesWithWarehouse()', () => {
const options = {transaction: tx};
const addressId = 101;
const agencies = await app.models.Agency.getAgenciesWithWarehouse(addressId, null, 1, options);
const agencies = await app.models.Agency.getAgenciesWithWarehouse(ctx, addressId, null, 1, options);
expect(agencies.length).toEqual(0);

3
modules/zone/back/methods/agency/specs/landsThatDay.spec.js
View File

@ -1,6 +1,7 @@
const {models} = require('vn-loopback/server/server');
describe('Agency landsThatDay()', () => {
const ctx = {req: {accessToken: {userId: 9}}};
const today = Date.vnNew();
it('should return a list of agencies that can land a shipment on a day for an address', async() => {
const tx = await models.Agency.beginTransaction({});
@ -8,7 +9,7 @@ describe('Agency landsThatDay()', () => {
try {
const options = {transaction: tx};
const agencies = await models.Agency.landsThatDay(101, today, options);
const agencies = await models.Agency.landsThatDay(ctx, 101, today, options);
expect(agencies.length).toBeGreaterThanOrEqual(3);

2
modules/zone/back/methods/zone/deleteZone.js
View File

@ -26,7 +26,7 @@ module.exports = Self => {
today.setHours(0, 0, 0, 0);
let tx;
const myOptions = {};
const myOptions = {userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

6
modules/zone/back/methods/zone/getEvents.js
View File

@ -1,6 +1,6 @@
module.exports = Self => {
Self.remoteMethod('getEvents', {
Self.remoteMethodCtx('getEvents', {
description: 'Returns delivery days for a postcode',
accepts: [
{
@ -25,8 +25,8 @@ module.exports = Self => {
}
});
Self.getEvents = async(geoFk, agencyModeFk, options) => {
const myOptions = {};
Self.getEvents = async(ctx, geoFk, agencyModeFk, options) => {
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

6
modules/zone/back/methods/zone/getLeaves.js
View File

@ -1,6 +1,6 @@
module.exports = Self => {
Self.remoteMethod('getLeaves', {
Self.remoteMethodCtx('getLeaves', {
description: 'Returns the nodes for a zone',
accepts: [
{
@ -31,8 +31,8 @@ module.exports = Self => {
}
});
Self.getLeaves = async(id, parentId = null, search, options) => {
const myOptions = {};
Self.getLeaves = async(ctx, id, parentId = null, search, options) => {
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

6
modules/zone/back/methods/zone/getUpcomingDeliveries.js
View File

@ -1,5 +1,5 @@
module.exports = Self => {
Self.remoteMethod('getUpcomingDeliveries', {
Self.remoteMethodCtx('getUpcomingDeliveries', {
description: 'Returns the upcomings deliveries',
accessType: 'READ',
accepts: [],
@ -13,8 +13,8 @@ module.exports = Self => {
}
});
Self.getUpcomingDeliveries = async options => {
const myOptions = {};
Self.getUpcomingDeliveries = async(ctx, options) => {
const myOptions = {userId: ctx.req.accessToken.userId};
if (typeof options == 'object')
Object.assign(myOptions, options);

3
modules/zone/back/methods/zone/specs/getEvents.spec.js
View File

@ -1,13 +1,14 @@
const models = require('vn-loopback/server/server').models;
describe('zone getEvents()', () => {
const ctx = {req: {accessToken: {userId: 9}}};
it('should return all events for the specified geo and agency mode', async() => {
const tx = await models.Zone.beginTransaction({});
try {
const options = {transaction: tx};
let result = await models.Zone.getEvents(20, 1, options);
let result = await models.Zone.getEvents(ctx, 20, 1, options);
expect(result.events.length).toEqual(10);

3
modules/zone/back/methods/zone/specs/getLeaves.spec.js
View File

@ -1,13 +1,14 @@
const models = require('vn-loopback/server/server').models;
describe('zone getLeaves()', () => {
const ctx = {req: {accessToken: {userId: 9}}};
it('should return the country and the childs containing the search value', async() => {
const tx = await models.Zone.beginTransaction({});
try {
const options = {transaction: tx};
let result = await models.Zone.getLeaves(1, null, '46000', options);
let result = await models.Zone.getLeaves(ctx, 1, null, '46000', options);
expect(result.length).toEqual(1);

3
modules/zone/back/methods/zone/specs/getUpcomingDeliveries.spec.js
View File

@ -1,12 +1,13 @@
const models = require('vn-loopback/server/server').models;
describe('zone getUpcomingDeliveries()', () => {
const ctx = {req: {accessToken: {userId: 9}}};
it('should check returns data', async() => {
const tx = await models.Zone.beginTransaction({});
try {
const options = {transaction: tx};
let result = await models.Zone.getUpcomingDeliveries(options);
let result = await models.Zone.getUpcomingDeliveries(ctx, options);
const firstResultLines = result[0].lines;
const secondResultLines = result[1].lines;