feat: Workspace.CommandResponse

zcesur · zcesur · commit ff7ce09dcc32 · 2025-01-25T16:30:26.000+03:00
diff --git a/lib/algora/bounties/bounties.ex b/lib/algora/bounties/bounties.ex
@@ -73,7 +73,7 @@ defmodule Algora.Bounties do
             amount: Money.t(),
             ticket_ref: %{owner: String.t(), repo: String.t(), number: integer()}
           },
-          opts :: [installation_id: integer()]
+          opts :: [installation_id: integer(), command_id: integer(), command_source: :ticket | :comment]
         ) ::
           {:ok, Bounty.t()} | {:error, atom()}
   def create_bounty(
@@ -86,6 +86,7 @@ defmodule Algora.Bounties do
         opts \\ []
       ) do
     installation_id = opts[:installation_id]
+    command_id = opts[:command_id]
 
     token_res =
       if installation_id,
@@ -97,7 +98,11 @@ defmodule Algora.Bounties do
            {:ok, ticket} <- Workspace.ensure_ticket(token, repo_owner, repo_name, number),
            {:ok, bounty} <- do_create_bounty(%{creator: creator, owner: owner, amount: amount, ticket: ticket}),
            {:ok, _job} <-
-             notify_bounty(%{owner: owner, bounty: bounty, ticket_ref: ticket_ref}, installation_id: installation_id) do
+             notify_bounty(%{owner: owner, bounty: bounty, ticket_ref: ticket_ref},
+               installation_id: installation_id,
+               command_id: command_id,
+               command_source: opts[:command_source]
+             ) do
         broadcast()
         {:ok, bounty}
       else
@@ -112,15 +117,17 @@ defmodule Algora.Bounties do
             bounty: Bounty.t(),
             ticket_ref: %{owner: String.t(), repo: String.t(), number: integer()}
           },
-          opts :: [installation_id: integer()]
+          opts :: [installation_id: integer(), command_id: integer(), command_source: :ticket | :comment]
         ) ::
           {:ok, Oban.Job.t()} | {:error, atom()}
   def notify_bounty(%{owner: owner, bounty: bounty, ticket_ref: ticket_ref}, opts \\ []) do
     %{
       owner_login: owner.provider_login,
       amount: Money.to_string!(bounty.amount, no_fraction_if_integer: true),
       ticket_ref: %{owner: ticket_ref.owner, repo: ticket_ref.repo, number: ticket_ref.number},
-      installation_id: opts[:installation_id]
+      installation_id: opts[:installation_id],
+      command_id: opts[:command_id],
+      command_source: opts[:command_source]
     }
     |> Jobs.NotifyBounty.new()
     |> Oban.insert()
diff --git a/lib/algora/bounties/jobs/notify_bounty.ex b/lib/algora/bounties/jobs/notify_bounty.ex
@@ -1,17 +1,29 @@
 defmodule Algora.Bounties.Jobs.NotifyBounty do
   @moduledoc false
-  use Oban.Worker, queue: :notify_bounty
+  use Oban.Worker,
+    queue: :notify_bounty,
+    max_attempts: 1
 
   alias Algora.Accounts
   alias Algora.Accounts.User
   alias Algora.Github
+  alias Algora.Repo
+  alias Algora.Util
   alias Algora.Workspace
+  alias Algora.Workspace.CommandResponse
 
   require Logger
 
   @impl Oban.Worker
   def perform(%Oban.Job{
-        args: %{"owner_login" => owner_login, "amount" => amount, "ticket_ref" => ticket_ref, "installation_id" => nil}
+        args: %{
+          "owner_login" => owner_login,
+          "amount" => amount,
+          "ticket_ref" => ticket_ref,
+          "installation_id" => nil,
+          "command_id" => command_id,
+          "command_source" => command_source
+        }
       }) do
     body = """
     💎 **#{owner_login}** is offering a **#{amount}** bounty for this issue
@@ -20,13 +32,28 @@ defmodule Algora.Bounties.Jobs.NotifyBounty do
     """
 
     if Github.pat_enabled() do
-      Github.create_issue_comment(
-        Github.pat(),
-        ticket_ref["owner"],
-        ticket_ref["repo"],
-        ticket_ref["number"],
-        body
-      )
+      with {:ok, response} <-
+             Github.create_issue_comment(
+               Github.pat(),
+               ticket_ref["owner"],
+               ticket_ref["repo"],
+               ticket_ref["number"],
+               body
+             ),
+           {:ok, ticket} <-
+             Workspace.ensure_ticket(Github.pat(), ticket_ref["owner"], ticket_ref["repo"], ticket_ref["number"]) do
+        %CommandResponse{}
+        |> CommandResponse.changeset(%{
+          provider: "github",
+          provider_meta: Util.normalize_struct(response),
+          provider_command_id: to_string(command_id),
+          provider_response_id: to_string(response["id"]),
+          command_source: command_source,
+          command_type: :bounty,
+          ticket_id: ticket.id
+        })
+        |> Repo.insert()
+      end
     else
       Logger.info("""
       Github.create_issue_comment(Github.pat(), "#{ticket_ref["owner"]}", "#{ticket_ref["repo"]}", #{ticket_ref["number"]},
@@ -38,12 +65,22 @@ defmodule Algora.Bounties.Jobs.NotifyBounty do
   end
 
   @impl Oban.Worker
-  def perform(%Oban.Job{args: %{"amount" => amount, "ticket_ref" => ticket_ref, "installation_id" => installation_id}}) do
+  def perform(%Oban.Job{
+        args: %{
+          "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"]) do
+         {: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
       body = """
       ## 💎 #{amount} bounty [• #{owner.name}](#{User.url(owner)})
       ### Steps to solve:
@@ -54,13 +91,26 @@ defmodule Algora.Bounties.Jobs.NotifyBounty do
       Thank you for contributing to #{ticket_ref["owner"]}/#{ticket_ref["repo"]}!
       """
 
-      Github.create_issue_comment(
-        token,
-        ticket_ref["owner"],
-        ticket_ref["repo"],
-        ticket_ref["number"],
-        body
-      )
+      with {:ok, response} <-
+             Github.create_issue_comment(
+               token,
+               ticket_ref["owner"],
+               ticket_ref["repo"],
+               ticket_ref["number"],
+               body
+             ) do
+        %CommandResponse{}
+        |> CommandResponse.changeset(%{
+          provider: "github",
+          provider_meta: Util.normalize_struct(response),
+          provider_command_id: to_string(command_id),
+          provider_response_id: to_string(response["id"]),
+          command_source: command_source,
+          command_type: :bounty,
+          ticket_id: ticket.id
+        })
+        |> Repo.insert()
+      end
     end
   end
 end
diff --git a/lib/algora/integrations/github/poller/comment_consumer.ex b/lib/algora/integrations/github/poller/comment_consumer.ex
@@ -38,7 +38,8 @@ defmodule Algora.Github.Poller.CommentConsumer do
           creator: user,
           owner: user,
           amount: args[:amount],
-          ticket_ref: %{owner: ticket_ref[:owner], repo: ticket_ref[:repo], number: ticket_ref[:number]}
+          ticket_ref: %{owner: ticket_ref[:owner], repo: ticket_ref[:repo], number: ticket_ref[:number]},
+          command_id: comment["id"]
         })
 
       {:error, _reason} = error ->
diff --git a/lib/algora/workspace/schemas/command_response.ex b/lib/algora/workspace/schemas/command_response.ex
@@ -0,0 +1,44 @@
+defmodule Algora.Workspace.CommandResponse do
+  @moduledoc """
+  Schema for tracking command comments and their corresponding bot responses.
+  This allows updating existing bot responses instead of creating new ones.
+  """
+  use Algora.Schema
+
+  typed_schema "command_responses" do
+    field :provider, :string, null: false
+    field :provider_meta, :map, null: false
+    field :provider_command_id, :string
+    field :provider_response_id, :string, null: false
+    field :command_source, Ecto.Enum, values: [:ticket, :comment], null: false
+    field :command_type, Ecto.Enum, values: [:bounty, :attempt, :claim], null: false
+
+    belongs_to :ticket, Algora.Workspace.Ticket, null: false
+
+    timestamps()
+  end
+
+  def changeset(command_response, attrs) do
+    command_response
+    |> cast(attrs, [
+      :provider,
+      :provider_meta,
+      :provider_command_id,
+      :provider_response_id,
+      :command_source,
+      :command_type,
+      :ticket_id
+    ])
+    |> validate_required([
+      :provider,
+      :provider_meta,
+      :provider_response_id,
+      :command_source,
+      :command_type,
+      :ticket_id
+    ])
+    |> generate_id()
+    |> foreign_key_constraint(:ticket_id)
+    |> unique_constraint([:provider, :provider_command_id])
+  end
+end
diff --git a/lib/algora_web/controllers/webhooks/github_controller.ex b/lib/algora_web/controllers/webhooks/github_controller.ex
@@ -52,11 +52,23 @@ 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"]}
+
+        _ ->
+          {:ticket, issue["id"]}
+      end
+
+    dbg({command_source, command_id})
+
     # TODO: community bounties?
     with {:ok, "admin"} <- get_permissions(author, params),
          {:ok, token} <- Github.get_installation_token(installation_id),
@@ -71,7 +83,9 @@ defmodule AlgoraWeb.Webhooks.GithubController do
           amount: amount,
           ticket_ref: %{owner: repo["owner"]["login"], repo: repo["name"], number: issue["number"]}
         },
-        installation_id: installation_id
+        installation_id: installation_id,
+        command_id: command_id,
+        command_source: command_source
       )
     else
       {:ok, _permission} ->
diff --git a/priv/repo/migrations/20250125160156_create_command_responses.exs b/priv/repo/migrations/20250125160156_create_command_responses.exs
@@ -0,0 +1,20 @@
+defmodule Algora.Repo.Migrations.CreateCommandResponses do
+  use Ecto.Migration
+
+  def change do
+    create table(:command_responses) do
+      add :provider, :string, null: false
+      add :provider_meta, :map, null: false
+      add :provider_command_id, :string
+      add :provider_response_id, :string, null: false
+      add :command_source, :string, null: false
+      add :command_type, :string, null: false
+      add :ticket_id, references(:tickets), null: false
+
+      timestamps()
+    end
+
+    create unique_index(:command_responses, [:provider, :provider_command_id, :command_source])
+    create index(:command_responses, [:ticket_id])
+  end
+end
