Commit 48552b38 authored by lambda's avatar lambda

Merge branch 'revert-e0de0fcf' into 'develop'

Revert "Merge branch 'object-creation' into 'develop'"

See merge request !810
parents 06c4935c d53e36bf
Pipeline #7418 passed with stages
in 3 minutes and 42 seconds
......@@ -20,29 +20,9 @@ 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})
|> insert_or_get()
|> Repo.insert()
end
def change(struct, params \\ %{}) do
......
......@@ -142,8 +142,14 @@ defmodule Pleroma.Web.ActivityPub.Utils do
context = context || generate_id("contexts")
changeset = Object.context_mapping(context)
with {:ok, object} <- Object.insert_or_get(changeset) do
object
case Repo.insert(changeset) do
{:ok, 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
......
......@@ -310,8 +310,16 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
else
_e ->
changeset = Object.context_mapping(context)
{:ok, object} = Object.insert_or_get(changeset)
object.id
case Repo.insert(changeset) do
{: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
......
......@@ -57,32 +57,4 @@ 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment