fix miscellanea

Author: zcesur

lib/algora/bounties/bounties.ex

@@ -256,7 +256,7 @@ defmodule Algora.Bounties do
     Repo.transact(fn ->
       with {:ok, tip} <- Repo.insert(changeset) do
         create_payment_session(
-          %{creator: creator, amount: amount, description: "Tip payment for OSS contributions"},
+          %{owner: owner, amount: amount, description: "Tip payment for OSS contributions"},
           ticket_ref: opts[:ticket_ref],
           tip_id: tip.id,
           recipient: recipient
@@ -267,17 +267,17 @@ defmodule Algora.Bounties do
 
   @spec reward_bounty(
           %{
-            creator: User.t(),
+            owner: User.t(),
             amount: Money.t(),
             bounty_id: String.t(),
             claims: [Claim.t()]
           },
           opts :: [ticket_ref: %{owner: String.t(), repo: String.t(), number: integer()}]
         ) ::
           {:ok, String.t()} | {:error, atom()}
-  def reward_bounty(%{creator: creator, amount: amount, bounty_id: bounty_id, claims: claims}, opts \\ []) do
+  def reward_bounty(%{owner: owner, amount: amount, bounty_id: bounty_id, claims: claims}, opts \\ []) do
     create_payment_session(
-      %{creator: creator, amount: amount, description: "Bounty payment for OSS contributions"},
+      %{owner: owner, amount: amount, description: "Bounty payment for OSS contributions"},
       ticket_ref: opts[:ticket_ref],
       bounty_id: bounty_id,
       claims: claims
@@ -341,7 +341,7 @@ defmodule Algora.Bounties do
   end
 
   @spec create_payment_session(
-          %{creator: User.t(), amount: Money.t(), description: String.t()},
+          %{owner: User.t(), amount: Money.t(), description: String.t()},
           opts :: [
             ticket_ref: %{owner: String.t(), repo: String.t(), number: integer()},
             tip_id: String.t(),
@@ -351,7 +351,7 @@ defmodule Algora.Bounties do
           ]
         ) ::
           {:ok, String.t()} | {:error, atom()}
-  def create_payment_session(%{creator: creator, amount: amount, description: description}, opts \\ []) do
+  def create_payment_session(%{owner: owner, amount: amount, description: description}, opts \\ []) do
     tx_group_id = Nanoid.generate()
 
     line_items =
@@ -370,7 +370,7 @@ defmodule Algora.Bounties do
                tip_id: opts[:tip_id],
                bounty_id: opts[:bounty_id],
                claim_id: nil,
-               user_id: creator.id,
+               user_id: owner.id,
                gross_amount: gross_amount,
                net_amount: amount,
                total_fee: Money.sub!(gross_amount, amount),
@@ -383,7 +383,7 @@ defmodule Algora.Bounties do
                tip_id: opts[:tip_id],
                bounty_id: opts[:bounty_id],
                amount: amount,
-               creator_id: creator.id,
+               creator_id: owner.id,
                group_id: tx_group_id
              }),
            {:ok, session} <-

lib/algora_web/live/claim_live.ex

@@ -174,6 +174,10 @@ defmodule AlgoraWeb.ClaimLive do
   end
 
   @impl true
+  def handle_params(_params, _url, %{assigns: %{current_user: nil}} = socket) do
+    {:noreply, socket}
+  end
+
   def handle_params(%{"context" => context_id}, _url, socket) do
     {:noreply, socket |> assign_selected_context(context_id) |> assign_line_items()}
   end
@@ -203,6 +207,15 @@ defmodule AlgoraWeb.ClaimLive do
      |> assign_line_items()}
   end
 
+  def handle_event("split_bounty", _params, socket) do
+    # TODO: Implement split bounty
+    Logger.error(
+      "Attempt to split bounty #{socket.assigns.target.repository.user.provider_login}/#{socket.assigns.target.repository.name}#{socket.assigns.target.number}"
+    )
+
+    {:noreply, socket}
+  end
+
   def handle_event("pay_with_stripe", %{"reward_bounty_form" => params}, socket) do
     changeset = RewardBountyForm.changeset(%RewardBountyForm{}, params)
 
@@ -267,7 +280,7 @@ defmodule AlgoraWeb.ClaimLive do
         Bounties.create_bounty(%{
           creator: socket.assigns.current_user,
           owner: socket.assigns.selected_context,
-          amount: data.amount,
+          amount: Money.new!(:USD, data.amount),
           ticket_ref: ticket_ref(socket)
         })
 
@@ -281,7 +294,7 @@ defmodule AlgoraWeb.ClaimLive do
 
     Bounties.reward_bounty(
       %{
-        creator: socket.assigns.current_user,
+        owner: socket.assigns.selected_context,
         amount: final_amount,
         bounty_id: bounty.id,
         claims: socket.assigns.claims
@@ -383,7 +396,8 @@ defmodule AlgoraWeb.ClaimLive do
                 <.card_title>
                   Authors
                 </.card_title>
-                <.button variant="secondary">
+                <!-- TODO: hide if user is not an admin -->
+                <.button variant="secondary" phx-click="split_bounty">
                   Split bounty
                 </.button>
               </div>
@@ -497,7 +511,7 @@ defmodule AlgoraWeb.ClaimLive do
         </div>
       </div>
     </div>
-    <.drawer show={@show_reward_bounty_modal} on_cancel="close_drawer">
+    <.drawer :if={@current_user} show={@show_reward_bounty_modal} on_cancel="close_drawer">
       <.drawer_header>
         <.drawer_title>Reward Bounty</.drawer_title>
         <.drawer_description>
@@ -519,27 +533,18 @@ defmodule AlgoraWeb.ClaimLive do
                 <.card_content>
                   <div class="space-y-4">
                     <%= if Enum.empty?(@available_bounties) do %>
-                      <div class="flex flex-col gap-4">
-                        <.alert variant="destructive">
-                          <.alert_title>No bounties available</.alert_title>
-                          <.alert_description>
-                            You don't have any bounties available. Would you like to create one?
-                          </.alert_description>
-                        </.alert>
-
-                        <.input
-                          label="Amount"
-                          icon="tabler-currency-dollar"
-                          field={@reward_bounty_form[:amount]}
-                        />
-                      </div>
-                    <% else %>
-                      <.input
-                        label="Amount"
-                        icon="tabler-currency-dollar"
-                        field={@reward_bounty_form[:amount]}
-                      />
+                      <.alert variant="destructive">
+                        <.alert_title>No bounties available</.alert_title>
+                        <.alert_description>
+                          You didn't post a bounty for this issue. Would you like to create one now?
+                        </.alert_description>
+                      </.alert>
                     <% end %>
+                    <.input
+                      label="Amount"
+                      icon="tabler-currency-dollar"
+                      field={@reward_bounty_form[:amount]}
+                    />
 
                     <div>
                       <.label>On behalf of</.label>