From beabef7269db5a2259edf839f36d32e4bd2d8567 Mon Sep 17 00:00:00 2001 From: Vinicius Brasil Date: Tue, 4 Oct 2022 09:54:54 -0300 Subject: [PATCH] Redirect user after upgrading only when subscription is created (#2285) * Create API to check for an active subscription * Redirect after upgrading only when subscription is created * Change upgrade page copy * Add timeout notice to upgrade success page --- lib/plausible/billing/billing.ex | 17 ++++++- .../controllers/billing_controller.ex | 5 ++ lib/plausible_web/router.ex | 1 + .../billing/upgrade_success.html.eex | 47 ++++++++++++++++--- test/plausible/billing/billing_test.exs | 20 ++++++++ .../controllers/billing_controller_test.exs | 2 +- 6 files changed, 83 insertions(+), 9 deletions(-) diff --git a/lib/plausible/billing/billing.ex b/lib/plausible/billing/billing.ex index ef28e5e87..ad0762ee9 100644 --- a/lib/plausible/billing/billing.ex +++ b/lib/plausible/billing/billing.ex @@ -2,8 +2,23 @@ defmodule Plausible.Billing do use Plausible.Repo alias Plausible.Billing.Subscription + @spec active_subscription_for(integer()) :: Subscription.t() | nil def active_subscription_for(user_id) do - Repo.get_by(Subscription, user_id: user_id, status: "active") + user_id |> active_subscription_query() |> Repo.one() + end + + @spec has_active_subscription?(integer()) :: boolean() + def has_active_subscription?(user_id) do + user_id |> active_subscription_query() |> Repo.exists?() + end + + defp active_subscription_query(user_id) do + from( + s in Subscription, + where: s.user_id == ^user_id and s.status == "active", + order_by: [desc: s.inserted_at], + limit: 1 + ) end def subscription_created(params) do diff --git a/lib/plausible_web/controllers/billing_controller.ex b/lib/plausible_web/controllers/billing_controller.ex index 22dacba70..ccd8cd2f9 100644 --- a/lib/plausible_web/controllers/billing_controller.ex +++ b/lib/plausible_web/controllers/billing_controller.ex @@ -6,6 +6,11 @@ defmodule PlausibleWeb.BillingController do plug PlausibleWeb.RequireAccountPlug + def ping_subscription(%Plug.Conn{} = conn, _params) do + subscribed? = Billing.has_active_subscription?(conn.assigns.current_user.id) + json(conn, %{is_subscribed: subscribed?}) + end + def upgrade(conn, _params) do user = conn.assigns[:current_user] diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex index 8328d16f0..d86049d50 100644 --- a/lib/plausible_web/router.ex +++ b/lib/plausible_web/router.ex @@ -172,6 +172,7 @@ defmodule PlausibleWeb.Router do get "/billing/upgrade/enterprise/:plan_id", BillingController, :upgrade_enterprise_plan get "/billing/change-plan/enterprise/:plan_id", BillingController, :change_enterprise_plan get "/billing/upgrade-success", BillingController, :upgrade_success + get "/billing/subscription/ping", BillingController, :ping_subscription get "/sites", SiteController, :index get "/sites/new", SiteController, :new diff --git a/lib/plausible_web/templates/billing/upgrade_success.html.eex b/lib/plausible_web/templates/billing/upgrade_success.html.eex index 4990bbacf..524226e3e 100644 --- a/lib/plausible_web/templates/billing/upgrade_success.html.eex +++ b/lib/plausible_web/templates/billing/upgrade_success.html.eex @@ -1,18 +1,51 @@
-
+
- Subscription created successfully + Your account is being upgraded...
-
- Thank you for upgrading your subscription. You will be redirected to your - account within 5 seconds. -
+

+ Thank you for upgrading your subscription! We're still working on + upgrading your account, and you'll be automatically redirected in a few + seconds. +

+ +
diff --git a/test/plausible/billing/billing_test.exs b/test/plausible/billing/billing_test.exs index afe5f7dba..61984dc66 100644 --- a/test/plausible/billing/billing_test.exs +++ b/test/plausible/billing/billing_test.exs @@ -594,4 +594,24 @@ defmodule Plausible.BillingTest do assert subscription.next_bill_amount == "6.00" end end + + test "active_subscription_for/1 returns active subscription" do + active = insert(:subscription, user: insert(:user), status: "active") + paused = insert(:subscription, user: insert(:user), status: "paused") + user_without_subscription = insert(:user) + + assert Billing.active_subscription_for(active.user_id).id == active.id + assert Billing.active_subscription_for(paused.user_id) == nil + assert Billing.active_subscription_for(user_without_subscription.id) == nil + end + + test "has_active_subscription?/1 returns whether the user has an active subscription" do + active = insert(:subscription, user: insert(:user), status: "active") + paused = insert(:subscription, user: insert(:user), status: "paused") + user_without_subscription = insert(:user) + + assert Billing.has_active_subscription?(active.user_id) + refute Billing.has_active_subscription?(paused.user_id) + refute Billing.has_active_subscription?(user_without_subscription.id) + end end diff --git a/test/plausible_web/controllers/billing_controller_test.exs b/test/plausible_web/controllers/billing_controller_test.exs index d193b0954..06b456a5f 100644 --- a/test/plausible_web/controllers/billing_controller_test.exs +++ b/test/plausible_web/controllers/billing_controller_test.exs @@ -143,7 +143,7 @@ defmodule PlausibleWeb.BillingControllerTest do test "shows success page after user subscribes", %{conn: conn} do conn = get(conn, "/billing/upgrade-success") - assert html_response(conn, 200) =~ "Subscription created successfully" + assert html_response(conn, 200) =~ "Your account is being upgraded" end end end