From 40892580cd0d0f40add97080e7fed052602afb24 Mon Sep 17 00:00:00 2001 From: Gaetan Craig-Riou Date: Tue, 19 Mar 2024 11:27:37 +1100 Subject: [PATCH] Fix enterprise fee summary report spec --- .../reports/enterprise_fee_summary/scope.rb | 9 +------- spec/factories/variant_factory.rb | 2 +- .../enterprise_fee_summary_report_spec.rb | 22 +++++++++---------- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/lib/reporting/reports/enterprise_fee_summary/scope.rb b/lib/reporting/reports/enterprise_fee_summary/scope.rb index 7b6ed51425..39e6e20ffd 100644 --- a/lib/reporting/reports/enterprise_fee_summary/scope.rb +++ b/lib/reporting/reports/enterprise_fee_summary/scope.rb @@ -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? diff --git a/spec/factories/variant_factory.rb b/spec/factories/variant_factory.rb index 3d134c73c4..50da2702b0 100644 --- a/spec/factories/variant_factory.rb +++ b/spec/factories/variant_factory.rb @@ -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 { [] } diff --git a/spec/lib/reports/enterprise_fee_summary/enterprise_fee_summary_report_spec.rb b/spec/lib/reports/enterprise_fee_summary/enterprise_fee_summary_report_spec.rb index a11f40a7ac..ceeb312b5b 100644 --- a/spec/lib/reports/enterprise_fee_summary/enterprise_fee_summary_report_spec.rb +++ b/spec/lib/reports/enterprise_fee_summary/enterprise_fee_summary_report_spec.rb @@ -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 = {})