Skip to content

#40 - ignore non zero included price quantities #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phillipn wants to merge 2 commits into
base: main
Choose a base branch
from
Open

#40 - ignore non zero included price quantities #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b087f7f
ignore non zero
Aug 21, 2023
62bcd39
clean up the ruby
Aug 21, 2023
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
11 changes: 10 additions & 1 deletion app/models/billing/usage/product_catalog.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def self.all_products
end

def current_products
products = parent.team.billing_subscriptions.active.map(&:included_prices).flatten.map(&:price).map(&:product)
products = non_zero_included_prices.map(&:price).compact.map(&:product).compact

@phillipn phillipn Aug 21, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added these compacts to prevent breakages in the event of a dev or someone removing a product or price from the products.yml

products.any? ? products : free_products
end

Expand All @@ -29,4 +29,13 @@ def free_products
protected

attr_reader :parent

def non_zero_included_prices
parent
.team
.billing_subscriptions
.active
.flat_map(&:included_prices)
.select { |included_price| included_price.quantity && included_price.quantity > 0 }

@phillipn phillipn Aug 21, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have added a scope, but I am worried about repos like CF that have already cloned the starter repo. I.e. if I were to deploy a new scope, and upgrade CF, everything would break because we override the IncludedPrice model, and there would be no scope definition in there.

end
end