raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-28 01:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix property filters and improve test coverage

Browse Source
This commit is contained in:
Matt-Yorkley
2019-10-15 09:26:53 +01:00
parent c730958fe4
commit cbe2477d04
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
View File

@@ -57,7 +57,7 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord
page: page || $scope.page,
per_page: $scope.per_page,
'q[name_or_meta_keywords_or_supplier_name_cont]': $scope.query,
'q[properites_in_any][]': $scope.activeProperties,
'q[properties_id_in_any][]': $scope.activeProperties,
'q[primary_taxon_id_in_any][]': $scope.activeTaxons
}

4
app/controllers/api/order_cycles_controller.rb
View File

@@ -51,7 +51,9 @@ module Api
end
def permitted_ransack_params
[:name_or_meta_keywords_or_supplier_name_cont, :properites_in_any, :primary_taxon_id_in_any]
[:name_or_meta_keywords_or_supplier_name_cont,
:properties_id_in_any,
:primary_taxon_id_in_any]
end
def distributor

31
spec/controllers/api/order_cycles_controller_spec.rb
View File

@@ -29,7 +29,6 @@ module Api
it "loads products for distributed products in the order cycle" do
api_get :products, id: order_cycle.id, distributor: distributor.id
product_ids = json_response.map{ |product| product['id'] }
expect(product_ids).to include product1.id, product2.id, product3.id
end
@@ -57,11 +56,30 @@ module Api
it "does not return products where the variant overrides are out of stock" do
api_get :products, id: order_cycle.id, distributor: distributor.id
product_ids = json_response.map{ |product| product['id'] }
expect(product_ids).to_not include product2.id
end
end
context "with property filters" do
it "filters by product property" do
api_get :products, id: order_cycle.id, distributor: distributor.id,
q: { properties_id_in_any: [property1.id, property2.id] }
expect(product_ids).to include product1.id, product2.id
expect(product_ids).to_not include product3.id
end
end
context "with taxon filters" do
it "filters by taxon" do
api_get :products, id: order_cycle.id, distributor: distributor.id,
q: { primary_taxon_id_in_any: [taxon2.id] }
expect(product_ids).to include product2.id, product3.id
expect(product_ids).to_not include product1.id, product4.id
end
end
context "when tag rules apply" do
let!(:vo1) {
create(:variant_override,
@@ -105,7 +123,6 @@ module Api
api_get :products, id: order_cycle.id, distributor: distributor.id
product_ids = json_response.map{ |product| product['id'] }
expect(product_ids).to_not include product1.id
end
@@ -115,7 +132,6 @@ module Api
api_get :products, id: order_cycle.id, distributor: distributor.id
product_ids = json_response.map{ |product| product['id'] }
expect(product_ids).to_not include product2.id
end
@@ -126,7 +142,6 @@ module Api
api_get :products, id: order_cycle.id, distributor: distributor.id
product_ids = json_response.map{ |product| product['id'] }
expect(product_ids).to_not include product1.id
expect(product_ids).to include product3.id
end
@@ -154,5 +169,11 @@ module Api
expect(properties).to include property1.presentation, property2.presentation
end
end
private
def product_ids
json_response.map{ |product| product['id'] }
end
end
end