Merge pull request #13084 from abdulazizali77/bugfix/11529-report-by-enterprise-fee-from-lineitems

Fetch variant enterprise fees from order lineitems adjustments #11529

lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_producer.rb

@@ -85,13 +85,14 @@ module Reporting
             query = order
               .all_adjustments
               .enterprise_fee
-              .where(originator_id: enterprise_fees_related_to_incoming_exchanges_ids(order))
+              .joins(:metadata)
+              .where(adjustment_metadata: { enterprise_role: 'supplier' })
 
             if enterprise_fee_filters?
               query = query.where(originator_id: enterprise_fee_filtered_ids)
             end
-            query.group('originator_id')
-              .pluck("originator_id", 'array_agg(id)')
+            query.group('spree_adjustments.id', 'originator_id')
+              .pluck("originator_id", 'array_agg(spree_adjustments.id)')
               .map do |enterprise_fee_id, enterprise_fee_adjustment_ids|
                 {
                   enterprise_fee_id:,
@@ -161,11 +162,9 @@ module Reporting
         # { variant: [enterprise_fee_ids] }
         def enterprise_fees_per_variant(order)
           hash = {}
-          order.order_cycle.exchanges.each do |exchange|
-            exchange.variants.each do |variant|
-              hash[variant] ||= order.order_cycle.coordinator_fee_ids
-              hash[variant] += exchange.enterprise_fee_ids
-            end
+          order.line_items.each do |li|
+            hash[li.variant] ||= order.order_cycle.coordinator_fee_ids
+            hash[li.variant] += li.adjustments.enterprise_fee.map(&:originator_id)
           end
           hash
         end

spec/lib/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_producer_spec.rb

@@ -55,7 +55,6 @@ RSpec.describe Reporting::Reports::EnterpriseFeeSummary::EnterpriseFeesWithTaxRe
 
     report = described_class.new(current_user)
 
-    pending "https://github.com/openfoodfoundation/openfoodnetwork/issues/11529"
     expect(report.query_result.values).to eq [[order]]
   end
 end