Integrate manager into controller

lib/code_corps/donation_goals_manager.ex

@@ -72,21 +72,22 @@ defmodule CodeCorps.DonationGoalsManager do
     # subscriptions relate to projects instead of plans
     # and by caching the total amount on the project itself
 
-    %CodeCorps.StripeConnectPlan{id: plan_id} =
-      CodeCorps.StripeConnectPlan
-      |> Repo.get_by(project_id: project_id)
-
-    total_donated =
-      CodeCorps.StripeConnectSubscription
-      |> where([s], s.stripe_connect_plan_id == ^plan_id)
-      |> Repo.aggregate(:sum, :quantity)
-
-    case total_donated do
-      nil -> 0
-      total_donated -> total_donated
-    end
+    CodeCorps.StripeConnectPlan
+    |> Repo.get_by(project_id: project_id)
+    |> aggregate_donations
+    |> default_to_zero
+  end
+
+  defp aggregate_donations(nil), do: 0
+  defp aggregate_donations(%CodeCorps.StripeConnectPlan{id: plan_id}) do
+    CodeCorps.StripeConnectSubscription
+    |> where([s], s.stripe_connect_plan_id == ^plan_id)
+    |> Repo.aggregate(:sum, :quantity)
   end
 
+  defp default_to_zero(nil), do: 0
+  defp default_to_zero(value), do: value
+
   defp find_smallest_not_yet_reached(%Project{id: project_id}, amount_donated) do
     DonationGoal
     |> where([d], d.project_id == ^project_id and d.amount > ^amount_donated)

test/controllers/donation_goal_controller_test.exs

@@ -67,7 +67,9 @@ defmodule CodeCorps.DonationGoalControllerTest do
   describe "update" do
     @tag authenticated: :admin
     test "updates and renders chosen resource when data is valid", %{conn: conn} do
-      assert conn |> request_update(@valid_attrs) |> json_response(200)
+      project = insert(:project)
+      attrs = @valid_attrs |> Map.merge(%{project: project})
+      assert conn |> request_update(attrs) |> json_response(200)
     end
 
     @tag authenticated: :admin

web/controllers/donation_goal_controller.ex

@@ -5,6 +5,7 @@ defmodule CodeCorps.DonationGoalController do
   import CodeCorps.Helpers.Query, only: [id_filter: 2]
 
   alias CodeCorps.DonationGoal
+  alias CodeCorps.DonationGoalsManager
 
   plug :load_and_authorize_changeset, model: DonationGoal, only: [:create]
   plug :load_and_authorize_resource, model: DonationGoal, only: [:update, :delete]
@@ -13,14 +14,12 @@ defmodule CodeCorps.DonationGoalController do
   def filter(_conn, query, "id", id_list), do: id_filter(query, id_list)
 
   def handle_create(_conn, attributes) do
-    %DonationGoal{}
-    |> DonationGoal.create_changeset(attributes)
-    |> Repo.insert
+    attributes
+    |> DonationGoalsManager.create
   end
 
   def handle_update(_conn, record, attributes) do
     record
-    |> DonationGoal.update_changeset(attributes)
-    |> Repo.update
+    |> DonationGoalsManager.update(attributes)
   end
 end