Remove JaResource from DonationGoalController

Author: landongrindheim

lib/code_corps/policy/donation_goal.ex

@@ -3,14 +3,16 @@ defmodule CodeCorps.Policy.DonationGoal do
   import CodeCorps.Policy.Helpers, only: [get_project: 1, owned_by?: 2]
 
   alias CodeCorps.{DonationGoal, User}
-  alias Ecto.Changeset
 
-  def create?(%User{} = user, %Changeset{} = changeset),
-    do: changeset |> get_project |> owned_by?(user)
+  @spec create?(User.t, map) :: boolean
+  def create?(%User{} = user, %{} = params),
+    do: params |> get_project |> owned_by?(user)
 
-  def update?(%User{} = user, %DonationGoal{} = donation_goal), do:
-    donation_goal |> get_project |> owned_by?(user)
+  @spec update?(User.t, DonationGoal.t) :: boolean
+  def update?(%User{} = user, %DonationGoal{} = donation_goal),
+    do: donation_goal |> get_project |> owned_by?(user)
 
-  def delete?(%User{} = user, %DonationGoal{} = donation_goal), do:
-    donation_goal |> get_project |> owned_by?(user)
+  @spec delete?(User.t, DonationGoal.t) :: boolean
+  def delete?(%User{} = user, %DonationGoal{} = donation_goal),
+    do: donation_goal |> get_project |> owned_by?(user)
 end

lib/code_corps/policy/policy.ex

@@ -28,6 +28,9 @@ defmodule CodeCorps.Policy do
   defp can?(%User{} = current_user, :update, %Category{}, %{}), do: Policy.Category.update?(current_user)
   defp can?(%User{} = current_user, :create, %Comment{}, %{} = params), do: Policy.Comment.create?(current_user, params)
   defp can?(%User{} = current_user, :update, %Comment{} = comment, %{}), do: Policy.Comment.update?(current_user, comment)
+  defp can?(%User{} = current_user, :create, %DonationGoal{}, %{} = params), do: Policy.DonationGoal.create?(current_user, params)
+  defp can?(%User{} = current_user, :update, %DonationGoal{} = donation_goal, %{}), do: Policy.DonationGoal.update?(current_user, donation_goal)
+  defp can?(%User{} = current_user, :delete, %DonationGoal{} = donation_goal, %{}), do: Policy.DonationGoal.delete?(current_user, donation_goal)
   defp can?(%User{} = current_user, :create, %Organization{}, %{}), do: Policy.Organization.create?(current_user)
   defp can?(%User{} = current_user, :update, %Organization{} = organization, %{}), do: Policy.Organization.update?(current_user, organization)
   defp can?(%User{} = current_user, :update, %User{} = user, %{}), do: Policy.User.update?(current_user, user)
@@ -100,11 +103,6 @@ defmodule CodeCorps.Policy do
     # NOTE: other tests are using the User policy for the time being.
     def can?(%User{}, _action, nil), do: true
 
-    def can?(%User{} = user, :create, %Changeset{data: %DonationGoal{}} = changeset), do: Policy.DonationGoal.create?(user, changeset)
-    def can?(%User{} = user, :update, %DonationGoal{} = comment), do: Policy.DonationGoal.update?(user, comment)
-    def can?(%User{} = user, :delete, %DonationGoal{} = comment), do: Policy.DonationGoal.delete?(user, comment)
-
-
     def can?(%User{} = user, :create, Role), do: Policy.Role.create?(user)
   end
 end

lib/code_corps_web/controllers/donation_goal_controller.ex

@@ -1,26 +1,54 @@
 defmodule CodeCorpsWeb.DonationGoalController do
   use CodeCorpsWeb, :controller
-  use JaResource
 
-  import CodeCorps.Helpers.Query, only: [id_filter: 2]
-
-  alias CodeCorps.DonationGoal
   alias CodeCorps.Services.DonationGoalsService
+  alias CodeCorps.{DonationGoal, User, Helpers.Query}
 
-  plug :load_and_authorize_changeset, model: DonationGoal, only: [:create]
-  plug :load_and_authorize_resource, model: DonationGoal, only: [:update, :delete]
-  plug JaResource
+  action_fallback CodeCorpsWeb.FallbackController
+  plug CodeCorpsWeb.Plug.DataToAttributes
+  plug CodeCorpsWeb.Plug.IdsToIntegers
 
-  @spec model :: module
-  def model, do: CodeCorps.DonationGoal
+  @spec index(Conn.t, map) :: Conn.t
+  def index(%Conn{} = conn, %{} = params) do
+    with donation_goals <- DonationGoal |> Query.id_filter(params) |> Repo.all do
+      conn |> render("index.json-api", data: donation_goals)
+    end
+  end
 
-  def filter(_conn, query, "id", id_list), do: id_filter(query, id_list)
+  @spec show(Conn.t, map) :: Conn.t
+  def show(%Conn{} = conn, %{"id" => id}) do
+    with %DonationGoal{} = donation_goal <- DonationGoal |> Repo.get(id) do
+      conn |> render("show.json-api", data: donation_goal)
+    end
+  end
+
+  @spec create(Plug.Conn.t, map) :: Conn.t
+  def create(%Conn{} = conn, %{} = params) do
+    with %User{} = current_user <- conn |> Guardian.Plug.current_resource,
+         {:ok, :authorized} <- current_user |> Policy.authorize(:create, %DonationGoal{}, params),
+         {:ok, %DonationGoal{} = donation_goal} <- DonationGoalsService.create(params) do
+      conn |> put_status(:created) |> render("show.json-api", data: donation_goal)
+    end
+  end
 
-  def handle_create(_conn, attributes) do
-    attributes |> DonationGoalsService.create
+  @spec delete(Conn.t, map) :: Conn.t
+  def delete(%Conn{} = conn, %{"id" => id} = _params) do
+    with %DonationGoal{} = donation_goal <- DonationGoal |> Repo.get(id),
+      %User{} = current_user <- conn |> Guardian.Plug.current_resource,
+      {:ok, :authorized} <- current_user |> Policy.authorize(:delete, donation_goal),
+      {:ok, %DonationGoal{} = _donation_goal} <- donation_goal |> Repo.delete
+    do
+      conn |> Conn.assign(:donation_goal, donation_goal) |> send_resp(:no_content, "")
+    end
   end
 
-  def handle_update(_conn, record, attributes) do
-    record |> DonationGoalsService.update(attributes)
+  @spec update(Conn.t, map) :: Conn.t
+  def update(%Conn{} = conn, %{"id" => id} = params) do
+    with %DonationGoal{} = donation_goal <- DonationGoal |> Repo.get(id),
+      %User{} = current_user <- conn |> Guardian.Plug.current_resource,
+      {:ok, :authorized} <- current_user |> Policy.authorize(:update, donation_goal),
+      {:ok, %DonationGoal{} = updated_donation_goal} <- donation_goal |> DonationGoalsService.update(params) do
+        conn |> render("show.json-api", data: updated_donation_goal)
+    end
   end
 end