handle uncaptured charges

zcesur · zcesur · commit 2677c52d99d9 · 2025-04-22T21:07:21.000+03:00
diff --git a/lib/algora/accounts/accounts.ex b/lib/algora/accounts/accounts.ex
@@ -183,13 +183,15 @@ defmodule Algora.Accounts do
         where: tx.type == :credit,
         where: tx.status == :succeeded,
         where: tx.user_id == ^user.id,
+        join: ltx in assoc(tx, :linked_transaction),
         left_join: bounty in assoc(tx, :bounty),
         left_join: tip in assoc(tx, :tip),
         join: t in Ticket,
         on: t.id == bounty.ticket_id or t.id == tip.ticket_id,
         left_join: r in assoc(t, :repository),
         as: :r,
-        left_join: ro in assoc(r, :user),
+        left_join: ro in User,
+        on: fragment("? = (case when ? is null then ? else ? end)", ro.id, r.user_id, ltx.user_id, r.user_id),
         # order_by: ^[desc: order_by],
         order_by: [desc: sum(tx.net_amount)],
         group_by: [ro.id],
diff --git a/lib/algora/payments/payments.ex b/lib/algora/payments/payments.ex
@@ -157,8 +157,13 @@ defmodule Algora.Payments do
   end
 
   def list_transactions(criteria \\ []) do
-    Transaction
-    |> where([t], ^Enum.to_list(criteria))
+    criteria
+    |> Enum.reduce(Transaction, fn {key, value}, query ->
+      case value do
+        v when is_list(v) -> where(query, [t], field(t, ^key) in ^v)
+        v -> where(query, [t], field(t, ^key) == ^v)
+      end
+    end)
     |> preload(linked_transaction: :user)
     |> order_by([t], desc: t.inserted_at)
     |> Repo.all()
diff --git a/lib/algora/payments/schemas/transaction.ex b/lib/algora/payments/schemas/transaction.ex
@@ -7,7 +7,7 @@ defmodule Algora.Payments.Transaction do
   alias Algora.Types.Money
 
   @transaction_types [:charge, :transfer, :reversal, :debit, :credit, :deposit, :withdrawal]
-  @transaction_statuses [:initialized, :processing, :succeeded, :failed, :canceled]
+  @transaction_statuses [:initialized, :processing, :requires_capture, :succeeded, :failed, :canceled]
 
   @derive {Inspect, except: [:provider_meta]}
   typed_schema "transactions" do
diff --git a/lib/algora_web/controllers/webhooks/stripe_controller.ex b/lib/algora_web/controllers/webhooks/stripe_controller.ex
@@ -129,77 +129,87 @@ defmodule AlgoraWeb.Webhooks.StripeController do
   end
 
   defp process_charge_succeeded(
-         %Stripe.Event{type: "charge.succeeded", data: %{object: %Stripe.Charge{id: charge_id}}},
+         %Stripe.Event{type: "charge.succeeded", data: %{object: %Stripe.Charge{id: charge_id, captured: captured}}},
          group_id
        )
        when is_binary(group_id) do
     Repo.transact(fn ->
+      status = if captured, do: :succeeded, else: :requires_capture
+      succeeded_at = if captured, do: DateTime.utc_now()
+
       {_, txs} =
         Repo.update_all(from(t in Transaction, where: t.group_id == ^group_id, select: t),
-          set: [status: :succeeded, succeeded_at: DateTime.utc_now()]
+          set: [
+            status: status,
+            succeeded_at: succeeded_at,
+            provider: "stripe",
+            provider_id: charge_id,
+            provider_charge_id: charge_id
+          ]
         )
 
-      Repo.update_all(from(t in Transaction, where: t.group_id == ^group_id),
-        set: [provider: "stripe", provider_id: charge_id]
-      )
-
-      bounty_ids = txs |> Enum.map(& &1.bounty_id) |> Enum.reject(&is_nil/1) |> Enum.uniq()
-      tip_ids = txs |> Enum.map(& &1.tip_id) |> Enum.reject(&is_nil/1) |> Enum.uniq()
-      contract_ids = txs |> Enum.map(& &1.contract_id) |> Enum.reject(&is_nil/1) |> Enum.uniq()
-      claim_ids = txs |> Enum.map(& &1.claim_id) |> Enum.reject(&is_nil/1) |> Enum.uniq()
-
-      Repo.update_all(from(b in Bounty, where: b.id in ^bounty_ids), set: [status: :paid])
-      Repo.update_all(from(t in Tip, where: t.id in ^tip_ids), set: [status: :paid])
-      Repo.update_all(from(c in Contract, where: c.id in ^contract_ids), set: [status: :paid])
-      # TODO: add and use a new "paid" status for claims
-      Repo.update_all(from(c in Claim, where: c.id in ^claim_ids), set: [status: :approved])
-
-      activities_result =
-        txs
-        |> Enum.filter(&(&1.type == :credit))
-        |> Enum.reduce_while(:ok, fn tx, :ok ->
-          case Repo.insert_activity(tx, %{type: :transaction_succeeded, notify_users: [tx.user_id]}) do
-            {:ok, _} -> {:cont, :ok}
-            error -> {:halt, error}
-          end
-        end)
-
-      jobs_result =
-        txs
-        |> Enum.filter(&(&1.type == :credit))
-        |> Enum.reduce_while(:ok, fn credit, :ok ->
-          case Payments.fetch_active_account(credit.user_id) do
-            {:ok, _account} ->
-              case %{credit_id: credit.id}
-                   |> Payments.Jobs.ExecutePendingTransfer.new()
-                   |> Oban.insert() do
-                {:ok, _job} -> {:cont, :ok}
-                error -> {:halt, error}
-              end
-
-            {:error, :no_active_account} ->
-              case %{credit_id: credit.id}
-                   |> Bounties.Jobs.PromptPayoutConnect.new()
-                   |> Oban.insert() do
-                {:ok, _job} -> {:cont, :ok}
-                error -> {:halt, error}
-              end
-          end
-        end)
-
-      with txs when txs != [] <- txs,
-           :ok <- activities_result,
-           :ok <- jobs_result do
+      if status == :succeeded do
+        bounty_ids = txs |> Enum.map(& &1.bounty_id) |> Enum.reject(&is_nil/1) |> Enum.uniq()
+        tip_ids = txs |> Enum.map(& &1.tip_id) |> Enum.reject(&is_nil/1) |> Enum.uniq()
+        contract_ids = txs |> Enum.map(& &1.contract_id) |> Enum.reject(&is_nil/1) |> Enum.uniq()
+        claim_ids = txs |> Enum.map(& &1.claim_id) |> Enum.reject(&is_nil/1) |> Enum.uniq()
+
+        Repo.update_all(from(b in Bounty, where: b.id in ^bounty_ids), set: [status: :paid])
+        Repo.update_all(from(t in Tip, where: t.id in ^tip_ids), set: [status: :paid])
+        Repo.update_all(from(c in Contract, where: c.id in ^contract_ids), set: [status: :paid])
+        # TODO: add and use a new "paid" status for claims
+        Repo.update_all(from(c in Claim, where: c.id in ^claim_ids), set: [status: :approved])
+
+        activities_result =
+          txs
+          |> Enum.filter(&(&1.type == :credit))
+          |> Enum.reduce_while(:ok, fn tx, :ok ->
+            case Repo.insert_activity(tx, %{type: :transaction_succeeded, notify_users: [tx.user_id]}) do
+              {:ok, _} -> {:cont, :ok}
+              error -> {:halt, error}
+            end
+          end)
+
+        jobs_result =
+          txs
+          |> Enum.filter(&(&1.type == :credit))
+          |> Enum.reduce_while(:ok, fn credit, :ok ->
+            case Payments.fetch_active_account(credit.user_id) do
+              {:ok, _account} ->
+                case %{credit_id: credit.id}
+                     |> Payments.Jobs.ExecutePendingTransfer.new()
+                     |> Oban.insert() do
+                  {:ok, _job} -> {:cont, :ok}
+                  error -> {:halt, error}
+                end
+
+              {:error, :no_active_account} ->
+                case %{credit_id: credit.id}
+                     |> Bounties.Jobs.PromptPayoutConnect.new()
+                     |> Oban.insert() do
+                  {:ok, _job} -> {:cont, :ok}
+                  error -> {:halt, error}
+                end
+            end
+          end)
+
+        with txs when txs != [] <- txs,
+             :ok <- activities_result,
+             :ok <- jobs_result do
+          Payments.broadcast()
+          {:ok, nil}
+        else
+          {:error, reason} ->
+            Logger.error("Failed to update transactions: #{inspect(reason)}")
+            {:error, :failed_to_update_transactions}
+
+          _error ->
+            Logger.error("Failed to update transactions")
+            {:error, :failed_to_update_transactions}
+        end
+      else
         Payments.broadcast()
         {:ok, nil}
-      else
-        {:error, reason} ->
-          Logger.error("Failed to update transactions: #{inspect(reason)}")
-          {:error, :failed_to_update_transactions}
-
-        _error ->
-          Logger.error("Failed to update transactions")
-          {:error, :failed_to_update_transactions}
       end
     end)
   end
diff --git a/lib/algora_web/live/contract_live.ex b/lib/algora_web/live/contract_live.ex
@@ -674,11 +674,13 @@ defmodule AlgoraWeb.ContractLive do
 
   defp assign_transactions(socket) do
     transactions =
-      Payments.list_transactions(
+      [
         user_id: socket.assigns.bounty.owner.id,
-        status: :succeeded,
+        status: [:succeeded, :requires_capture],
         bounty_id: socket.assigns.bounty.id
-      )
+      ]
+      |> Payments.list_transactions()
+      |> Enum.filter(&(&1.type == :charge or &1.status == :succeeded))
 
     balance = calculate_balance(transactions)
     volume = calculate_volume(transactions)
@@ -690,7 +692,9 @@ defmodule AlgoraWeb.ContractLive do
   end
 
   defp calculate_balance(transactions) do
-    Enum.reduce(transactions, Money.new!(0, :USD), fn transaction, acc ->
+    transactions
+    |> Enum.filter(&(&1.status == :succeeded))
+    |> Enum.reduce(Money.new!(0, :USD), fn transaction, acc ->
       case transaction.type do
         type when type in [:charge, :deposit, :credit] ->
           Money.add!(acc, transaction.net_amount)
@@ -705,7 +709,9 @@ defmodule AlgoraWeb.ContractLive do
   end
 
   defp calculate_volume(transactions) do
-    Enum.reduce(transactions, Money.new!(0, :USD), fn transaction, acc ->
+    transactions
+    |> Enum.filter(&(&1.status == :succeeded))
+    |> Enum.reduce(Money.new!(0, :USD), fn transaction, acc ->
       case transaction.type do
         type when type in [:charge, :credit] -> Money.add!(acc, transaction.net_amount)
         _ -> acc
@@ -720,7 +726,9 @@ defmodule AlgoraWeb.ContractLive do
     end
   end
 
-  defp description(%{type: :charge}), do: "Escrowed"
+  defp description(%{type: :charge, status: :requires_capture}), do: "Authorized"
+
+  defp description(%{type: :charge, status: :succeeded}), do: "Escrowed"
 
   defp description(%{type: :debit}), do: "Released"
 
diff --git a/lib/algora_web/live/org/nav.ex b/lib/algora_web/live/org/nav.ex
@@ -129,9 +129,6 @@ defmodule AlgoraWeb.Org.Nav do
             :hourly -> Money.mult!(data.hourly_rate, data.hours_per_week)
           end
 
-        dbg(data.hourly_rate)
-        dbg(data.hours_per_week)
-
         bounty_res =
           Bounties.create_bounty(
             %{
diff --git a/lib/algora_web/live/org/transactions_live.ex b/lib/algora_web/live/org/transactions_live.ex
@@ -137,11 +137,13 @@ defmodule AlgoraWeb.Org.TransactionsLive do
 
   defp assign_transactions(socket) do
     transactions =
-      Payments.list_transactions(
+      [
         user_id: socket.assigns.current_org.id,
         # TODO: also list transactions that are "processing"
-        status: :succeeded
-      )
+        status: [:succeeded, :requires_capture]
+      ]
+      |> Payments.list_transactions()
+      |> Enum.filter(&(&1.type == :charge or &1.status == :succeeded))
 
     balance = calculate_balance(transactions)
     volume = calculate_volume(transactions)
@@ -153,7 +155,9 @@ defmodule AlgoraWeb.Org.TransactionsLive do
   end
 
   defp calculate_balance(transactions) do
-    Enum.reduce(transactions, Money.new!(0, :USD), fn transaction, acc ->
+    transactions
+    |> Enum.filter(&(&1.status == :succeeded))
+    |> Enum.reduce(Money.new!(0, :USD), fn transaction, acc ->
       case transaction.type do
         type when type in [:charge, :deposit, :credit] ->
           Money.add!(acc, transaction.net_amount)
@@ -484,6 +488,8 @@ defmodule AlgoraWeb.Org.TransactionsLive do
     end
   end
 
+  defp description(%{type: :charge, status: :requires_capture}), do: "Authorization"
+
   defp description(%{type: type, tip_id: tip_id}) when type in [:debit, :credit] and not is_nil(tip_id), do: "Tip payment"
 
   defp description(%{type: type, contract_id: contract_id}) when type in [:debit, :credit] and not is_nil(contract_id),
