Skip to content

WIP refactor: remove code duplication in billing controller #3281

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
nelsonmestevao wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP refactor: remove code duplication in billing controller #3281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
97 changes: 12 additions & 85 deletions lib/logflare_web/controllers/billing_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ defmodule LogflareWeb.BillingController do
) do
plan = Billing.get_plan_by(stripe_id: stripe_id)

with false <- billing_accoount_has_subscription?(billing_account),
with false <- billing_account_has_subscription?(billing_account),
{:ok, session} <- Stripe.create_payment_session(user, plan) do
conn
|> put_session(:stripe_session, session)
Expand All @@ -119,7 +119,7 @@ defmodule LogflareWeb.BillingController do
%{"stripe_id" => stripe_id, "type" => "metered"}
) do
with plan <- Billing.get_plan_by(stripe_id: stripe_id),
false <- billing_accoount_has_subscription?(billing_account),
false <- billing_account_has_subscription?(billing_account),
false <- billing_account.lifetime_plan,
{:ok, session} <- Stripe.create_metered_customer_session(user, plan) do
conn
Expand All @@ -141,7 +141,7 @@ defmodule LogflareWeb.BillingController do
%{"stripe_id" => stripe_id}
) do
with plan <- Billing.get_plan_by(stripe_id: stripe_id),
false <- billing_accoount_has_subscription?(billing_account),
false <- billing_account_has_subscription?(billing_account),
{:ok, session} <- Stripe.create_customer_session(user, plan) do
conn
|> put_session(:stripe_session, session)
Expand All @@ -161,13 +161,14 @@ defmodule LogflareWeb.BillingController do
%{
assigns: %{
user: %User{billing_account: billing_account, sources: sources} = _user,
plan: %Billing.Plan{type: "standard"}
plan: %Billing.Plan{type: billing_plan_type}
}
} = conn,
%{"plan" => plan_id, "type" => "metered"}
) do
%{"plan" => plan_id, "type" => type}
)
when billing_plan_type in ["standard", "metered"] and type in ["standard", "metered"] do
with plan <- Billing.get_plan!(plan_id),
true <- billing_accoount_has_subscription?(billing_account),
true <- billing_account_has_subscription?(billing_account),
{:ok, _response} <- Stripe.change_to_metered_subscription(billing_account, sources, plan) do
success_and_redirect(conn, "Plan successfully changed!")
else
Expand All @@ -181,80 +182,6 @@ defmodule LogflareWeb.BillingController do
end
end

def change_subscription(
Copy link
Copy Markdown
Contributor

@Ziinc Ziinc Mar 16, 2026

Choose a reason for hiding this comment

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

Do we have test coverage for this consolidation?

%{
assigns: %{
user: %User{billing_account: billing_account, sources: sources} = _user,
plan: %Billing.Plan{type: "metered"}
}
} = conn,
%{"plan" => plan_id, "type" => "metered"}
) do
with plan <- Billing.get_plan!(plan_id),
true <- billing_accoount_has_subscription?(billing_account),
{:ok, _response} <-
Stripe.change_from_metered_subscription(billing_account, sources, plan) do
success_and_redirect(conn, "Plan successfully changed!")
else
false ->
error_and_redirect(conn, "You need a subscription to change first!")

err ->
Logger.error("Billing error: #{inspect(err)}", %{billing: %{error_string: inspect(err)}})

error_and_redirect(conn, @default_error_message)
end
end

def change_subscription(
%{
assigns: %{
user: %User{billing_account: billing_account, sources: sources} = _user,
plan: %Billing.Plan{type: "standard"}
}
} = conn,
%{"plan" => plan_id, "type" => "standard"}
) do
with plan <- Billing.get_plan!(plan_id),
true <- billing_accoount_has_subscription?(billing_account),
{:ok, _response} <- Stripe.change_subscription(billing_account, sources, plan) do
success_and_redirect(conn, "Plan successfully changed!")
else
false ->
error_and_redirect(conn, "You need a subscription to change first!")

err ->
Logger.error("Billing error: #{inspect(err)}", %{billing: %{error_string: inspect(err)}})

error_and_redirect(conn, @default_error_message)
end
end

def change_subscription(
%{
assigns: %{
user: %User{billing_account: billing_account, sources: sources} = _user,
plan: %Billing.Plan{type: "metered"}
}
} = conn,
%{"plan" => plan_id, "type" => "standard"}
) do
with plan <- Billing.get_plan!(plan_id),
true <- billing_accoount_has_subscription?(billing_account),
{:ok, _response} <-
Stripe.change_from_metered_subscription(billing_account, sources, plan) do
success_and_redirect(conn, "Plan successfully changed!")
else
false ->
error_and_redirect(conn, "You need a subscription to change first!")

err ->
Logger.error("Billing error: #{inspect(err)}", %{billing: %{error_string: inspect(err)}})

error_and_redirect(conn, @default_error_message)
end
end

def portal(
%{assigns: %{user: %User{billing_account: billing_account}} = _user} = conn,
_params
Expand All @@ -275,7 +202,7 @@ defmodule LogflareWeb.BillingController do
%{assigns: %{user: %User{billing_account: billing_account}} = _user} = conn,
_params
) do
with true <- billing_accoount_has_subscription?(billing_account),
with true <- billing_account_has_subscription?(billing_account),
{:ok, session} <- Stripe.create_add_credit_card_session(billing_account) do
conn
|> put_session(:stripe_session, session)
Expand Down Expand Up @@ -406,9 +333,9 @@ defmodule LogflareWeb.BillingController do
end
end

defp billing_accoount_has_subscription?(billing_account) do
if subcriptions = billing_account.stripe_subscriptions["data"] do
Enum.count(subcriptions) > 0
defp billing_account_has_subscription?(billing_account) do
if subscriptions = billing_account.stripe_subscriptions["data"] do
Enum.count(subscriptions) > 0
else
false
end
Expand Down
Loading