misc contract calc

Author: zcesur

lib/algora/bounties/bounties.ex

@@ -860,7 +860,7 @@ defmodule Algora.Bounties do
       %{contract_type: :marketplace} ->
         [
           %LineItem{
-            amount: Money.mult!(amount, Decimal.add(1, Decimal.add(platform_fee_pct, transaction_fee_pct))),
+            amount: amount,
             title: "Contract payment - @#{recipient.provider_login}",
             description: "(includes all platform and payment processing fees)",
             image: recipient.avatar_url,
@@ -906,6 +906,12 @@ defmodule Algora.Bounties do
     end
   end
 
+  def calculate_contract_amount(amount), do: Money.mult!(amount, Decimal.new("1.13"))
+
+  def final_contract_amount(:marketplace, amount), do: amount
+
+  def final_contract_amount(:bring_your_own, amount), do: calculate_contract_amount(amount)
+
   @spec create_payment_session(
           %{owner: User.t(), amount: Money.t(), description: String.t()},
           opts :: [
@@ -1088,7 +1094,6 @@ defmodule Algora.Bounties do
     })
     |> Algora.Validations.validate_positive(:gross_amount)
     |> Algora.Validations.validate_positive(:net_amount)
-    |> Algora.Validations.validate_positive(:total_fee)
     |> foreign_key_constraint(:user_id)
     |> unique_constraint([:idempotency_key])
     |> Repo.insert()

lib/algora/contracts/contracts.ex

@@ -188,7 +188,6 @@ defmodule Algora.Contracts do
     })
     |> Algora.Validations.validate_positive(:gross_amount)
     |> Algora.Validations.validate_positive(:net_amount)
-    |> Algora.Validations.validate_positive(:total_fee)
     |> foreign_key_constraint(:original_contract_id)
     |> foreign_key_constraint(:contract_id)
     |> foreign_key_constraint(:timesheet_id)

lib/algora/payments/payments.ex

@@ -637,16 +637,16 @@ defmodule Algora.Payments do
         |> Repo.all()
         |> Map.new(&{&1.id, &1})
 
-      {issue_bounty_ids, contract_bounty_ids} =
+      {auto_bounty_ids, manual_bounty_ids} =
         Enum.split_with(bounty_ids, fn id ->
           bounty = bounties[id]
-          bounty && bounty.ticket.repository_id
+          bounty && bounty.contract_type != :marketplace
         end)
 
       tip_ids = txs |> Enum.map(& &1.tip_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 ^issue_bounty_ids), set: [status: :paid])
+      Repo.update_all(from(b in Bounty, where: b.id in ^auto_bounty_ids), set: [status: :paid])
       Repo.update_all(from(t in Tip, where: t.id in ^tip_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])
@@ -655,16 +655,16 @@ defmodule Algora.Payments do
         Enum.filter(txs, fn tx ->
           bounty = bounties[tx.bounty_id]
 
-          contract? = tx.bounty_id in contract_bounty_ids
+          manual? = tx.bounty_id in manual_bounty_ids
 
-          if contract? do
+          if tx.type == :credit and manual? do
             Admin.alert(
               "Contract payment received. URL: #{AlgoraWeb.Endpoint.url()}/#{bounty.owner.handle}/contracts/#{bounty.id}",
               :info
             )
           end
 
-          tx.type != :credit or not contract?
+          tx.type != :credit or not manual?
         end)
 
       Repo.update_all(

lib/algora_web/forms/contract_form.ex

@@ -6,6 +6,7 @@ defmodule AlgoraWeb.Forms.ContractForm do
   import Ecto.Changeset
 
   alias Algora.Accounts.User
+  alias Algora.Bounties
   alias Algora.Types.USD
   alias Algora.Validations
 
@@ -224,7 +225,9 @@ defmodule AlgoraWeb.Forms.ContractForm do
                 </div>
               </dt>
               <dd class="font-display font-semibold tabular-nums text-lg">
-                {Money.to_string!(Money.mult!(get_change(@form.source, :amount), Decimal.new("1.13")))}
+                {Money.to_string!(
+                  Bounties.calculate_contract_amount(get_change(@form.source, :amount))
+                )}
               </dd>
             </div>
           </dl>

lib/algora_web/live/contract_live.ex

@@ -392,7 +392,9 @@ defmodule AlgoraWeb.ContractLive do
                     <.icon name="tabler-circle-number-2 mr-2" class="size-8 text-success-400" />
                     When {@contractor.name} accepts, you will be charged
                     <span class="font-semibold font-display px-1">
-                      {Money.to_string!(Money.mult!(@bounty.amount, Decimal.new("1.13")))}
+                      {Money.to_string!(
+                        Bounties.final_contract_amount(@bounty.contract_type, @bounty.amount)
+                      )}
                     </span>
                     into escrow
                   </li>
@@ -404,7 +406,9 @@ defmodule AlgoraWeb.ContractLive do
 
                 <dl class="-mt-12 space-y-4">
                   <dd class="font-display tabular-nums text-5xl text-success-400 font-bold">
-                    {Money.to_string!(Money.mult!(@bounty.amount, Decimal.new("1.13")))}
+                    {Money.to_string!(
+                      Bounties.final_contract_amount(@bounty.contract_type, @bounty.amount)
+                    )}
                   </dd>
                   <div class="flex justify-between">
                     <dt class="text-foreground">

lib/algora_web/live/org/dashboard_live.ex

@@ -1385,17 +1385,6 @@ defmodule AlgoraWeb.Org.DashboardLive do
                   <span class="line-clamp-1">{@match.user.provider_meta["twitter_handle"]}</span>
                 </.link>
               </div>
-              <%!-- <div
-                :if={@match[:hourly_rate]}
-                class="flex flex-wrap items-center gap-x-3 gap-y-1 text-sm text-muted-foreground sm:text-sm"
-              >
-                <span class="font-semibold font-display text-base sm:text-lg text-emerald-400">
-                  {@match[:hourly_rate]
-                  |> Money.mult!(@match.user.hours_per_week || 30)
-                  |> Money.mult!(Decimal.new("1.13"))
-                  |> Money.to_string!()}/wk
-                </span>
-              </div> --%>
             </div>
           </div>
         </div>
@@ -1477,13 +1466,10 @@ defmodule AlgoraWeb.Org.DashboardLive do
                 <div class="flex flex-col items-center gap-1 font-semibold">
                   <span>Offer contract</span>
                   <dd class="font-display font-semibold tabular-nums text-lg text-emerald-400">
-                    {Money.to_string!(
-                      Money.mult!(
-                        @match[:hourly_rate] |> Money.mult!(@match.user.hours_per_week || 30),
-                        Decimal.new("1.13")
-                      ),
-                      no_fraction_if_integer: false
-                    )} / week
+                    {@match[:hourly_rate]
+                    |> Money.mult!(@match.user.hours_per_week || 30)
+                    |> Bounties.calculate_contract_amount()
+                    |> Money.to_string!(no_fraction_if_integer: false)} / week
                   </dd>
                 </div>
               </.button>

lib/algora_web/live/org/nav.ex

@@ -132,7 +132,11 @@ defmodule AlgoraWeb.Org.Nav do
         bounty_res =
           Bounties.create_bounty(
             %{
-              amount: amount,
+              amount:
+                case data.contract_type do
+                  :marketplace -> Bounties.calculate_contract_amount(amount)
+                  :bring_your_own -> amount
+                end,
               creator: socket.assigns.current_user,
               owner: socket.assigns.current_org,
               title: data.title,