default to v5 plans unlesss legacy? is true

Author: RobertJoonas

lib/plausible/billing/plans.ex

@@ -32,11 +32,11 @@ defmodule Plausible.Billing.Plans do
     end
   end
 
-  defp starter_plans_for(v5?) do
-    if v5? do
-      Enum.filter(plans_v5(), &(&1.kind == :starter))
-    else
+  defp starter_plans_for(legacy?) do
+    if legacy? do
       []
+    else
+      Enum.filter(plans_v5(), &(&1.kind == :starter))
     end
   end
 
@@ -47,10 +47,10 @@ defmodule Plausible.Billing.Plans do
   As new versions of plans are introduced, subscriptions which were on old plans can
   still choose from old plans.
   """
-  def growth_plans_for(subscription, v5? \\ false) do
+  def growth_plans_for(subscription, legacy? \\ false) do
     owned_plan = get_regular_plan(subscription)
 
-    default_plans = if v5?, do: plans_v5(), else: plans_v4()
+    default_plans = if legacy?, do: plans_v4(), else: plans_v5()
 
     cond do
       is_nil(owned_plan) -> default_plans
@@ -65,10 +65,10 @@ defmodule Plausible.Billing.Plans do
     |> Enum.filter(&(&1.kind == :growth))
   end
 
-  def business_plans_for(subscription, v5? \\ false) do
+  def business_plans_for(subscription, legacy? \\ false) do
     owned_plan = get_regular_plan(subscription)
 
-    default_plans = if v5?, do: plans_v5(), else: plans_v4()
+    default_plans = if legacy?, do: plans_v4(), else: plans_v5()
 
     cond do
       subscription && Subscriptions.expired?(subscription) -> default_plans
@@ -80,13 +80,13 @@ defmodule Plausible.Billing.Plans do
   end
 
   def available_plans_for(subscription, opts \\ []) do
-    v5? = Keyword.get(opts, :v5?, false)
+    legacy? = Keyword.get(opts, :legacy?, false)
 
     plans =
       Enum.concat([
-        starter_plans_for(v5?),
-        growth_plans_for(subscription, v5?),
-        business_plans_for(subscription, v5?)
+        starter_plans_for(legacy?),
+        growth_plans_for(subscription, legacy?),
+        business_plans_for(subscription, legacy?)
       ])
 
     plans =

lib/plausible_web/live/choose_plan.ex

@@ -41,11 +41,7 @@ defmodule PlausibleWeb.Live.ChoosePlan do
         current_user_subscription_interval(subscription)
       end)
       |> assign_new(:available_plans, fn %{subscription: subscription} ->
-        Plans.available_plans_for(subscription,
-          with_prices: true,
-          customer_ip: remote_ip,
-          v5?: true
-        )
+        Plans.available_plans_for(subscription, with_prices: true, customer_ip: remote_ip)
       end)
       |> assign_new(:recommended_tier, fn %{
                                             usage: usage,

lib/plausible_web/live/legacy_choose_plan.ex

@@ -49,7 +49,11 @@ defmodule PlausibleWeb.Live.LegacyChoosePlan do
         current_user_subscription_interval(subscription)
       end)
       |> assign_new(:available_plans, fn %{subscription: subscription} ->
-        Plans.available_plans_for(subscription, with_prices: true, customer_ip: remote_ip)
+        Plans.available_plans_for(subscription,
+          with_prices: true,
+          customer_ip: remote_ip,
+          legacy?: true
+        )
       end)
       |> assign_new(:recommended_tier, fn %{
                                             usage: usage,

test/plausible/billing/plans_test.exs

@@ -42,15 +42,15 @@ defmodule Plausible.Billing.PlansTest do
       |> team_of(with_subscription?: true)
       |> Map.fetch!(:subscription)
       |> Plans.growth_plans_for()
-      |> assert_generation(4)
+      |> assert_generation(5)
     end
 
     test "growth_plans_for/1 shows latest plans for everyone else" do
       new_user(trial_expiry_date: Date.utc_today())
       |> team_of(with_subscription?: true)
       |> Map.fetch!(:subscription)
       |> Plans.growth_plans_for()
-      |> assert_generation(4)
+      |> assert_generation(5)
     end
 
     test "growth_plans_for/1 does not return business plans" do
@@ -69,7 +69,7 @@ defmodule Plausible.Billing.PlansTest do
       |> team_of(with_subscription?: true)
       |> Map.fetch!(:subscription)
       |> Plans.growth_plans_for()
-      |> assert_generation(4)
+      |> assert_generation(5)
     end
 
     test "business_plans_for/1 returns v3 business plans for a user on a legacy plan" do
@@ -95,7 +95,7 @@ defmodule Plausible.Billing.PlansTest do
     test "business_plans_for/1 returns latest plans for invited users with trial_expiry = nil" do
       nil
       |> Plans.business_plans_for()
-      |> assert_generation(4)
+      |> assert_generation(5)
     end
 
     test "business_plans_for/1 returns latest plans for expired legacy subscriptions" do
@@ -107,7 +107,7 @@ defmodule Plausible.Billing.PlansTest do
       |> team_of(with_subscription?: true)
       |> Map.fetch!(:subscription)
       |> Plans.business_plans_for()
-      |> assert_generation(4)
+      |> assert_generation(5)
     end
 
     test "business_plans_for/1 returns latest business plans for everyone else" do
@@ -121,7 +121,7 @@ defmodule Plausible.Billing.PlansTest do
       business_plans = Plans.business_plans_for(subscription)
 
       assert Enum.all?(business_plans, &(&1.kind == :business))
-      assert_generation(business_plans, 4)
+      assert_generation(business_plans, 5)
     end
 
     test "available_plans returns all plans for user with prices when asked for" do