diff --git a/client/order/src/catalog/index.js b/client/order/src/catalog/index.js index 93944802be..8d2a362272 100644 --- a/client/order/src/catalog/index.js +++ b/client/order/src/catalog/index.js @@ -27,8 +27,9 @@ class Controller { name: $translate.instant('Descendant price') } ]; + this.orderBy = this.orderList[0].order; this.filter = { - order: this.orderList[0].order + order: this.orderBy }; } diff --git a/services/order/common/methods/order/specs/catalogFilter.spec.js b/services/order/common/methods/order/specs/catalogFilter.spec.js index 5832be45e0..598377a2db 100644 --- a/services/order/common/methods/order/specs/catalogFilter.spec.js +++ b/services/order/common/methods/order/specs/catalogFilter.spec.js @@ -3,15 +3,37 @@ const app = require(`${servicesDir}/order/server/server`); describe('order catalogFilter()', () => { it('should return an array of items', async() => { let filter = { - orderFk: 1, - where: { - typeFk: 1 - } + order: 'relevancy DESC, name' }; - let result = await app.models.Order.catalogFilter(filter); + let args = { + orderFk: 4, + categoryFk: 1, + typeFk: 2 + }; + + let tags = []; + let result = await app.models.Order.catalogFilter(filter, args, tags); let firstItemId = result[0].id; expect(result.length).toEqual(2); - expect(firstItemId).toEqual(3); + expect(firstItemId).toEqual(1); + }); + + it('should return an array of items based on tag filter', async() => { + let filter = { + order: 'relevancy DESC, name' + }; + let args = { + orderFk: 4, + categoryFk: 1, + typeFk: 2 + }; + + let tags = [{tagFk: 56, value: 'Object2'}]; + let result = await app.models.Order.catalogFilter(filter, args, tags); + let firstItemId = result[0].id; + + expect(result.length).toEqual(1); + expect(firstItemId).toEqual(2); }); });