Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use model_key for insert in strict mode and add initial_version_key #146

Merged
merged 2 commits into from
May 25, 2021
Merged

Use model_key for insert in strict mode and add initial_version_key #146

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e08df2
use model_key for insert in strict mode
ottobar May 12, 2021
0465900
add initial_version_key
ottobar May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions lib/paper_trail/multi.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,19 @@ defmodule PaperTrail.Multi do
prefix: nil,
model_key: :model,
version_key: :version,
initial_version_key: :initial_version,
ecto_options: []
]
) do
model_key = options[:model_key] || :model
version_key = options[:version_key] || :version
initial_version_key = options[:initial_version_key] || :initial_version
ecto_options = options[:ecto_options] || []

case RepoClient.strict_mode() do
true ->
multi
|> Ecto.Multi.run(:initial_version, fn repo, %{} ->
|> Ecto.Multi.run(initial_version_key, fn repo, %{} ->
version_id = get_sequence_id("versions") + 1

changeset_data =
Expand All @@ -56,7 +58,7 @@ defmodule PaperTrail.Multi do
initial_version = make_version_struct(%{event: "insert"}, changeset_data, options)
repo.insert(initial_version)
end)
|> Ecto.Multi.run(model_key, fn repo, %{initial_version: initial_version} ->
|> Ecto.Multi.run(model_key, fn repo, %{^initial_version_key => initial_version} ->
updated_changeset =
changeset
|> change(%{
Expand All @@ -67,7 +69,10 @@ defmodule PaperTrail.Multi do
repo.insert(updated_changeset, ecto_options)
end)
|> Ecto.Multi.run(version_key, fn repo,
%{initial_version: initial_version, model: model} ->
%{
^initial_version_key => initial_version,
^model_key => model
} ->
target_version = make_version_struct(%{event: "insert"}, model, options) |> serialize()

Version.changeset(initial_version, target_version) |> repo.update
Expand All @@ -93,17 +98,19 @@ defmodule PaperTrail.Multi do
prefix: nil,
model_key: :model,
version_key: :version,
initial_version_key: :initial_version,
ecto_options: []
]
) do
model_key = options[:model_key] || :model
version_key = options[:version_key] || :version
initial_version_key = options[:initial_version_key] || :initial_version
ecto_options = options[:ecto_options] || []

case RepoClient.strict_mode() do
true ->
multi
|> Ecto.Multi.run(:initial_version, fn repo, %{} ->
|> Ecto.Multi.run(initial_version_key, fn repo, %{} ->
version_data =
changeset.data
|> Map.merge(%{
Expand All @@ -114,11 +121,11 @@ defmodule PaperTrail.Multi do
target_version = make_version_struct(%{event: "update"}, target_changeset, options)
repo.insert(target_version)
end)
|> Ecto.Multi.run(model_key, fn repo, %{initial_version: initial_version} ->
|> Ecto.Multi.run(model_key, fn repo, %{^initial_version_key => initial_version} ->
updated_changeset = changeset |> change(%{current_version_id: initial_version.id})
repo.update(updated_changeset, Keyword.take(options, [:returning]))
end)
|> Ecto.Multi.run(version_key, fn repo, %{initial_version: initial_version} ->
|> Ecto.Multi.run(version_key, fn repo, %{^initial_version_key => initial_version} ->
new_item_changes =
initial_version.item_changes
|> Map.merge(%{
Expand Down