More robust enterprise plan setup (#1407)

Author: michaeljguarino

apps/core/lib/core/services/payments.ex

@@ -675,6 +675,15 @@ defmodule Core.Services.Payments do
   defp discount(amount, :yearly), do: round(9 * amount / 10) * 12
   defp discount(amount, _), do: amount
 
+  def setup_enterprise_plan(%User{} = user) do
+    case Repo.preload(user, [account: [subscription: :plan]]) do
+      %{account: %Account{} = account} ->
+        with {:ok, _} <- remove_trial(account),
+          do: setup_enterprise_plan(user.account_id)
+      _ -> setup_enterprise_plan(user.account_id)
+    end
+  end
+
   def setup_enterprise_plan(account_id) do
     plan = get_platform_plan_by_name!("Enterprise")
 

apps/core/test/services/payments_test.exs

@@ -869,6 +869,19 @@ defmodule Core.Services.PaymentsTest do
       assert subscription.plan_id == plan.id
       refute subscription.external_id
     end
+
+    test "it will set up a plan for a user with a trial" do
+      plan = insert(:platform_plan, name: "Enterprise", enterprise: true)
+      trial = insert(:platform_plan, name: "Pro Trial", trial: true)
+      account = insert(:account)
+      insert(:platform_subscription, account: account, plan: trial)
+      user = insert(:user, account: account)
+
+      {:ok, subscription} = Payments.setup_enterprise_plan(user)
+
+      assert subscription.account_id == account.id
+      assert subscription.plan_id == plan.id
+    end
   end
 
   describe "#begin_trail/1" do