feat: add contract type to bounties and update related forms and schemas

Author: zcesur

lib/algora/bounties/bounties.ex

@@ -53,7 +53,8 @@ defmodule Algora.Bounties do
           visibility: Bounty.visibility(),
           shared_with: [String.t()],
           hours_per_week: integer() | nil,
-          hourly_rate: Money.t() | nil
+          hourly_rate: Money.t() | nil,
+          contract_type: Bounty.contract_type() | nil
         }) ::
           {:ok, Bounty.t()} | {:error, atom()}
   defp do_create_bounty(%{creator: creator, owner: owner, amount: amount, ticket: ticket} = params) do
@@ -66,7 +67,8 @@ defmodule Algora.Bounties do
         visibility: params[:visibility] || owner.bounty_mode,
         shared_with: params[:shared_with] || [],
         hours_per_week: params[:hours_per_week],
-        hourly_rate: params[:hourly_rate]
+        hourly_rate: params[:hourly_rate],
+        contract_type: params[:contract_type]
       })
 
     changeset
@@ -115,7 +117,8 @@ defmodule Algora.Bounties do
             visibility: Bounty.visibility() | nil,
             shared_with: [String.t()] | nil,
             hourly_rate: Money.t() | nil,
-            hours_per_week: integer() | nil
+            hours_per_week: integer() | nil,
+            contract_type: Bounty.contract_type() | nil
           ]
         ) ::
           {:ok, Bounty.t()} | {:error, atom()}
@@ -148,7 +151,8 @@ defmodule Algora.Bounties do
                     visibility: opts[:visibility],
                     shared_with: shared_with,
                     hourly_rate: opts[:hourly_rate],
-                    hours_per_week: opts[:hours_per_week]
+                    hours_per_week: opts[:hours_per_week],
+                    contract_type: opts[:contract_type]
                   })
 
                 :set ->
@@ -200,7 +204,8 @@ defmodule Algora.Bounties do
             visibility: Bounty.visibility() | nil,
             shared_with: [String.t()] | nil,
             hours_per_week: integer() | nil,
-            hourly_rate: Money.t() | nil
+            hourly_rate: Money.t() | nil,
+            contract_type: Bounty.contract_type() | nil
           ]
         ) ::
           {:ok, Bounty.t()} | {:error, atom()}
@@ -221,7 +226,8 @@ defmodule Algora.Bounties do
                visibility: opts[:visibility],
                shared_with: shared_with,
                hours_per_week: opts[:hours_per_week],
-               hourly_rate: opts[:hourly_rate]
+               hourly_rate: opts[:hourly_rate],
+               contract_type: opts[:contract_type]
              }),
            {:ok, _job} <- notify_bounty(%{owner: owner, bounty: bounty}) do
         broadcast()

lib/algora/bounties/schemas/bounty.ex

@@ -7,13 +7,15 @@ defmodule Algora.Bounties.Bounty do
   alias Algora.Types.Money
 
   @type visibility :: :community | :exclusive | :public
+  @type contract_type :: :bring_your_own | :marketplace
 
   typed_schema "bounties" do
     field :amount, Money
     field :status, Ecto.Enum, values: [:open, :cancelled, :paid]
     field :number, :integer, default: 0
     field :autopay_disabled, :boolean, default: false
     field :visibility, Ecto.Enum, values: [:community, :exclusive, :public], null: false, default: :community
+    field :contract_type, Ecto.Enum, values: [:bring_your_own, :marketplace]
     field :shared_with, {:array, :string}, null: false, default: []
     field :deadline, :utc_datetime_usec
     field :hours_per_week, :integer
@@ -36,7 +38,17 @@ defmodule Algora.Bounties.Bounty do
 
   def changeset(bounty, attrs) do
     bounty
-    |> cast(attrs, [:amount, :ticket_id, :owner_id, :creator_id, :visibility, :shared_with, :hours_per_week, :hourly_rate])
+    |> cast(attrs, [
+      :amount,
+      :ticket_id,
+      :owner_id,
+      :creator_id,
+      :visibility,
+      :shared_with,
+      :hours_per_week,
+      :hourly_rate,
+      :contract_type
+    ])
     |> validate_required([:amount, :ticket_id, :owner_id, :creator_id])
     |> generate_id()
     |> foreign_key_constraint(:ticket)

lib/algora_web/forms/contract_form.ex

@@ -13,7 +13,7 @@ defmodule AlgoraWeb.Forms.ContractForm do
     field :amount, USD
     field :hourly_rate, USD
     field :hours_per_week, :integer
-    field :marketplace?, :boolean, default: false
+    field :contract_type, Ecto.Enum, values: [:bring_your_own, :marketplace], default: :bring_your_own
     field :type, Ecto.Enum, values: [:fixed, :hourly], default: :fixed
     field :title, :string
     field :description, :string
@@ -28,7 +28,16 @@ defmodule AlgoraWeb.Forms.ContractForm do
 
   def changeset(form, attrs) do
     form
-    |> cast(attrs, [:amount, :hourly_rate, :hours_per_week, :type, :title, :description, :contractor_handle])
+    |> cast(attrs, [
+      :amount,
+      :hourly_rate,
+      :hours_per_week,
+      :type,
+      :title,
+      :description,
+      :contractor_handle,
+      :contract_type
+    ])
     |> validate_required([:contractor_handle])
     |> validate_type_fields()
     |> Validations.validate_github_handle(:contractor_handle, :contractor)
@@ -57,7 +66,9 @@ defmodule AlgoraWeb.Forms.ContractForm do
       phx-change="validate_contract_main"
     >
       <div class="space-y-4">
-        <%= if get_field(@form.source, :marketplace?) do %>
+        <.input type="hidden" field={@form[:contract_type]} />
+
+        <%= if get_field(@form.source, :contract_type) == :marketplace do %>
           <%= if contractor = get_field(@form.source, :contractor) do %>
             <.card>
               <.card_content>
@@ -129,7 +140,7 @@ defmodule AlgoraWeb.Forms.ContractForm do
         <.input label="Title" field={@form[:title]} />
         <.input label="Description (optional)" field={@form[:description]} type="textarea" />
 
-        <%= if not get_field(@form.source, :marketplace?) do %>
+        <%= if get_field(@form.source, :contract_type) == :bring_your_own do %>
           <div>
             <label class="block text-sm font-semibold leading-6 text-foreground mb-2">
               Payment
@@ -191,7 +202,7 @@ defmodule AlgoraWeb.Forms.ContractForm do
           </div>
         <% end %>
 
-        <%= if get_field(@form.source, :marketplace?) do %>
+        <%= if get_field(@form.source, :contract_type) == :marketplace do %>
           <.input type="hidden" field={@form[:amount]} />
           <.input type="hidden" field={@form[:hourly_rate]} />
           <.input type="hidden" field={@form[:hours_per_week]} />

lib/algora_web/live/org/dashboard_live.ex

@@ -333,6 +333,12 @@ defmodule AlgoraWeb.Org.DashboardLive do
                   <.developer_card
                     user={user}
                     contract_for_user={contract_for_user(@contracts, user)}
+                    contract_type={
+                      if(Enum.find(@matches, &(&1.user.id == user.id)),
+                        do: "marketplace",
+                        else: "bring_your_own"
+                      )
+                    }
                     current_org={@current_org}
                   />
                 <% end %>
@@ -410,6 +416,12 @@ defmodule AlgoraWeb.Org.DashboardLive do
                   <.developer_card
                     user={user}
                     contract_for_user={contract_for_user(@contracts, user)}
+                    contract_type={
+                      if(Enum.find(@matches, &(&1.user.id == user.id)),
+                        do: "marketplace",
+                        else: "bring_your_own"
+                      )
+                    }
                     current_org={@current_org}
                   />
                 <% end %>
@@ -658,7 +670,7 @@ defmodule AlgoraWeb.Org.DashboardLive do
   @impl true
   def handle_event(
         "share_opportunity",
-        %{"user_id" => user_id, "type" => "contract", "marketplace" => marketplace?},
+        %{"user_id" => user_id, "type" => "contract", "contract_type" => contract_type},
         socket
       ) do
     developer = Enum.find(socket.assigns.developers, &(&1.id == user_id))
@@ -673,7 +685,7 @@ defmodule AlgoraWeb.Org.DashboardLive do
      |> assign(
        :main_contract_form,
        %ContractForm{
-         marketplace?: marketplace? == "true",
+         contract_type: String.to_existing_atom(contract_type),
          contractor: match[:user] || developer
        }
        |> ContractForm.changeset(%{
@@ -1287,7 +1299,7 @@ defmodule AlgoraWeb.Org.DashboardLive do
               phx-click="share_opportunity"
               phx-value-user_id={@user.id}
               phx-value-type="contract"
-              phx-value-marketplace="false"
+              phx-value-contract_type={@contract_type}
               variant="none"
               class="group bg-emerald-900/10 text-emerald-300 transition-colors duration-75 hover:bg-emerald-800/10 hover:text-emerald-300 hover:drop-shadow-[0_1px_5px_#34d39980] focus:bg-emerald-800/10 focus:text-emerald-300 focus:outline-none focus:drop-shadow-[0_1px_5px_#34d39980] border border-emerald-400/40 hover:border-emerald-400/50 focus:border-emerald-400/50"
             >
@@ -1457,7 +1469,7 @@ defmodule AlgoraWeb.Org.DashboardLive do
                 phx-click="share_opportunity"
                 phx-value-user_id={@match.user.id}
                 phx-value-type="contract"
-                phx-value-marketplace="true"
+                phx-value-contract_type="marketplace"
                 variant="none"
                 class="group bg-emerald-900/10 text-emerald-300 transition-colors duration-75 hover:bg-emerald-800/10 hover:text-emerald-300 hover:drop-shadow-[0_1px_5px_#34d39980] focus:bg-emerald-800/10 focus:text-emerald-300 focus:outline-none focus:drop-shadow-[0_1px_5px_#34d39980] border border-emerald-400/40 hover:border-emerald-400/50 focus:border-emerald-400/50 h-full py-4"
                 size="xl"

lib/algora_web/live/org/nav.ex

@@ -141,7 +141,8 @@ defmodule AlgoraWeb.Org.Nav do
             hourly_rate: data.hourly_rate,
             hours_per_week: data.hours_per_week,
             shared_with: [data.contractor.provider_id],
-            visibility: :exclusive
+            visibility: :exclusive,
+            contract_type: data.contract_type
           )
 
         case bounty_res do

priv/repo/migrations/20250423171814_add_contract_type_to_bounties.exs

@@ -0,0 +1,9 @@
+defmodule Algora.Repo.Migrations.AddContractTypeToBounties do
+  use Ecto.Migration
+
+  def change do
+    alter table(:bounties) do
+      add :contract_type, :string
+    end
+  end
+end