Merge pull request #37 from digitalcake/master

Code refactor for tracking methods
izelnakri · Feb 17, 2018 · 3b54a36 · 3b54a36
2 parents 794bace + 3d98a76
commit 3b54a36
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -185,6 +185,8 @@ You can specify setter/originator relationship to paper_trail versions with ```o
   # For most applications originator should be the user since models can be updated/created/deleted by several users.
 ```
 
+Note: You will need to recompile your deps after you have added the config for originator. 
+
 Then originator name could be used for querying and preloading. Originator setting must be done via ```:originator``` or originator name that is defined in the paper_trail configuration:
 
 ```elixir

diff --git a/lib/paper_trail.ex b/lib/paper_trail.ex
@@ -27,24 +27,12 @@ defmodule PaperTrail do
             version_id = get_sequence_id("versions") + 1
 
             changeset_data =
-              case Map.get(changeset, :data) do
-                nil ->
-                  changeset
-                  |> Map.merge(%{
-                    id: get_sequence_from_model(changeset) + 1,
-                    first_version_id: version_id,
-                    current_version_id: version_id
-                  })
-
-                _ ->
-                  changeset.data
-                  |> Map.merge(%{
-                    id: get_sequence_from_model(changeset) + 1,
-                    first_version_id: version_id,
-                    current_version_id: version_id
-                  })
-              end
-
+              Map.get(changeset, :data, changeset)
+              |> Map.merge(%{
+                id: get_sequence_from_model(changeset) + 1,
+                first_version_id: version_id,
+                current_version_id: version_id
+              })
             initial_version = make_version_struct(%{event: "insert"}, changeset_data, options)
             repo.insert(initial_version)
           end)
@@ -109,23 +97,12 @@ defmodule PaperTrail do
           version_id = get_sequence_id("versions") + 1
 
           changeset_data =
-            case Map.get(changeset, :data) do
-              nil ->
-                changeset
-                |> Map.merge(%{
-                  id: get_sequence_from_model(changeset) + 1,
-                  first_version_id: version_id,
-                  current_version_id: version_id
-                })
-
-              _ ->
-                changeset.data
-                |> Map.merge(%{
-                  id: get_sequence_from_model(changeset) + 1,
-                  first_version_id: version_id,
-                  current_version_id: version_id
-                })
-            end
+            Map.get(changeset, :data, changeset)
+            |> Map.merge(%{
+              id: get_sequence_from_model(changeset) + 1,
+              first_version_id: version_id,
+              current_version_id: version_id
+            })
 
           initial_version =
             make_version_struct(%{event: "insert"}, changeset_data, options)