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

Fix enterprise fee summary report spec

Browse Source
This commit is contained in:
Gaetan Craig-Riou
2024-03-19 11:27:37 +11:00
parent 323602abbb
commit 40892580cd
3 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/reporting/reports/enterprise_fee_summary/scope.rb
View File

@@ -224,13 +224,6 @@ module Reporting
JOIN_STRING
)
join_scope(
<<~JOIN_STRING
LEFT OUTER JOIN spree_products
ON (spree_products.id = spree_variants.product_id)
JOIN_STRING
)
join_scope(
<<~JOIN_STRING
LEFT OUTER JOIN spree_tax_categories AS product_tax_categories
@@ -324,7 +317,7 @@ module Reporting
def filter_by_distribution(params)
filter_scope(spree_orders: { distributor_id: params.distributor_ids }) \
if params.distributor_ids.present?
filter_scope(spree_products: { supplier_id: params.producer_ids }) \
filter_scope(spree_variants: { supplier_id: params.producer_ids }) \
if params.producer_ids.present?
filter_scope(spree_orders: { order_cycle_id: params.order_cycle_ids }) \
if params.order_cycle_ids.present?

2
spec/factories/variant_factory.rb
View File

@@ -38,7 +38,7 @@ FactoryBot.define do
trait :with_order_cycle do
transient do
order_cycle { create(:order_cycle) }
producer { product.supplier }
producer { supplier }
coordinator { create(:distributor_enterprise) }
distributor { create(:distributor_enterprise) }
incoming_exchange_fees { [] }

22
spec/lib/reports/enterprise_fee_summary/enterprise_fee_summary_report_spec.rb
View File

@@ -523,21 +523,21 @@ RSpec.describe Reporting::Reports::EnterpriseFeeSummary::FeeSummary do
let!(:producer_c) { create(:supplier_enterprise, name: "Producer C") }
let!(:fee_a) { create(:enterprise_fee, name: "Fee A", enterprise: producer_a, amount: 1) }
let!(:fee_b) { create(:enterprise_fee, name: "Fee B", enterprise: producer_b, amount: 1) }
let!(:fee_c) { create(:enterprise_fee, name: "Fee C", enterprise: producer_c, amount: 1) }
let!(:fee_b) { create(:enterprise_fee, name: "Fee B", enterprise: producer_b, amount: 2) }
let!(:fee_c) { create(:enterprise_fee, name: "Fee C", enterprise: producer_c, amount: 3) }
let!(:product_a) { create(:product, supplier: producer_a) }
let!(:product_b) { create(:product, supplier: producer_b) }
let!(:product_c) { create(:product, supplier: producer_c) }
let!(:product_a) { create(:product, supplier_id: producer_a.id) }
let!(:product_b) { create(:product, supplier_id: producer_b.id) }
let!(:product_c) { create(:product, supplier_id: producer_c.id) }
let!(:variant_a) do
prepare_variant(product: product_a, producer: producer_a, incoming_exchange_fees: [fee_a])
prepare_variant(product: product_a, supplier: producer_a, incoming_exchange_fees: [fee_a])
end
let!(:variant_b) do
prepare_variant(product: product_b, producer: producer_b, incoming_exchange_fees: [fee_b])
prepare_variant(product: product_b, supplier: producer_b, incoming_exchange_fees: [fee_b])
end
let!(:variant_c) do
prepare_variant(product: product_c, producer: producer_c, incoming_exchange_fees: [fee_c])
prepare_variant(product: product_c, supplier: producer_c, incoming_exchange_fees: [fee_c])
end
let!(:order_a) { prepare_order(variant: variant_a) }
@@ -697,8 +697,7 @@ RSpec.describe Reporting::Reports::EnterpriseFeeSummary::FeeSummary do
end
def default_order_options
{ customer:, distributor:, order_cycle:,
shipping_method:, variant: }
{ customer:, distributor:, order_cycle:, shipping_method:, variant: }
end
def prepare_incomplete_order(options = {})
@@ -713,8 +712,7 @@ RSpec.describe Reporting::Reports::EnterpriseFeeSummary::FeeSummary do
end
def default_variant_options
{ product:, producer:, coordinator:,
distributor:, order_cycle: }
{ product:, coordinator:, distributor:, order_cycle: }
end
def prepare_variant(options = {})