misc

Author: zcesur

lib/algora_web/forms/contract_form.ex

@@ -11,6 +11,7 @@ defmodule AlgoraWeb.Forms.ContractForm do
 
   embedded_schema do
     field :amount, USD
+    field :hourly_rate, USD
     field :hours_per_week, :integer
     field :type, Ecto.Enum, values: [:fixed, :hourly], default: :fixed
     field :title, :string
@@ -26,17 +27,23 @@ defmodule AlgoraWeb.Forms.ContractForm do
 
   def changeset(form, attrs) do
     form
-    |> cast(attrs, [:amount, :hours_per_week, :type, :title, :description, :contractor_handle])
+    |> cast(attrs, [:amount, :hourly_rate, :hours_per_week, :type, :title, :description, :contractor_handle])
     |> validate_required([:contractor_handle])
     |> validate_type_fields()
-    |> Validations.validate_money_positive(:amount)
     |> Validations.validate_github_handle(:contractor_handle, :contractor)
   end
 
   defp validate_type_fields(changeset) do
     case get_field(changeset, :type) do
-      :hourly -> validate_required(changeset, [:amount, :hours_per_week])
-      _ -> validate_required(changeset, [:amount])
+      :hourly ->
+        changeset
+        |> validate_required([:hourly_rate, :hours_per_week])
+        |> Validations.validate_money_positive(:hourly_rate)
+
+      _ ->
+        changeset
+        |> validate_required([:amount])
+        |> Validations.validate_money_positive(:amount)
     end
   end
 
@@ -92,7 +99,7 @@ defmodule AlgoraWeb.Forms.ContractForm do
         </div>
         <div data-tab="hourly" class="hidden">
           <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
-            <.input label="Hourly rate" icon="tabler-currency-dollar" field={@form[:amount]} />
+            <.input label="Hourly rate" icon="tabler-currency-dollar" field={@form[:hourly_rate]} />
             <.input label="Hours per week" field={@form[:hours_per_week]} />
           </div>
         </div>

lib/algora_web/live/org/nav.ex

@@ -124,12 +124,18 @@ defmodule AlgoraWeb.Org.Nav do
 
     case apply_action(changeset, :save) do
       {:ok, data} ->
+        amount =
+          case data.type do
+            :fixed -> data.amount
+            :hourly -> data.hourly_rate
+          end
+
         bounty_res =
           Bounties.create_bounty(
             %{
               creator: socket.assigns.current_user,
               owner: socket.assigns.current_org,
-              amount: data.amount,
+              amount: amount,
               title: data.title,
               description: data.description
             },
@@ -148,6 +154,7 @@ defmodule AlgoraWeb.Org.Nav do
         end
 
       {:error, changeset} ->
+        Logger.error("Failed to create bounty: #{inspect(changeset)}")
         {:cont, assign(socket, :main_bounty_form, to_form(changeset))}
     end
   end