implement edits

Author: zcesur

lib/algora/accounts/schemas/user.ex

@@ -12,6 +12,7 @@ defmodule Algora.Accounts.User do
   alias Algora.Organizations.Member
   alias Algora.Types.Money
   alias Algora.Workspace.Installation
+  alias AlgoraWeb.Endpoint
 
   @derive {Inspect, except: [:provider_meta]}
   typed_schema "users" do
@@ -322,8 +323,9 @@ defmodule Algora.Accounts.User do
   def handle(%{handle: handle}) when is_binary(handle), do: handle
   def handle(%{provider_login: handle}), do: handle
 
-  def url(%{handle: handle, type: :individual}) when is_binary(handle), do: "/@/#{handle}"
-  def url(%{handle: handle, type: :organization}), do: "/org/#{handle}"
+  def url(%{handle: handle, type: :individual}) when is_binary(handle), do: "#{Endpoint.url()}/@/#{handle}"
+  def url(%{handle: handle, type: :organization}), do: "#{Endpoint.url()}/org/#{handle}"
+  def url(%{handle: handle}) when is_binary(handle), do: "#{Endpoint.url()}/org/#{handle}"
   def url(%{provider_login: handle}), do: "https://github.com/#{handle}"
 
   def last_context(%{last_context: last_context}), do: last_context || default_context()

lib/algora/bounties/bounties.ex

@@ -26,7 +26,8 @@ defmodule Algora.Bounties do
 
   @type criterion ::
           {:limit, non_neg_integer()}
-          | {:owner_id, integer()}
+          | {:ticket_id, String.t()}
+          | {:owner_id, String.t()}
           | {:status, :open | :paid}
           | {:tech_stack, [String.t()]}
 
@@ -113,7 +114,7 @@ defmodule Algora.Bounties do
     Repo.transact(fn ->
       with {:ok, token} <- token_res,
            {:ok, ticket} <- Workspace.ensure_ticket(token, repo_owner, repo_name, number),
-           existing = Repo.get_by(Bounty, ticket_id: ticket.id),
+           existing = Repo.get_by(Bounty, owner_id: owner.id, ticket_id: ticket.id),
            {:ok, strategy} <- strategy_to_action(existing, opts[:strategy]),
            {:ok, bounty} <-
              (case strategy do
@@ -624,6 +625,9 @@ defmodule Algora.Bounties do
       {:limit, limit}, query ->
         from([b] in query, limit: ^limit)
 
+      {:ticket_id, ticket_id}, query ->
+        from([b] in query, where: b.ticket_id == ^ticket_id)
+
       {:owner_id, owner_id}, query ->
         from([b] in query, where: b.owner_id == ^owner_id)
 

lib/algora/bounties/jobs/notify_bounty.ex

@@ -4,8 +4,8 @@ defmodule Algora.Bounties.Jobs.NotifyBounty do
     queue: :notify_bounty,
     max_attempts: 1
 
-  alias Algora.Accounts
   alias Algora.Accounts.User
+  alias Algora.Bounties
   alias Algora.Github
   alias Algora.Repo
   alias Algora.Util
@@ -58,22 +58,24 @@ defmodule Algora.Bounties.Jobs.NotifyBounty do
   @impl Oban.Worker
   def perform(%Oban.Job{
         args: %{
-          "amount" => amount,
+          "amount" => _amount,
           "ticket_ref" => ticket_ref,
           "installation_id" => installation_id,
           "command_id" => command_id,
           "command_source" => command_source
         }
       }) do
     with {:ok, token} <- Github.get_installation_token(installation_id),
-         {:ok, installation} <-
-           Workspace.fetch_installation_by(provider: "github", provider_id: to_string(installation_id)),
-         {:ok, owner} <- Accounts.fetch_user_by(id: installation.connected_user_id),
-         {:ok, _} <-
-           Github.add_labels(token, ticket_ref["owner"], ticket_ref["repo"], ticket_ref["number"], ["💎 Bounty"]),
-         {:ok, ticket} <- Workspace.ensure_ticket(token, ticket_ref["owner"], ticket_ref["repo"], ticket_ref["number"]) do
+         {:ok, ticket} <- Workspace.ensure_ticket(token, ticket_ref["owner"], ticket_ref["repo"], ticket_ref["number"]),
+         bounties when bounties != [] <- Bounties.list_bounties(ticket_id: ticket.id),
+         {:ok, _} <- Github.add_labels(token, ticket_ref["owner"], ticket_ref["repo"], ticket_ref["number"], ["💎 Bounty"]) do
+      header =
+        Enum.map_join(bounties, "\n", fn bounty ->
+          "## 💎 #{bounty.amount} bounty [• #{bounty.owner.name}](#{User.url(bounty.owner)})"
+        end)
+
       body = """
-      ## 💎 #{amount} bounty [• #{owner.name}](#{User.url(owner)})
+      #{header}
       ### Steps to solve:
       1. **Start working**: Comment `/attempt ##{ticket_ref["number"]}` with your implementation plan
       2. **Submit work**: Create a pull request including `/claim ##{ticket_ref["number"]}` in the PR body to claim the bounty
@@ -96,16 +98,16 @@ defmodule Algora.Bounties.Jobs.NotifyBounty do
                response.provider_response_id,
                body
              ) do
-          {:ok, _comment} ->
-            try_update_command_response(response, body)
+          {:ok, comment} ->
+            try_update_command_response(response, comment)
 
           {:error, "404 Not Found"} ->
             with {:ok, _} <- Workspace.delete_command_response(response.id) do
               post_response(token, ticket_ref, command_id, command_source, ticket, body)
             end
 
           {:error, reason} ->
-            Logger.error("Failed to update command response #{response.id} with body #{body}")
+            Logger.error("Failed to update command response #{response.id}: #{inspect(reason)}")
             {:error, reason}
         end
 
@@ -142,8 +144,8 @@ defmodule Algora.Bounties.Jobs.NotifyBounty do
       {:ok, command_response} ->
         {:ok, command_response}
 
-      {:error, _reason} ->
-        Logger.error("Failed to update command response #{command_response.id}")
+      {:error, reason} ->
+        Logger.error("Failed to update command response #{command_response.id}: #{inspect(reason)}")
         {:ok, command_response}
     end
   end

lib/algora_web/controllers/webhooks/github_controller.ex

@@ -5,7 +5,9 @@ defmodule AlgoraWeb.Webhooks.GithubController do
   alias Algora.Bounties
   alias Algora.Github
   alias Algora.Github.Webhook
+  alias Algora.Repo
   alias Algora.Workspace
+  alias Algora.Workspace.CommandResponse
 
   require Logger
 
@@ -53,18 +55,29 @@ defmodule AlgoraWeb.Webhooks.GithubController do
   defp execute_command(event_action, {:bounty, args}, author, params)
        when event_action in ["issues.opened", "issues.edited", "issue_comment.created", "issue_comment.edited"] do
     [event, _action] = String.split(event_action, ".")
+
     amount = args[:amount]
     repo = params["repository"]
     issue = params["issue"]
     installation_id = params["installation"]["id"]
 
     {command_source, command_id} =
       case event do
-        "issue_comment" ->
-          {:comment, params["comment"]["id"]}
+        "issue_comment" -> {:comment, params["comment"]["id"]}
+        _ -> {:ticket, issue["id"]}
+      end
 
-        _ ->
-          {:ticket, issue["id"]}
+    # TODO: perform compensating action if needed
+    # ❌ comment1.created (:set) -> comment2.created (:increase) -> comment2.edited (:increase)
+    # ✅ comment1.created (:set) -> comment2.created (:increase) -> comment2.edited (:decrease + :increase)
+    strategy =
+      case Repo.get_by(CommandResponse,
+             provider: "github",
+             provider_command_id: to_string(command_id),
+             command_source: command_source
+           ) do
+        nil -> :increase
+        _ -> :set
       end
 
     # TODO: community bounties?
@@ -81,6 +94,7 @@ defmodule AlgoraWeb.Webhooks.GithubController do
           amount: amount,
           ticket_ref: %{owner: repo["owner"]["login"], repo: repo["name"], number: issue["number"]}
         },
+        strategy: strategy,
         installation_id: installation_id,
         command_id: command_id,
         command_source: command_source