load target association with Activities.get

Author: lastcanal

config/config.exs

@@ -31,7 +31,9 @@ config :algora, Oban,
     event_consumers: 1,
     comment_consumers: 1,
     github_og_image: 5,
-    notify_bounty: 1
+    notify_bounty: 1,
+    activity_notifier: 1,
+    email_notfier: 1
   ]
 
 # Configures the mailer

lib/algora/activities/activities.ex

@@ -52,9 +52,26 @@ defmodule Algora.Activities do
     transactions: "transaction_activities"
   }
 
+  @table_from_schema Map.new(@schema_from_table, &{elem(&1, 1), elem(&1, 0)})
   @tables Map.keys(@schema_from_table)
   @user_attributes Map.keys(@table_from_user_relation)
 
+  def schema_from_table(name) when is_binary(name), do: name |> String.to_atom() |> schema_from_table()
+
+  def schema_from_table(name) when is_atom(name) do
+    Map.fetch!(@schema_from_table, name)
+  end
+
+  def table_from_schema(name) when is_binary(name), do: name |> String.to_atom() |> table_from_schema()
+
+  def table_from_schema(name) when is_atom(name) do
+    Map.fetch!(@table_from_schema, name)
+  end
+
+  def table_from_user_relation(table) do
+    Map.fetch!(@table_from_user_relation, table)
+  end
+
   def tables, do: @tables
   def user_attributes, do: @user_attributes
 
@@ -167,14 +184,21 @@ defmodule Algora.Activities do
   end
 
   def get(table, id) do
+    assoc_query =
+      from t in schema_from_table(table),
+        where: parent_as(:activity).assoc_id == t.id
+
     query =
       from a in table,
+        as: :activity,
         where: a.id == ^id,
+        inner_lateral_join: t in subquery(assoc_query),
         select: %{
           id: a.id,
           type: a.type,
           assoc_id: a.assoc_id,
           assoc_name: ^table,
+          assoc: t,
           inserted_at: a.inserted_at
         }
 
@@ -212,16 +236,6 @@ defmodule Algora.Activities do
     build_url(activity)
   end
 
-  def schema_from_table(name) when is_binary(name), do: name |> String.to_atom() |> schema_from_table()
-
-  def schema_from_table(name) when is_atom(name) do
-    Map.fetch!(@schema_from_table, name)
-  end
-
-  def table_from_user_relation(table) do
-    Map.fetch!(@table_from_user_relation, table)
-  end
-
   def build_url(%{assoc: %Bounty{owner: user}}), do: {:ok, "/org/#{user.handle}/bounties"}
   def build_url(%{assoc: %Identity{user: %{type: :individual} = user}}), do: {:ok, "/@/#{user.handle}"}
   def build_url(%{assoc: %Identity{user: %{type: :organization} = user}}), do: {:ok, "/org/#{user.handle}"}

lib/algora/activities/jobs/notifier.ex

@@ -1,19 +1,38 @@
 defmodule Algora.Activities.Notifier do
   @moduledoc false
   use Oban.Worker,
-    queue: :activities,
-    max_attempts: 1,
-    tags: ["notify", "activities"]
+    queue: :activity_notifier,
+    max_attempts: 1
+
+  alias Algora.Activities
 
   # unique: [period: 30]
 
   def changeset(activity, target) do
-    new(%{activity_id: activity.id, target_id: target.id})
+    case Activities.table_from_schema(target.__meta__.schema) do
+      nil ->
+        :error
+
+      table when is_atom(table) ->
+        new(%{activity_id: activity.id, target_id: target.id, table_name: table})
+    end
   end
 
   @impl Oban.Worker
-  def perform(%Oban.Job{args: %{}} = job) do
-    IO.inspect(job)
-    :ok
+  def perform(%Oban.Job{args: args} = job) do
+    case args do
+      %{
+        "activity_id" => activity_id,
+        "target_id" => target_id,
+        "table_name" => table
+      } = args
+      when is_binary(table) ->
+        _activity = Activities.get(table, activity_id)
+
+        :ok
+
+      _args ->
+        :error
+    end
   end
 end

test/algora/contracts_test.exs

@@ -7,6 +7,7 @@ defmodule Algora.ContractsTest do
 
   alias Algora.Activities
   alias Algora.Contracts
+  alias Algora.Contracts.Contract
   alias Algora.Payments
   alias Algora.Payments.Transaction
 
@@ -253,6 +254,8 @@ defmodule Algora.ContractsTest do
 
       assert [contract_activity | _rest] = Enum.reverse(Activities.all())
       assert contract_activity.assoc.id == contract_a_0.id
+
+      assert Activities.get(contract_activity.assoc_name, contract_activity.id).assoc.__meta__.schema == Contract
     end
 
     test "prepayment fails when payment method is invalid" do