Merge pull request #1226 from code-corps/update-stripity-stripe

Update stripity stripe

Author: joshsmith

blueprint/api.apib

@@ -2744,13 +2744,13 @@ This endpoint allows you to check whether a username is valid (by running a vali
 
 Code Corps responds to [Stripe webhooks](https://stripe.com/docs/webhooks).
 
-Since Code Corps is a platform, we have two separate webhook endpoints for dealing with both Stripe Connect (the managed accounts) and the platform (shared data across customers).
+Since Code Corps is a platform, we have two separate webhook endpoints for dealing with both Stripe Connect (the custom accounts) and the platform (shared data across customers).
 
 ## Stripe Connect Webhook [/webhooks/stripe/connect]
 
-Handles Stripe Connect events for managed accounts for projects on the Code Corps platform.
+Handles Stripe Connect events for custom accounts for projects on the Code Corps platform.
 
-This endpoint provides information about the actual payments and subscriptions that occur on the managed accounts.
+This endpoint provides information about the actual payments and subscriptions that occur on the custom accounts.
 
 ### Stripe Connect Webhook [POST]
 
@@ -2772,7 +2772,7 @@ This endpoint provides information about the actual payments and subscriptions t
 
 Handles Stripe events for the Code Corps platform itself.
 
-The platform stores Stripe customers and cards so they can be reused across different projects, and fan out updates to all the managed Stripe accounts.
+The platform stores Stripe customers and cards so they can be reused across different projects, and fan out updates to all the managed custom Stripe accounts.
 
 ### Stripe Platform Webhook [POST]
 
@@ -3169,7 +3169,7 @@ The platform stores Stripe customers and cards so they can be reused across diff
 
 ## Project Attributes (object)
 + approved: `true` (boolean) - Has the project been approved by Code Corps?
-+ `can-activate-donations`: `true` (boolean) - Can the project turn on donations? True only if the project has at least one Donation Goal and the Organization has a Stripe Connect Account where `charges-enabled` is `true` and `transfers-enabled` is `true`.
++ `can-activate-donations`: `true` (boolean) - Can the project turn on donations? True only if the project has at least one Donation Goal and the Organization has a Stripe Connect Account where `charges-enabled` is `true` and `payouts-enabled` is `true`.
 + `cloudinary-public-id`: `pp0md2banaw7k6oa1ew9` (string)
 + description: 'Help build and fund public software projects for social good.' (string) - A short plain text description for the project
 + `icon-large-url`: ``//res.cloudinary.com/dlfnmtoq1/image/upload/c_fill,h_500,w_500/pp0md2banaw7k6oa1ew9` (string) - A url pointing to a large icon for the project
@@ -3448,16 +3448,16 @@ The platform stores Stripe customers and cards so they can be reused across diff
 + `charges-enabled`: false (boolean) - Whether or not the account can create live charges
 + country: `US` (string)
 + `default-currency`: `usd` (string)
-+ `details-submitted`: false (boolean) - Whether or not account details have been submitted yet. Standalone accounts cannot receive transfers before this is true.
++ `details-submitted`: false (boolean) - Whether or not account details have been submitted yet. Standalone accounts cannot receive payouts before this is true.
 + `display-name`: `Stripe.com` (string) - The display name for this account. This is used on the Stripe dashboard to help differentiate between accounts.
 + email: `site@stripe.com` (string) - The primary user’s email address
 + `id-from-stripe`: `acct_1032D82eZvKYlo2C` (string)
 + `inserted-at`: `2016-07-08T03:03:51.967Z` (string)
-+ managed: false (boolean) - Whether or not the account is managed by your platform.
 + `support-email`: null (string) - A publicly shareable email address that can be reached for support for this account
 + `support-phone`: null (string) - The publicly visible support phone number for the business
 + `support-url`: null (string) - A publicly shareable URL that can be reached for support for this account
-+ `transfers-enabled`: false (boolean) - Whether or not Stripe will send automatic transfers for this account. This is only false when Stripe is waiting for additional information from the account holder.
++ `payouts-enabled`: false (boolean) - Whether or not Stripe will send automatic payouts for this account. This is only false when Stripe is waiting for additional information from the account holder.
++ type: `custom` (string) - The account type, as specified by Stripe. Can be `standard`, `express`, or `custom`. CodeCorps only deals with custom accounts.
 + `updated-at`: `2014-07-07T18:01:26.000Z` (string)
 
 ## Stripe Connect Account Resource (object)

lib/code_corps/model/stripe_connect_account.ex

@@ -16,9 +16,7 @@ defmodule CodeCorps.StripeConnectAccount do
     field :details_submitted, :boolean
     field :display_name, :string
     field :email, :string
-
     field :external_account, :string
-
     field :legal_entity_address_city, :string
     field :legal_entity_address_country, :string
     field :legal_entity_address_line1, :string
@@ -49,30 +47,25 @@ defmodule CodeCorps.StripeConnectAccount do
     field :legal_entity_ssn_last_4, :string, virtual: true
     field :legal_entity_ssn_last_4_provided, :boolean, default: false
     field :legal_entity_type, :string
-
     field :legal_entity_verification_details, :string
     field :legal_entity_verification_details_code, :string
     field :legal_entity_verification_document, :string
     field :legal_entity_verification_status, :string
-
     field :id_from_stripe, :string, null: false
-
-    field :managed, :boolean, default: true
-
+    field :payouts_enabled, :boolean
     field :support_email, :string
     field :support_phone, :string
     field :support_url, :string
-
     field :tos_acceptance_date, :integer
     field :tos_acceptance_ip, :string
     field :tos_acceptance_user_agent, :string
-    field :transfers_enabled, :boolean
-
+    field :type, :string, default: "custom", null: false
     field :verification_disabled_reason, :string
     field :verification_due_by, :integer
     field :verification_fields_needed, {:array, :string}, default: []
 
     belongs_to :organization, CodeCorps.Organization
+
     has_one :stripe_external_account, CodeCorps.StripeExternalAccount
 
     timestamps()
@@ -122,27 +115,26 @@ defmodule CodeCorps.StripeConnectAccount do
     :legal_entity_verification_details_code,
     :legal_entity_verification_document,
     :legal_entity_verification_status,
-    :managed,
+    :payouts_enabled,
     :support_email,
     :support_phone,
     :support_url,
     :tos_acceptance_date,
     :tos_acceptance_ip,
     :tos_acceptance_user_agent,
-    :transfers_enabled,
+    :type,
     :verification_disabled_reason,
     :verification_due_by,
     :verification_fields_needed
   ]
 
   def create_changeset(struct, params \\ %{}) do
     valid_params = Enum.concat(@insert_params, @stripe_params)
-    changeset = struct
+
+    struct
     |> cast(params, valid_params)
     |> validate_required([:id_from_stripe, :organization_id, :tos_acceptance_date])
     |> assoc_constraint(:organization)
-
-    changeset
   end
 
   def webhook_update_changeset(struct, params \\ %{}) do

lib/code_corps/stripe_service/adapters/stripe_connect_account.ex

@@ -49,14 +49,14 @@ defmodule CodeCorps.StripeService.Adapters.StripeConnectAccountAdapter do
     {:legal_entity_verification_details_code, [:legal_entity, :verification, :details_code]},
     {:legal_entity_verification_document, [:legal_entity, :verification, :document]},
     {:legal_entity_verification_status, [:legal_entity, :verification, :status]},
-    {:managed, [:managed]},
+    {:payouts_enabled, [:payouts_enabled]},
     {:support_email, [:support_email]},
     {:support_phone, [:support_phone]},
     {:support_url, [:support_url]},
     {:tos_acceptance_date, [:tos_acceptance, :date]},
     {:tos_acceptance_ip, [:tos_acceptance, :ip]},
     {:tos_acceptance_user_agent, [:tos_acceptance, :user_agent]},
-    {:transfers_enabled, [:transfers_enabled]},
+    {:type, [:type]},
     {:verification_disabled_reason, [:verification, :disabled_reason]},
     {:verification_due_by, [:verification, :due_by]},
     {:verification_fields_needed, [:verification, :fields_needed]}
@@ -76,6 +76,17 @@ defmodule CodeCorps.StripeService.Adapters.StripeConnectAccountAdapter do
     {:ok, result}
   end
 
+  def from_params_update(%{} = attributes) do
+    result =
+      attributes
+      |> remove_attributes()
+      |> MapUtils.keys_to_atom()
+      |> MapTransformer.transform_inverse(@stripe_mapping)
+      |> Map.drop([:type])
+
+    {:ok, result}
+  end
+
   @doc """
   Transforms a `%Stripe.Account{}` and a set of local attributes into a
   map of parameters used to create or update a `StripeConnectAccount` record.
@@ -120,7 +131,7 @@ defmodule CodeCorps.StripeService.Adapters.StripeConnectAccountAdapter do
   end
 
   defp do_add_external_account(map, nil), do: map
-  defp do_add_external_account(map, %Stripe.ExternalAccount{id: id}) do
+  defp do_add_external_account(map, %Stripe.BankAccount{id: id}) do
     map |> Map.put(:external_account, id)
   end
 

lib/code_corps/stripe_service/adapters/stripe_external_account.ex

@@ -9,7 +9,7 @@ defmodule CodeCorps.StripeService.Adapters.StripeExternalAccountAdapter do
     :routing_number, :status
   ]
 
-  def to_params(%Stripe.ExternalAccount{} = external_account, %StripeConnectAccount{} = connect_account) do
+  def to_params(%Stripe.BankAccount{} = external_account, %StripeConnectAccount{} = connect_account) do
     params =
       external_account
       |> Map.from_struct

lib/code_corps/stripe_service/stripe_connect_account_service.ex

@@ -35,7 +35,7 @@ defmodule CodeCorps.StripeService.StripeConnectAccountService do
   using attributes sent by the client
   """
   def update(%StripeConnectAccount{id_from_stripe: id_from_stripe} = local_account, %{} = attributes) do
-    with {:ok, from_params} <- StripeConnectAccountAdapter.from_params(attributes),
+    with {:ok, from_params} <- StripeConnectAccountAdapter.from_params_update(attributes),
          {:ok, %Stripe.Account{} = api_account} <- @api.Account.update(id_from_stripe, from_params)
     do
       update_local_account(local_account, api_account, attributes)
@@ -81,7 +81,7 @@ defmodule CodeCorps.StripeService.StripeConnectAccountService do
     end
   end
 
-  # goes through all Stripe.ExternalAccount objects within the retrieved Stripe.Account object,
+  # goes through all Stripe.BankAccount objects within the retrieved Stripe.Account object,
   # then either retrieves or creates a StripeExternalAccount object for each of them
   defp process_external_accounts(_, %Stripe.Account{external_accounts: %{data: []}}), do: {:ok, []}
   defp process_external_accounts(
@@ -100,9 +100,9 @@ defmodule CodeCorps.StripeService.StripeConnectAccountService do
   end
 
   # retrieves or creates a StripeExternalAccount object associated to the provided
-  # Stripe.ExternalAccount and StripeConnectAccount objects
+  # Stripe.BankAccount and StripeConnectAccount objects
   # returns {:ok, list_of_created_external_account_records}
-  defp find_or_create_external_account(%Stripe.ExternalAccount{} = api_external_account, connect_account) do
+  defp find_or_create_external_account(%Stripe.BankAccount{} = api_external_account, connect_account) do
     case Repo.get_by(StripeExternalAccount, id_from_stripe: api_external_account.id) do
       nil -> StripeConnectExternalAccountService.create(api_external_account, connect_account)
       %StripeExternalAccount{} = local_external_account -> {:ok, local_external_account}

lib/code_corps/stripe_service/stripe_connect_card.ex

@@ -35,9 +35,9 @@ defmodule CodeCorps.StripeService.StripeConnectCardService do
       |> create_non_stripe_attributes(connect_account)
 
     with {:ok, %Stripe.Token{} = connect_token} <-
-           @api.Token.create_on_connect_account(platform_customer_id, platform_card_id, connect_account: connect_account_id),
+           @api.Token.create(%{customer: platform_customer_id, card: platform_card_id}, connect_account: connect_account_id),
          {:ok, %Stripe.Card{} = connect_card} <-
-           @api.Card.create(:customer, connect_customer_id, connect_token.id, connect_account: connect_account_id),
+           @api.Card.create(%{customer: connect_customer_id, source: connect_token.id}, connect_account: connect_account_id),
          {:ok, params} <-
            StripeConnectCardAdapter.to_params(connect_card, attributes)
     do
@@ -64,11 +64,13 @@ defmodule CodeCorps.StripeService.StripeConnectCardService do
   end
 
   defp update_on_stripe(%StripeConnectCard{} = record, attributes) do
+    params =
+      attributes
+      |> Map.put(:customer, record.stripe_platform_card.customer_id_from_stripe)
+
     @api.Card.update(
-      :customer,
-      record.stripe_platform_card.customer_id_from_stripe,
       record.id_from_stripe,
-      attributes,
+      params,
       connect_account: record.stripe_connect_account.id_from_stripe)
   end
 end

lib/code_corps/stripe_service/stripe_connect_external_account_service.ex

@@ -1,13 +1,13 @@
 defmodule CodeCorps.StripeService.StripeConnectExternalAccountService do
   @moduledoc """
   Used to perform actions on a `StripeConnectExternalAccount` record while
-  propagating to and from the associated `Stripe.ExternalAccount` record.
+  propagating to and from the associated `Stripe.BankAccount` record.
   """
   alias CodeCorps.{Repo, StripeConnectAccount, StripeExternalAccount}
   alias CodeCorps.StripeService.Adapters.StripeExternalAccountAdapter
 
-  @spec create(Stripe.ExternalAccount.t, StripeConnectAccount.t) :: {:ok, StripeExternalAccount.t}
-  def create(%Stripe.ExternalAccount{} = external_account, %StripeConnectAccount{} = connect_account) do
+  @spec create(Stripe.BankAccount.t, StripeConnectAccount.t) :: {:ok, StripeExternalAccount.t}
+  def create(%Stripe.BankAccount{} = external_account, %StripeConnectAccount{} = connect_account) do
     with  {:ok, params} <- StripeExternalAccountAdapter.to_params(external_account, connect_account) do
       %StripeExternalAccount{} |> StripeExternalAccount.changeset(params) |> Repo.insert
     end

lib/code_corps/stripe_service/stripe_connect_plan.ex

@@ -17,7 +17,7 @@ defmodule CodeCorps.StripeService.StripeConnectPlanService do
   """
   @spec create(map) :: {:ok, StripeConnectPlan.t} |
                        {:error, Ecto.Changeset.t} |
-                       {:error, Stripe.APIErrorResponse.t} |
+                       {:error, Stripe.Error.t} |
                        {:error, :project_not_ready} |
                        {:error, :not_found}
   def create(%{"project_id" => project_id} = attributes) do

lib/code_corps/stripe_service/stripe_connect_subscription_service.ex

@@ -26,7 +26,7 @@ defmodule CodeCorps.StripeService.StripeConnectSubscriptionService do
   """
   @spec find_or_create(map) :: {:ok, StripeConnectSubscription.t} |
                                {:error, Ecto.Changeset.t} |
-                               {:error, Stripe.APIErrorResponse.t} |
+                               {:error, Stripe.Error.t} |
                                {:error, :project_not_found} |
                                {:error, :project_not_ready} |
                                {:error, :user_not_found} |
@@ -52,7 +52,7 @@ defmodule CodeCorps.StripeService.StripeConnectSubscriptionService do
   a `Stripe.Subscription` record and using that data as update parameters
   """
   @spec update_from_stripe(String.t, String.t) :: {:ok, StripeConnectSubscription.t} |
-                                                  {:error, Stripe.APIErrorResponse.t} |
+                                                  {:error, Stripe.Error.t} |
                                                   {:error, :not_found}
   def update_from_stripe(stripe_id, connect_customer_id) do
     with {:ok, %StripeConnectAccount{} = connect_account} <- retrieve_connect_account(connect_customer_id),

lib/code_corps/stripe_service/stripe_platform_card.ex

@@ -21,7 +21,7 @@ defmodule CodeCorps.StripeService.StripePlatformCardService do
 
   def create(%{"stripe_token" => stripe_token, "user_id" => user_id} = attributes) do
     with %StripePlatformCustomer{} = customer <- StripePlatformCustomer |> CodeCorps.Repo.get_by(user_id: user_id),
-         {:ok, %Stripe.Card{} = card} <- @api.Card.create(:customer, customer.id_from_stripe, stripe_token),
+         {:ok, %Stripe.Card{} = card} <- @api.Card.create(%{customer: customer.id_from_stripe, source: stripe_token}),
          {:ok, params} <- StripePlatformCardAdapter.to_params(card, attributes)
     do
       %StripePlatformCard{} |> StripePlatformCard.create_changeset(params) |> Repo.insert
@@ -33,7 +33,7 @@ defmodule CodeCorps.StripeService.StripePlatformCardService do
 
   def update_from_stripe(card_id) do
     with %StripePlatformCard{} = record <- Repo.get_by(StripePlatformCard, id_from_stripe: card_id),
-         {:ok, %Stripe.Card{} = stripe_card} <- @api.Card.retrieve(:customer, record.customer_id_from_stripe, card_id),
+         {:ok, %Stripe.Card{} = stripe_card} <- @api.Card.retrieve(card_id, %{customer: record.customer_id_from_stripe}),
          {:ok, params} <- StripePlatformCardAdapter.to_params(stripe_card, %{})
     do
       perform_update(record, params)