diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js index 665a55a4e0..694bb777d3 100644 --- a/modules/item/back/methods/item/filter.js +++ b/modules/item/back/methods/item/filter.js @@ -65,7 +65,7 @@ module.exports = Self => { } }); - filter = mergeFilters(filter, {where}); + filter = mergeFilters(ctx.args.filter, {where}); let stmt = new ParameterizedSQL( `SELECT i.id, i.image, i.name, i.description, @@ -86,9 +86,9 @@ module.exports = Self => { LEFT JOIN taxClass tc ON tc.id = i.taxClassFk` ); - if (tags) { + if (ctx.args.tags) { let i = 1; - for (let tag of tags) { + for (let tag of ctx.args.tags) { if (tag.value == null) continue; let tAlias = `it${i++}`; stmt.merge({ diff --git a/modules/item/back/methods/item/specs/filter.spec.js b/modules/item/back/methods/item/specs/filter.spec.js index 3e08e764d0..e21031f707 100644 --- a/modules/item/back/methods/item/specs/filter.spec.js +++ b/modules/item/back/methods/item/specs/filter.spec.js @@ -4,11 +4,10 @@ describe('item filter()', () => { it('should return 1 result using filter and tags', async() => { let filter = { order: 'isActive ASC, name', - limit: 8, - where: {and: [{typeFk: 2}]} + limit: 8 }; let tags = [{value: 'Gem2', tagFk: 58}]; - let result = await app.models.Item.filter(filter, tags); + let result = await app.models.Item.filter({args: {filter: filter, typeFk: 2, tags: tags}}); expect(result.length).toEqual(1); expect(result[0].id).toEqual(2);