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

Merge branch '2150-travel_filter_by_ref' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Bernat Exposito 2020-02-27 12:57:44 +00:00 committed by Gitea
parent 94ebb7fbd2 ccd28114ca
commit 9d513878a1
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/travel/back/methods/travel/filter.js
View File

@ -63,6 +63,10 @@ module.exports = Self => {
type: 'Number',
description: 'The totalEntries filter',
http: {source: 'query'}
}, {
arg: 'ref',
type: 'string',
description: 'The reference'
}
],
returns: {
@ -80,9 +84,11 @@ module.exports = Self => {
let where = buildFilter(ctx.args, (param, value) => {
switch (param) {
case 'search':
return {'t.id': value};
return /^\d+$/.test(value)
? {'t.id': value}
: {'t.ref': {like: `%${value}%`}};
case 'ref':
return {[param]: {regexp: value}};
return {'t.ref': {like: `%${value}%`}};
case 'shippedFrom':
return {'t.shipped': {gte: value}};
case 'shippedTo':

33
modules/travel/back/methods/travel/specs/filter.spec.js
View File

@ -2,38 +2,53 @@ const app = require('vn-loopback/server/server');
describe('Travel filter()', () => {
it('should return the travel matching "search"', async() => {
let ctx = {
const ctx = {
args: {
search: 1
}
};
let result = await app.models.Travel.filter(ctx);
const result = await app.models.Travel.filter(ctx);
const firstRow = result[0];
expect(result.length).toEqual(1);
expect(result[0].id).toEqual(1);
expect(firstRow.id).toEqual(1);
});
it('should return the travel matching "search" by ref', async() => {
const ctx = {
args: {
search: 'third'
}
};
const result = await app.models.Travel.filter(ctx);
const firstRow = result[0];
expect(result.length).toEqual(1);
expect(firstRow.id).toEqual(3);
});
it('should return the travel matching "warehouse out"', async() => {
let ctx = {
const ctx = {
args: {
warehouseOutFk: 2
}
};
let result = await app.models.Travel.filter(ctx);
const result = await app.models.Travel.filter(ctx);
expect(result.length).toEqual(8);
});
it('should return the travel matching "total entries"', async() => {
let ctx = {
const ctx = {
args: {
totalEntries: 1,
}
};
let result = await app.models.Travel.filter(ctx);
const result = await app.models.Travel.filter(ctx);
expect(result.length).toEqual(5);
});
@ -44,14 +59,14 @@ describe('Travel filter()', () => {
from.setHours(0, 0, 0, 0);
to.setHours(23, 59, 59, 999);
to.setDate(to.getDate() + 1);
let ctx = {
const ctx = {
args: {
shippedFrom: from,
shippedTo: to
}
};
let result = await app.models.Travel.filter(ctx);
const result = await app.models.Travel.filter(ctx);
expect(result.length).toEqual(1);
});