Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/presenters/convention_reports_presenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ def sales_count_by_product_and_payment_amount
.completed
.left_joins(:order_entries)
.group(
:product_id,
"order_entries.product_id",
:status,
"COALESCE(price_per_item_cents, 0)",
"COALESCE(price_per_item_currency, #{ActiveRecord::Base.connection.quote(convention.default_currency_code_or_site_default)})"
)
.where.not(product_id: nil)
.where.not(order_entries: { product_id: nil })
.pluck(
:product_id,
"order_entries.product_id",
:status,
Arel.sql("COALESCE(price_per_item_cents, 0)"),
Arel.sql(
Expand Down
15 changes: 15 additions & 0 deletions test/presenters/convention_reports_presenter_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,21 @@ class ConventionReportsPresenterTest < ActiveSupport::TestCase
let(:other_convention) { create(:convention, organization:, ticket_mode: "required_for_signup") }
let(:presenter) { ConventionReportsPresenter.new(convention) }

describe "#sales_count_by_product_and_payment_amount" do
it "counts completed order entries grouped by product" do
profile = create(:user_con_profile, convention:)
product = create(:product, convention:)
order = create(:order, user_con_profile: profile, status: "paid")
create(:order_entry, order:, product:, quantity: 2, price_per_item_cents: 1000, price_per_item_currency: "USD")

result = presenter.sales_count_by_product_and_payment_amount

assert_equal 1, result.length
assert_equal product.id, result.first[:product_id]
assert_equal 2, result.first[:count]
end
end

describe "#new_and_returning_attendees" do
it "returns a new attendee who only has a ticket at this convention" do
profile = create(:user_con_profile, convention:)
Expand Down
Loading