Merge pull request #632 from code-corps/fix-validator

Fix validator

Author: joshsmith

lib/code_corps/stripe_service/stripe_connect_plan.ex

@@ -48,6 +48,6 @@ defmodule CodeCorps.StripeService.StripeConnectPlanService do
   defp get_project(project_id) do
     Project
     |> Repo.get(project_id)
-    |> Repo.preload([:donation_goals, {:organization, :stripe_connect_account}])
+    |> Repo.preload([:donation_goals, {:organization, :stripe_connect_account}, :stripe_connect_plan])
   end
 end

lib/code_corps/stripe_service/validators/project_can_enable_donations.ex

@@ -3,7 +3,7 @@ defmodule CodeCorps.StripeService.Validators.ProjectCanEnableDonations do
   Ensures a `CodeCorps.Project` is able to receive subscriptions.
   """
 
-  alias CodeCorps.{Organization, Project, StripeConnectAccount}
+  alias CodeCorps.{Organization, Project, StripeConnectAccount, StripeConnectPlan}
 
   @doc """
   Determines if the provided `CodeCorps.Project` can enable donations.
@@ -23,11 +23,10 @@ defmodule CodeCorps.StripeService.Validators.ProjectCanEnableDonations do
   """
   def validate(%Project{} = project), do: do_validate(project)
 
-  @invalid {:error, :project_not_ready}
-
+  defp do_validate(%Project{stripe_connect_plan: %StripeConnectPlan{}}), do: {:error, :project_has_plan}
   defp do_validate(%Project{
     donation_goals: [_h | _t],
     organization: %Organization{stripe_connect_account: %StripeConnectAccount{charges_enabled: true, transfers_enabled: true}}
   } = project), do: {:ok, project}
-  defp do_validate(_), do: @invalid
+  defp do_validate(_), do: {:error, :project_not_ready}
 end

mix.lock

@@ -56,7 +56,7 @@
   "segment": {:hex, :segment, "0.1.1", "47bf9191590e7a533c105d1e21518e0d6da47c91e8d98ebb649c624db5dfc359", [:mix], [{:httpoison, "~> 0.8", [hex: :httpoison, optional: false]}, {:poison, "~> 1.3 or ~> 2.0", [hex: :poison, optional: false]}]},
   "sentry": {:hex, :sentry, "2.1.0", "51e7ca261b519294ac73b30763893c4a7ad2005205514aefa5bf37ccb83e44ea", [:mix], [{:hackney, "~> 1.6.1", [hex: :hackney, optional: false]}, {:plug, "~> 1.0", [hex: :plug, optional: true]}, {:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, optional: false]}, {:uuid, "~> 1.0", [hex: :uuid, optional: false]}]},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.0", "edee20847c42e379bf91261db474ffbe373f8acb56e9079acb6038d4e0bf414f", [:make, :rebar], []},
-  "stripity_stripe": {:git, "https://github.com/code-corps/stripity_stripe.git", "f29a3308136594f976d8e165100385628e2eece2", [branch: "2.0"]},
+  "stripity_stripe": {:git, "https://github.com/code-corps/stripity_stripe.git", "9e74bd330e3013b5fd8e13874177d1bbf27d4bbf", [branch: "2.0"]},
   "sweet_xml": {:hex, :sweet_xml, "0.6.3", "814265792baeb163421811c546581c522dfdcb9d1767b1e59959c52906414e80", [:mix], []},
   "timber": {:hex, :timber, "0.4.7", "df3fcd79bcb4eb4b53874d906ef5f3a212937b4bc7b7c5b244745202cc389443", [:mix], [{:ecto, "~> 2.0", [hex: :ecto, optional: true]}, {:phoenix, "~> 1.2", [hex: :phoenix, optional: true]}, {:plug, "~> 1.2", [hex: :plug, optional: true]}, {:poison, "~> 2.0 or ~> 3.0", [hex: :poison, optional: false]}]},
   "timex": {:hex, :timex, "3.1.5", "413d6d8d6f0162a5d47080cb8ca520d790184ac43e097c95191c7563bf25b428", [:mix], [{:combine, "~> 0.7", [hex: :combine, optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, optional: false]}, {:tzdata, "~> 0.1.8 or ~> 0.5", [hex: :tzdata, optional: false]}]},

test/lib/code_corps/stripe_service/validators/project_can_enable_donations_test.exs

@@ -0,0 +1,42 @@
+defmodule CodeCorps.StripeService.Validators.ProjectCanEnableDonationsTest do
+  use ExUnit.Case, async: true
+
+  use CodeCorps.ModelCase
+
+  alias CodeCorps.{Project}
+  alias CodeCorps.StripeService.Validators.ProjectCanEnableDonations
+
+  describe "validate" do
+    test "succeeds when project has donation_goals and organization where charges and transfers are enabled" do
+      organization = insert(:organization)
+      project = insert(:project, organization: organization)
+      insert(:donation_goal, project: project)
+      insert(:stripe_connect_account, organization: organization, charges_enabled: true, transfers_enabled: true)
+
+      project =
+        Project
+        |> Repo.get(project.id)
+        |> Repo.preload([:donation_goals, [organization: :stripe_connect_account], :stripe_connect_plan])
+
+      assert {:ok, _project} = ProjectCanEnableDonations.validate(project)
+    end
+
+    test "fails when project has a StripeConnectPlan" do
+      project = insert(:project)
+      insert(:stripe_connect_plan, project: project)
+
+      project =
+        Project
+        |> Repo.get(project.id)
+        |> Repo.preload([:stripe_connect_plan])
+
+      assert {:error, :project_has_plan} = ProjectCanEnableDonations.validate(project)
+    end
+
+    test "fails when project is not ready" do
+      project = insert(:project)
+
+      assert {:error, :project_not_ready} = ProjectCanEnableDonations.validate(project)
+    end
+  end
+end