finalize reward bounty form

Author: zcesur

lib/algora/bounties/bounties.ex

@@ -8,10 +8,10 @@ defmodule Algora.Bounties do
   alias Algora.Bounties.Bounty
   alias Algora.Bounties.Claim
   alias Algora.Bounties.Jobs
+  alias Algora.Bounties.LineItem
   alias Algora.Bounties.Tip
   alias Algora.FeeTier
   alias Algora.Github
-  alias Algora.MoneyUtils
   alias Algora.Organizations.Member
   alias Algora.Payments
   alias Algora.Payments.Transaction
@@ -284,45 +284,6 @@ defmodule Algora.Bounties do
     )
   end
 
-  # TODO: move to separate module
-  defmodule LineItem do
-    @moduledoc false
-    defstruct [:amount, :title, :description, :image, :type]
-
-    @type t :: %__MODULE__{
-            amount: Money.t(),
-            title: String.t(),
-            description: String.t() | nil,
-            image: String.t() | nil,
-            type: :payment | :fee
-          }
-
-    def to_stripe(line_item) do
-      %{
-        price_data: %{
-          unit_amount: MoneyUtils.to_minor_units(line_item.amount),
-          currency: to_string(line_item.amount.currency),
-          product_data: %{
-            name: line_item.title,
-            description: line_item.description,
-            images: if(line_item.image, do: [line_item.image])
-          }
-        },
-        quantity: 1
-      }
-    end
-
-    def gross_amount(line_items) do
-      Enum.reduce(line_items, Money.zero(:USD), fn item, acc -> Money.add!(acc, item.amount) end)
-    end
-
-    def total_fee(line_items) do
-      Enum.reduce(line_items, Money.zero(:USD), fn item, acc ->
-        if item.type == :fee, do: Money.add!(acc, item.amount), else: acc
-      end)
-    end
-  end
-
   @spec generate_line_items(
           %{amount: Money.t()},
           opts :: [
@@ -349,7 +310,7 @@ defmodule Algora.Bounties do
           title: "Payment to @#{recipient.provider_login}",
           description: description,
           image: recipient.avatar_url,
-          type: :payment
+          type: :payout
         }
       ]
     else
@@ -362,7 +323,7 @@ defmodule Algora.Bounties do
           title: "Payment to @#{claim.user.provider_login}",
           description: description,
           image: claim.user.avatar_url,
-          type: :payment
+          type: :payout
         }
       end) ++
       [
@@ -426,7 +387,9 @@ defmodule Algora.Bounties do
                group_id: tx_group_id
              }),
            {:ok, session} <-
-             Payments.create_stripe_session(LineItem.to_stripe(line_items), %{
+             line_items
+             |> Enum.map(&LineItem.to_stripe/1)
+             |> Payments.create_stripe_session(%{
                description: description,
                metadata: %{"version" => "2", "group_id" => tx_group_id}
              }) do
@@ -458,7 +421,7 @@ defmodule Algora.Bounties do
       gross_amount: gross_amount,
       net_amount: net_amount,
       total_fee: total_fee,
-      line_items: line_items,
+      line_items: Util.normalize_struct(line_items),
       group_id: group_id
     })
     |> Algora.Validations.validate_positive(:gross_amount)

lib/algora/bounties/schemas/line_item.ex

@@ -0,0 +1,44 @@
+defmodule Algora.Bounties.LineItem do
+  @moduledoc false
+  use Algora.Schema
+
+  alias Algora.MoneyUtils
+
+  @primary_key false
+  typed_embedded_schema do
+    field :amount, Money.Ecto.Composite.Type
+    field :title, :string
+    field :description, :string
+    field :image, :string
+    field :type, Ecto.Enum, values: [:payout, :fee]
+  end
+
+  def to_stripe(line_item) do
+    %{
+      price_data: %{
+        unit_amount: MoneyUtils.to_minor_units(line_item.amount),
+        currency: to_string(line_item.amount.currency),
+        product_data:
+          Map.reject(
+            %{
+              name: line_item.title,
+              description: line_item.description,
+              images: if(line_item.image, do: [line_item.image])
+            },
+            fn {_, v} -> is_nil(v) end
+          )
+      },
+      quantity: 1
+    }
+  end
+
+  def gross_amount(line_items) do
+    Enum.reduce(line_items, Money.zero(:USD), fn item, acc -> Money.add!(acc, item.amount) end)
+  end
+
+  def total_fee(line_items) do
+    Enum.reduce(line_items, Money.zero(:USD), fn item, acc ->
+      if item.type == :fee, do: Money.add!(acc, item.amount), else: acc
+    end)
+  end
+end

lib/algora_web/components/core_components.ex

@@ -574,7 +574,7 @@ defmodule AlgoraWeb.CoreComponents do
       phx-click={JS.push("lv:clear-flash", value: %{key: @kind}) |> hide("##{@id}")}
       role="alert"
       class={[
-        "fixed right-4 bottom-4 z-50 hidden w-80 rounded-lg p-3 pr-8 shadow-md ring-1 sm:w-96",
+        "fixed right-4 bottom-4 z-[1000] hidden w-80 rounded-lg p-3 pr-8 shadow-md ring-1 sm:w-96",
         @kind == :info &&
           "bg-emerald-950 fill-success-foreground text-success-foreground ring ring-success/70",
         @kind == :warning &&
@@ -733,10 +733,7 @@ defmodule AlgoraWeb.CoreComponents do
   slot :inner_block
 
   def input(%{field: %FormField{} = field} = assigns) do
-    errors =
-      if Phoenix.Component.used_input?(field) and not assigns.hide_errors,
-        do: field.errors,
-        else: []
+    errors = if assigns.hide_errors, do: [], else: field.errors
 
     value =
       with %Money{} <- field.value,

lib/algora_web/components/ui/radio_group.ex

@@ -17,7 +17,6 @@ defmodule AlgoraWeb.Components.UI.RadioGroup do
 
   """
   attr :name, :string, default: nil
-  attr :value, :any, default: nil
   attr :options, :list, default: [], doc: "List of {label, value} tuples"
   attr :field, Phoenix.HTML.FormField, doc: "a form field struct retrieved from the form"
   attr :class, :string, default: nil
@@ -32,7 +31,12 @@ defmodule AlgoraWeb.Components.UI.RadioGroup do
           "border-border has-[:checked]:border-primary has-[:checked]:bg-primary/10"
         ]}>
           <div class="sr-only">
-            <.input field={@field} type="radio" value={value} checked={to_string(@value) == value} />
+            <.input
+              field={@field}
+              type="radio"
+              value={value}
+              checked={to_string(@field.value) == to_string(value)}
+            />
           </div>
           <span class="flex flex-1 items-center justify-between">
             <span class="text-sm font-medium">{label}</span>
@@ -44,6 +48,7 @@ defmodule AlgoraWeb.Components.UI.RadioGroup do
         </label>
       <% end %>
     </div>
+    <.error :for={msg <- @field.errors}>{translate_error(msg)}</.error>
     """
   end
 end