Remove JaResource from StripeConnectPlanController (#1028)

Author: landongrindheim

lib/code_corps/policy/policy.ex

@@ -50,6 +50,10 @@ defmodule CodeCorps.Policy do
   defp can?(%User{} = current_user, :create, %Role{}, %{}), do: Policy.Role.create?(current_user)
   defp can?(%User{} = current_user, :create, %RoleSkill{}, %{}), do: Policy.RoleSkill.create?(current_user)
   defp can?(%User{} = current_user, :delete, %RoleSkill{}, %{}), do: Policy.RoleSkill.delete?(current_user)
+  defp can?(%User{} = current_user, :show, %StripeConnectPlan{} = stripe_connect_plan, %{}),
+    do: Policy.StripeConnectPlan.show?(current_user, stripe_connect_plan)
+  defp can?(%User{} = current_user, :create, %StripeConnectPlan{}, %{} = params),
+    do: Policy.StripeConnectPlan.create?(current_user, params)
   defp can?(%User{} = current_user, :create, %Skill{}, %{}), do: Policy.Skill.create?(current_user)
   defp can?(%User{} = current_user, :create, %TaskSkill{}, %{} = params), do: Policy.TaskSkill.create?(current_user, params)
   defp can?(%User{} = current_user, :delete, %TaskSkill{} = task_skill, %{}), do: Policy.TaskSkill.delete?(current_user, task_skill)
@@ -94,9 +98,6 @@ defmodule CodeCorps.Policy do
 
     def can?(%User{} = user, :create, Role), do: Policy.Role.create?(user)
 
-    def can?(%User{} = user, :show, %StripeConnectPlan{} = stripe_connect_plan), do: Policy.StripeConnectPlan.show?(user, stripe_connect_plan)
-    def can?(%User{} = user, :create, %Changeset{ data: %StripeConnectPlan{}} = changeset), do: Policy.StripeConnectPlan.create?(user, changeset)
-
     def can?(%User{} = user, :show, %StripeConnectSubscription{} = stripe_connect_subscription), do: Policy.StripeConnectSubscription.show?(user, stripe_connect_subscription)
     def can?(%User{} = user, :create, %Changeset{ data: %StripeConnectSubscription{}} = changeset), do: Policy.StripeConnectSubscription.create?(user, changeset)
 

lib/code_corps/policy/stripe_connect_plan.ex

@@ -1,11 +1,15 @@
 defmodule CodeCorps.Policy.StripeConnectPlan do
-  import CodeCorps.Policy.Helpers,
-    only: [get_project: 1, owned_by?: 2]
+  import CodeCorps.Policy.Helpers, only: [get_project: 1, owned_by?: 2]
 
   alias CodeCorps.{StripeConnectPlan, User}
 
-  def show?(%User{} = user, %StripeConnectPlan{} = plan),
-    do: plan |> get_project |> owned_by?(user)
-  def create?(%User{} = user, %Ecto.Changeset{} = changeset),
-    do: changeset |> get_project |> owned_by?(user)
+  @spec show?(User.t, StripeConnectPlan.t) :: boolean
+  def show?(%User{} = user, %StripeConnectPlan{} = plan) do
+    plan |> get_project |> owned_by?(user)
+  end
+
+  @spec create?(User.t, map) :: boolean
+  def create?(%User{} = user, %{} = params) do
+    params |> get_project |> owned_by?(user)
+  end
 end

lib/code_corps_web/controllers/stripe_connect_plan_controller.ex

@@ -1,21 +1,29 @@
 defmodule CodeCorpsWeb.StripeConnectPlanController do
   use CodeCorpsWeb, :controller
-  use JaResource
 
-  alias CodeCorps.StripeConnectPlan
+  alias CodeCorps.{StripeConnectPlan, User}
   alias CodeCorps.StripeService.StripeConnectPlanService
 
-  plug :load_and_authorize_changeset, model: StripeConnectPlan, only: [:create]
-  plug :load_and_authorize_resource, model: StripeConnectPlan, only: [:show]
-  plug JaResource
+  action_fallback CodeCorpsWeb.FallbackController
+  plug CodeCorpsWeb.Plug.DataToAttributes
+  plug CodeCorpsWeb.Plug.IdsToIntegers
 
-  @spec model :: module
-  def model, do: CodeCorps.StripeConnectPlan
+  @spec show(Conn.t, map) :: Conn.t
+  def show(%Conn{} = conn, %{"id" => id} = params) do
+    with %User{} = current_user <- conn |> Guardian.Plug.current_resource,
+         %StripeConnectPlan{} = stripe_platform_plan <- StripeConnectPlan |> Repo.get(id),
+         {:ok, :authorized} <- current_user |> Policy.authorize(:show, stripe_platform_plan, params) do
+      conn |> render("show.json-api", data: stripe_platform_plan)
+    end
+  end
 
-  def handle_create(conn, attributes) do
-    attributes
-    |> StripeConnectPlanService.create
-    |> handle_create_result(conn)
+  @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, %StripeConnectPlan{}, params),
+         {:ok, %StripeConnectPlan{} = stripe_platform_plan} <- StripeConnectPlanService.create(params) |> handle_create_result(conn) do
+      conn |> put_status(:created) |> render("show.json-api", data: stripe_platform_plan)
+    end
   end
 
   defp handle_create_result({:error, :project_not_ready}, conn) do