raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-08 22:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass the variant_tag_enbabled options to relevant services

Browse Source 
Plus add integration testing for variant tag rule filtering.
This commit is contained in:
Gaetan Craig-Riou
2025-09-17 15:52:26 +10:00
parent 7633af8ff2
commit c38c8bcff2
2 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/api/v0/order_cycles_controller.rb
View File

@@ -23,7 +23,8 @@ module Api
order_cycle,
customer,
search_params,
inventory_enabled:
inventory_enabled:,
variant_tag_enabled:
).products_json
render plain: products
@@ -96,13 +97,17 @@ module Api
def distributed_products
OrderCycles::DistributedProductsService.new(
distributor, order_cycle, customer, inventory_enabled:
distributor, order_cycle, customer, inventory_enabled:, variant_tag_enabled:,
).products_relation.pluck(:id)
end
def inventory_enabled
OpenFoodNetwork::FeatureToggle.enabled?(:inventory, distributor)
end
def variant_tag_enabled
OpenFoodNetwork::FeatureToggle.enabled?(:variant_tag, distributor)
end
end
end
end

59
spec/controllers/api/v0/order_cycles_controller_spec.rb
View File

@@ -132,7 +132,7 @@ RSpec.describe Api::V0::OrderCyclesController do
end
end
context "when tag rules apply", feature: :inventory do
context "when inventory tag rules apply", feature: :inventory do
let!(:vo1) {
create(:variant_override,
hub: distributor,
@@ -201,6 +201,63 @@ RSpec.describe Api::V0::OrderCyclesController do
end
end
context "when variant tag rules apply", feature: :variant_tag do
let!(:variant1) { product1.variants.first.tap { |v| v.update(supplier: distributor) } }
let!(:variant2) { product2.variants.first.tap { |v| v.update(supplier: distributor) } }
let!(:variant3) { product3.variants.first.tap { |v| v.update(supplier: distributor) } }
let(:default_hide_rule) {
create(:filter_variants_tag_rule,
enterprise: distributor,
is_default: true,
preferred_variant_tags: "hide_these_variants_from_everyone",
preferred_matched_variants_visibility: "hidden")
}
let(:hide_rule) {
create(:filter_variants_tag_rule,
enterprise: distributor,
preferred_variant_tags: "hide_these_variants",
preferred_customer_tags: "hide_from_these_customers",
preferred_matched_variants_visibility: "hidden" )
}
let(:show_rule) {
create(:filter_variants_tag_rule,
enterprise: distributor,
preferred_variant_tags: "show_these_variants",
preferred_customer_tags: "show_for_these_customers",
preferred_matched_variants_visibility: "visible" )
}
it "does not return variants hidden by general rules" do
variant1.update_attribute(:tag_list, default_hide_rule.preferred_variant_tags)
api_get :products, id: order_cycle.id, distributor: distributor.id
expect(product_ids).not_to include product1.id
end
it "does not return variants hidden for this specific customer" do
variant2.update_attribute(:tag_list, hide_rule.preferred_variant_tags)
customer.update_attribute(:tag_list, hide_rule.preferred_customer_tags)
api_get :products, id: order_cycle.id, distributor: distributor.id
expect(product_ids).not_to include product2.id
end
it "returns hidden variants made visible for this specific customer" do
variant1.update_attribute(:tag_list, default_hide_rule.preferred_variant_tags)
variant3.update_attribute(:tag_list,
"#{show_rule.preferred_variant_tags}," \
"#{default_hide_rule.preferred_variant_tags}")
customer.update_attribute(:tag_list, show_rule.preferred_customer_tags)
api_get :products, id: order_cycle.id, distributor: distributor.id
expect(product_ids).not_to include product1.id
expect(product_ids).to include product3.id
end
end
context "when the order cycle is closed" do
before do
allow(controller).to receive(:order_cycle) { order_cycle }