Merge branch 'object-creation' into 'develop'

Do object insertion through Cachex

See merge request pleroma/pleroma!802

lib/pleroma/object.ex

@@ -13,9 +13,29 @@ defmodule Pleroma.Object do
     timestamps()
   end
 
+  def insert_or_get(cng) do
+    {_, data} = fetch_field(cng, :data)
+    id = data["id"] || data[:id]
+    key = "object:#{id}"
+
+    fetcher = fn _ ->
+      with nil <- get_by_ap_id(id),
+           {:ok, object} <- Repo.insert(cng) do
+        {:commit, object}
+      else
+        %Object{} = object -> {:commit, object}
+        e -> {:ignore, e}
+      end
+    end
+
+    with {state, object} when state in [:commit, :ok] <- Cachex.fetch(:object_cache, key, fetcher) do
+      {:ok, object}
+    end
+  end
+
   def create(data) do
     Object.change(%Object{}, %{data: data})
-    |> Repo.insert()
+    |> insert_or_get()
   end
 
   def change(struct, params \\ %{}) do

lib/pleroma/web/activity_pub/utils.ex

@@ -134,14 +134,8 @@ defmodule Pleroma.Web.ActivityPub.Utils do
     context = context || generate_id("contexts")
     changeset = Object.context_mapping(context)
 
-    case Repo.insert(changeset) do
+    with {:ok, object} <- Object.insert_or_get(changeset) do
-      {:ok, object} ->
+      object
-        object
-
-      # This should be solved by an upsert, but it seems ecto
-      # has problems accessing the constraint inside the jsonb.
-      {:error, _} ->
-        Object.get_cached_by_ap_id(context)
     end
   end
 

lib/pleroma/web/twitter_api/twitter_api.ex

@@ -305,16 +305,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     else
       _e ->
         changeset = Object.context_mapping(context)
-
+        {:ok, object} = Object.insert_or_get(changeset)
-        case Repo.insert(changeset) do
+        object.id
-          {:ok, %{id: id}} ->
-            id
-
-          # This should be solved by an upsert, but it seems ecto
-          # has problems accessing the constraint inside the jsonb.
-          {:error, _} ->
-            Object.get_cached_by_ap_id(context).id
-        end
     end
   end
 

test/object_test.exs

@@ -57,4 +57,32 @@ defmodule Pleroma.ObjectTest do
       assert cached_object.data["type"] == "Tombstone"
     end
   end
+
+  describe "insert_or_get" do
+    test "inserting the same object twice (by id) just returns the original object" do
+      data = %{data: %{"id" => Ecto.UUID.generate()}}
+      cng = Object.change(%Object{}, data)
+      {:ok, object} = Object.insert_or_get(cng)
+      {:ok, second_object} = Object.insert_or_get(cng)
+
+      Cachex.clear(:object_cache)
+      {:ok, third_object} = Object.insert_or_get(cng)
+
+      assert object == second_object
+      assert object == third_object
+    end
+  end
+
+  describe "create" do
+    test "inserts an object for a given data set" do
+      data = %{"id" => Ecto.UUID.generate()}
+
+      {:ok, object} = Object.create(data)
+      assert object.data["id"] == data["id"]
+
+      # Works when doing it twice.
+      {:ok, object} = Object.create(data)
+      assert object.data["id"] == data["id"]
+    end
+  end
 end