add Repo.insert_with_activity/2

Author: lastcanal

lib/algora/contracts/contracts.ex

@@ -584,11 +584,14 @@ defmodule Algora.Contracts do
       hourly_rate: contract.hourly_rate,
       hours_per_week: contract.hours_per_week
     })
-    |> put_activity(contract, %{
+    # |> put_activity(contract, %{
+    #   type: :contract_renewed,
+    #   trace_id: Nanoid.generate()
+    # })
+    |> Repo.insert_with_activity(%{
       type: :contract_renewed,
       trace_id: Nanoid.generate()
     })
-    |> Repo.insert()
   end
 
   def calculate_transfer_amount(contract) do

lib/algora/repo.ex

@@ -68,4 +68,25 @@ defmodule Algora.Repo do
       opts
     )
   end
+
+  @spec insert_with_activity(Ecto.Changeset.t() | Ecto.Multi.t(), struct()) ::
+          {:ok, struct()} | {:error, Ecto.Changeset.t()}
+  def insert_with_activity(changeset, activity) do
+    response =
+      Ecto.Multi.new()
+      |> Ecto.Multi.insert(:target, changeset)
+      |> Ecto.Multi.insert(:activity, fn %{target: target} ->
+        Algora.Activities.Activity.build_activity(target, Map.put(activity, :id, target.id))
+      end)
+      |> Oban.insert(:notification, fn %{activity: activity, target: target} ->
+        Algora.Activities.Notifier.changeset(activity, target)
+      end)
+      |> transaction()
+
+    case response do
+      {:ok, %{target: target}} -> {:ok, target}
+      {:error, %{target: target}} -> {:error, target}
+      {:error, error} -> {:error, error}
+    end
+  end
 end

test/algora/contracts_test.exs

@@ -1,5 +1,6 @@
 defmodule Algora.ContractsTest do
   use Algora.DataCase
+  use Oban.Testing, repo: Algora.Repo
 
   import Algora.Factory
   import Money.Sigil
@@ -265,6 +266,8 @@ defmodule Algora.ContractsTest do
 
       assert Activities.all_for_user(contract_a_0.contractor_id) !=
                Activities.all_for_user(contract_b_0.contractor_id)
+
+      assert_enqueued(worker: Activities.Notifier, worker: "Algora.Activities.Notifier")
     end
 
     test "prepayment fails when payment method is invalid" do