fix more issues

Author: zcesur

lib/algora/bounties/schemas/bounty.ex

@@ -9,6 +9,7 @@ defmodule Algora.Bounties.Bounty do
   typed_schema "bounties" do
     field :amount, Algora.Types.Money
     field :status, Ecto.Enum, values: [:open, :cancelled, :paid]
+    field :number, :integer, default: 0
 
     belongs_to :ticket, Algora.Workspace.Ticket
     belongs_to :owner, User

priv/repo/migrations/20250208173814_make_provider_meta_nullable.exs

@@ -36,5 +36,12 @@ defmodule Algora.Repo.Migrations.MakeProviderMetaNullable do
     alter table(:tips) do
       modify :creator_id, :string, null: true
     end
+
+    alter table(:bounties) do
+      add :number, :integer, null: false, default: 0
+    end
+
+    drop unique_index(:bounties, [:ticket_id, :owner_id])
+    create unique_index(:bounties, [:ticket_id, :owner_id, :number])
   end
 end

scripts/database_migration.exs

@@ -335,15 +335,18 @@ defmodule DatabaseMigration do
 
     amount = if reward, do: Money.from_integer(String.to_integer(reward["amount"]), reward["currency"])
 
-    %{
-      "id" => row["id"],
-      "amount" => amount,
-      "ticket_id" => row["task_id"],
-      "owner_id" => row["org_id"],
-      "creator_id" => row["poster_id"],
-      "inserted_at" => row["created_at"],
-      "updated_at" => row["updated_at"]
-    }
+    if row["type"] != "tip" do
+      %{
+        "id" => row["id"],
+        "amount" => amount,
+        "ticket_id" => row["task_id"],
+        "owner_id" => row["org_id"],
+        "creator_id" => row["poster_id"],
+        "inserted_at" => row["created_at"],
+        "updated_at" => row["updated_at"],
+        "number" => row["number"]
+      }
+    end
   end
 
   defp transform({"Bounty", CommandResponse}, row, _db) do
@@ -547,20 +550,23 @@ defmodule DatabaseMigration do
           bounty_transfer: row,
           bounty: bounty,
           claim: claim,
-          user_id: org["id"]
+          org: org,
+          user_id: user_id
         }),
         maybe_create_transaction("credit", %{
           bounty_charge: bounty_charge,
           bounty_transfer: row,
           bounty: bounty,
           claim: claim,
+          org: org,
           user_id: user_id
         }),
         maybe_create_transaction("transfer", %{
           bounty_charge: bounty_charge,
           bounty_transfer: row,
           bounty: bounty,
           claim: claim,
+          org: org,
           user_id: user_id
         })
       ],
@@ -647,6 +653,7 @@ defmodule DatabaseMigration do
          bounty_transfer: bounty_transfer,
          bounty: bounty,
          claim: claim,
+         org: org,
          user_id: user_id
        }) do
     amount = Money.from_integer(String.to_integer(bounty_transfer["amount"]), bounty_transfer["currency"])
@@ -671,7 +678,7 @@ defmodule DatabaseMigration do
       "succeeded_at" => nil,
       "reversed_at" => nil,
       "group_id" => bounty_charge["id"],
-      "user_id" => user_id,
+      "user_id" => nil,
       "contract_id" => nil,
       "original_contract_id" => nil,
       "timesheet_id" => nil,
@@ -695,13 +702,22 @@ defmodule DatabaseMigration do
     res =
       case type do
         "transfer" ->
-          Map.put(res, "provider_id", bounty_transfer["transfer_id"])
+          Map.merge(res, %{
+            "user_id" => user_id,
+            "provider_id" => bounty_transfer["transfer_id"]
+          })
 
         "debit" ->
-          Map.put(res, "linked_transaction_id", "cr_" <> bounty_transfer["id"])
+          Map.merge(res, %{
+            "user_id" => org["id"],
+            "linked_transaction_id" => "cr_" <> bounty_transfer["id"]
+          })
 
         "credit" ->
-          Map.put(res, "linked_transaction_id", "de_" <> bounty_transfer["id"])
+          Map.merge(res, %{
+            "user_id" => user_id,
+            "linked_transaction_id" => "de_" <> bounty_transfer["id"]
+          })
 
         _ ->
           res

scripts/v1-progress.yaml

@@ -77,7 +77,7 @@
     - type: 0
     - kind: 0
     - visibility: 0
-    - number: 0
+    - number: 1
     - deleted: 0
     - reward_type: 0
     - autopay_disabled: 0