fix: exclude cancelled bounties and claims from listings

Author: zcesur

lib/algora/bounties/bounties.ex

@@ -917,12 +917,14 @@ defmodule Algora.Bounties do
     |> join(:left, [t: t], r in assoc(t, :repository), as: :r)
     |> join(:left, [r: r], ro in assoc(r, :user), as: :ro)
     |> where([b], not is_nil(b.amount))
+    |> where([b], b.status != :cancelled)
     |> apply_criteria(criteria)
     |> order_by([b], desc: b.amount, desc: b.inserted_at, desc: b.id)
     |> select([b, o: o, t: t, ro: ro, r: r], %{
       id: b.id,
       inserted_at: b.inserted_at,
       amount: b.amount,
+      status: b.status,
       owner: %{
         id: o.id,
         name: o.name,
@@ -956,6 +958,7 @@ defmodule Algora.Bounties do
         join: user in assoc(c, :user),
         left_join: s in assoc(c, :source),
         where: t.id in ^ticket_ids,
+        where: c.status != :cancelled,
         select_merge: %{user: user, source: s}
     )
   end

test/algora/bounties_test.exs

@@ -14,6 +14,14 @@ defmodule Algora.BountiesTest do
   alias Algora.PSP
   alias Bounties.Tip
 
+  setup do
+    repo_owner = insert!(:user)
+    repo = insert!(:repository, %{user: repo_owner})
+    ticket = insert!(:ticket, %{repository: repo})
+
+    %{ticket: ticket}
+  end
+
   describe "bounties" do
     test "create" do
       creator = insert!(:user)
@@ -369,4 +377,30 @@ defmodule Algora.BountiesTest do
       assert response == String.trim(expected_response)
     end
   end
+
+  describe "list_bounties/1" do
+    test "does not include cancelled bounties", %{ticket: ticket} do
+      insert!(:bounty, status: :open, ticket: ticket, owner: insert!(:user))
+      insert!(:bounty, status: :paid, ticket: ticket, owner: insert!(:user))
+      insert!(:bounty, status: :cancelled, ticket: ticket, owner: insert!(:user))
+
+      bounties = Bounties.list_bounties()
+      assert Enum.any?(bounties, &(&1.status == :open))
+      assert Enum.any?(bounties, &(&1.status == :paid))
+      refute Enum.any?(bounties, &(&1.status == :cancelled))
+    end
+  end
+
+  describe "list_claims/1" do
+    test "does not include cancelled claims", %{ticket: ticket} do
+      insert!(:claim, status: :pending, target: ticket, user: insert!(:user))
+      insert!(:claim, status: :approved, target: ticket, user: insert!(:user))
+      insert!(:claim, status: :cancelled, target: ticket, user: insert!(:user))
+
+      claims = Bounties.list_claims([ticket.id])
+      assert Enum.any?(claims, &(&1.status == :pending))
+      assert Enum.any?(claims, &(&1.status == :approved))
+      refute Enum.any?(claims, &(&1.status == :cancelled))
+    end
+  end
 end

test/support/factory.ex

@@ -202,7 +202,9 @@ defmodule Algora.Factory do
 
   def bounty_factory do
     %Algora.Bounties.Bounty{
-      id: Nanoid.generate()
+      id: Nanoid.generate(),
+      status: :open,
+      amount: Money.new!(100, :USD)
     }
   end